From 6e59ea0b26e4357a50b7764764152932c208b7d6 Mon Sep 17 00:00:00 2001
From: thang1160 <35557579+thang1160@users.noreply.github.com>
Date: Wed, 12 May 2021 01:06:26 +0700
Subject: [PATCH] add else clause to prevent duplicate getter bool

---
 src/extension.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 175c806..9b74342 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -183,12 +183,6 @@ export function deactivate() {}
 function generateOnlyGetters(javaClass: JavaClass): string {
     let result = '';
     javaClass.declerations.forEach(it => {
-        if (isGenerateEvenIfExists() || javaClass.methodNames.indexOf(`get${it.variableNameFirstCapital()}`) === -1) {
-            result += `\n\tpublic ${it.variableType} get${it.variableNameFirstCapital()}() ${getMethodOpeningBraceOnNewLine()}{
-\t\treturn this.${it.variableName};
-\t}\n`;
-        }
-
         if (it.isBoolean()) {
             if (isGenerateEvenIfExists() || javaClass.methodNames.indexOf(`is${it.variableNameFirstCapital()}`) === -1) {
                 result += `\n\tpublic ${it.variableType} is${it.variableNameFirstCapital()}() ${getMethodOpeningBraceOnNewLine()}{
@@ -196,6 +190,11 @@ function generateOnlyGetters(javaClass: JavaClass): string {
 \t}\n`;
             }
         }
+        else if (isGenerateEvenIfExists() || javaClass.methodNames.indexOf(`get${it.variableNameFirstCapital()}`) === -1) {
+            result += `\n\tpublic ${it.variableType} get${it.variableNameFirstCapital()}() ${getMethodOpeningBraceOnNewLine()}{
+\t\treturn this.${it.variableName};
+\t}\n`;
+        }
     });
     return result;
 }
@@ -212,7 +211,7 @@ function generateGettersAndSetter(javaClass: JavaClass): string {
 \t}\n`;
             }
         }
-        if (isGenerateEvenIfExists() || javaClass.methodNames.indexOf(`get${it.variableNameFirstCapital()}`) === -1) {
+        else if (isGenerateEvenIfExists() || javaClass.methodNames.indexOf(`get${it.variableNameFirstCapital()}`) === -1) {
             result += it.annotation ? `\n\t${it.annotation}` : '';
             result += `\n\tpublic ${it.variableType} get${it.variableNameFirstCapital()}() ${getMethodOpeningBraceOnNewLine()}{
 \t\treturn this.${it.variableName};