simplify, remove unnecessary "this." prefixes

PhilippSalvisberg · PhilippSalvisberg · commit 483a60e0d9a0 · 2020-05-25T11:27:19.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java
@@ -35,7 +35,7 @@ public class GenContext extends AbstractModel {
     private int indentSpaces;
 
     public Connection getConn() {
-        return this.conn;
+        return conn;
     }
 
     @Override 
@@ -61,87 +61,87 @@ public void setConn(final Connection conn) {
     }
 
     public String getObjectType() {
-        return this.objectType;
+        return objectType;
     }
 
     public void setObjectType(final String objectType) {
         this.objectType = objectType;
     }
 
     public String getObjectName() {
-        return this.objectName;
+        return objectName;
     }
 
     public void setObjectName(final String objectName) {
         this.objectName = objectName;
     }
 
     public String getTestPackagePrefix() {
-        return this.testPackagePrefix;
+        return testPackagePrefix;
     }
 
     public void setTestPackagePrefix(final String testPackagePrefix) {
         this.testPackagePrefix = testPackagePrefix;
     }
 
     public String getTestPackageSuffix() {
-        return this.testPackageSuffix;
+        return testPackageSuffix;
     }
 
     public void setTestPackageSuffix(final String testPackageSuffix) {
         this.testPackageSuffix = testPackageSuffix;
     }
 
     public String getTestUnitPrefix() {
-        return this.testUnitPrefix;
+        return testUnitPrefix;
     }
 
     public void setTestUnitPrefix(final String testUnitPrefix) {
         this.testUnitPrefix = testUnitPrefix;
     }
 
     public String getTestUnitSuffix() {
-        return this.testUnitSuffix;
+        return testUnitSuffix;
     }
 
     public void setTestUnitSuffix(final String testUnitSuffix) {
         this.testUnitSuffix = testUnitSuffix;
     }
 
     public int getNumberOfTestsPerUnit() {
-        return this.numberOfTestsPerUnit;
+        return numberOfTestsPerUnit;
     }
 
     public void setNumberOfTestsPerUnit(final int numberOfTestsPerUnit) {
         this.numberOfTestsPerUnit = numberOfTestsPerUnit;
     }
 
     public boolean isGenerateComments() {
-        return this.generateComments;
+        return generateComments;
     }
 
     public void setGenerateComments(final boolean generateComments) {
         this.generateComments = generateComments;
     }
 
     public boolean isDisableTests() {
-        return this.disableTests;
+        return disableTests;
     }
 
     public void setDisableTests(final boolean disableTests) {
         this.disableTests = disableTests;
     }
 
     public String getSuitePath() {
-        return this.suitePath;
+        return suitePath;
     }
 
     public void setSuitePath(final String suitePath) {
         this.suitePath = suitePath;
     }
 
     public int getIndentSpaces() {
-        return this.indentSpaces;
+        return indentSpaces;
     }
 
     public void setIndentSpaces(final int indentSpaces) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java
@@ -38,31 +38,31 @@ public String toString() {
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public void setName(final String name) {
         this.name = name;
     }
 
     public String getType() {
-        return this.type;
+        return type;
     }
 
     public void setType(final String type) {
         this.type = type;
     }
 
     public Integer getPosition() {
-        return this.position;
+        return position;
     }
 
     public void setPosition(final Integer position) {
         this.position = position;
     }
 
     public List<Annotation> getAnnotations() {
-        return this.annotations;
+        return annotations;
     }
 
     public void setAnnotations(final List<Annotation> annotations) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java
@@ -33,23 +33,23 @@ public String toString() {
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public void setName(final String name) {
         this.name = name;
     }
 
     public Integer getPosition() {
-        return this.position;
+        return position;
     }
 
     public void setPosition(final Integer position) {
         this.position = position;
     }
 
     public Integer getPositionOfName() {
-        return this.positionOfName;
+        return positionOfName;
     }
 
     public void setPositionOfName(final Integer positionOfName) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java
@@ -37,39 +37,39 @@ public String toString() {
     }
 
     public Integer getDisabled() {
-        return this.disabled;
+        return disabled;
     }
 
     public void setDisabled(final Integer disabled) {
         this.disabled = disabled;
     }
 
     public Integer getSuccess() {
-        return this.success;
+        return success;
     }
 
     public void setSuccess(final Integer success) {
         this.success = success;
     }
 
     public Integer getFailure() {
-        return this.failure;
+        return failure;
     }
 
     public void setFailure(final Integer failure) {
         this.failure = failure;
     }
 
     public Integer getError() {
-        return this.error;
+        return error;
     }
 
     public void setError(final Integer error) {
         this.error = error;
     }
 
     public Integer getWarning() {
-        return this.warning;
+        return warning;
     }
 
     public void setWarning(final Integer warning) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java
@@ -37,39 +37,39 @@ public String toString() {
     }    
     
     public String getObjectOwner() {
-        return this.objectOwner;
+        return objectOwner;
     }
 
     public void setObjectOwner(final String objectOwner) {
         this.objectOwner = objectOwner;
     }
 
     public String getObjectName() {
-        return this.objectName;
+        return objectName;
     }
 
     public void setObjectName(final String objectName) {
         this.objectName = objectName;
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public void setName(final String name) {
         this.name = name;
     }
 
     public String getText() {
-        return this.text;
+        return text;
     }
 
     public void setText(final String text) {
         this.text = text;
     }
 
     public String getSubobjectName() {
-        return this.subobjectName;
+        return subobjectName;
     }
 
     public void setSubobjectName(final String subobjectName) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java
@@ -31,15 +31,15 @@ public String toString() {
     }
 
     public String[] getLines() {
-        return this.lines;
+        return lines;
     }
 
     public void setLines(final String[] lines) {
         this.lines = lines;
     }
 
     public Integer getNumlines() {
-        return this.numlines;
+        return numlines;
     }
 
     public void setNumlines(final Integer numlines) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class GenContext extends AbstractModel {`
`35`	`35`	`private int indentSpaces;`
`36`	`36`
`37`	`37`	`public Connection getConn() {`
`38`		`- return this.conn;`
	`38`	`+ return conn;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
`@@ -61,87 +61,87 @@ public void setConn(final Connection conn) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public String getObjectType() {`
`64`		`- return this.objectType;`
	`64`	`+ return objectType;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public void setObjectType(final String objectType) {`
`68`	`68`	`this.objectType = objectType;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public String getObjectName() {`
`72`		`- return this.objectName;`
	`72`	`+ return objectName;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public void setObjectName(final String objectName) {`
`76`	`76`	`this.objectName = objectName;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public String getTestPackagePrefix() {`
`80`		`- return this.testPackagePrefix;`
	`80`	`+ return testPackagePrefix;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public void setTestPackagePrefix(final String testPackagePrefix) {`
`84`	`84`	`this.testPackagePrefix = testPackagePrefix;`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public String getTestPackageSuffix() {`
`88`		`- return this.testPackageSuffix;`
	`88`	`+ return testPackageSuffix;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public void setTestPackageSuffix(final String testPackageSuffix) {`
`92`	`92`	`this.testPackageSuffix = testPackageSuffix;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public String getTestUnitPrefix() {`
`96`		`- return this.testUnitPrefix;`
	`96`	`+ return testUnitPrefix;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public void setTestUnitPrefix(final String testUnitPrefix) {`
`100`	`100`	`this.testUnitPrefix = testUnitPrefix;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public String getTestUnitSuffix() {`
`104`		`- return this.testUnitSuffix;`
	`104`	`+ return testUnitSuffix;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public void setTestUnitSuffix(final String testUnitSuffix) {`
`108`	`108`	`this.testUnitSuffix = testUnitSuffix;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public int getNumberOfTestsPerUnit() {`
`112`		`- return this.numberOfTestsPerUnit;`
	`112`	`+ return numberOfTestsPerUnit;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`public void setNumberOfTestsPerUnit(final int numberOfTestsPerUnit) {`
`116`	`116`	`this.numberOfTestsPerUnit = numberOfTestsPerUnit;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public boolean isGenerateComments() {`
`120`		`- return this.generateComments;`
	`120`	`+ return generateComments;`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public void setGenerateComments(final boolean generateComments) {`
`124`	`124`	`this.generateComments = generateComments;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public boolean isDisableTests() {`
`128`		`- return this.disableTests;`
	`128`	`+ return disableTests;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public void setDisableTests(final boolean disableTests) {`
`132`	`132`	`this.disableTests = disableTests;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public String getSuitePath() {`
`136`		`- return this.suitePath;`
	`136`	`+ return suitePath;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public void setSuitePath(final String suitePath) {`
`140`	`140`	`this.suitePath = suitePath;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`public int getIndentSpaces() {`
`144`		`- return this.indentSpaces;`
	`144`	`+ return indentSpaces;`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public void setIndentSpaces(final int indentSpaces) {`
Original file line number	Diff line number	Diff line change
`@@ -38,31 +38,31 @@ public String toString() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public String getName() {`
`41`		`- return this.name;`
	`41`	`+ return name;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public void setName(final String name) {`
`45`	`45`	`this.name = name;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public String getType() {`
`49`		`- return this.type;`
	`49`	`+ return type;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public void setType(final String type) {`
`53`	`53`	`this.type = type;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public Integer getPosition() {`
`57`		`- return this.position;`
	`57`	`+ return position;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void setPosition(final Integer position) {`
`61`	`61`	`this.position = position;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public List<Annotation> getAnnotations() {`
`65`		`- return this.annotations;`
	`65`	`+ return annotations;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public void setAnnotations(final List<Annotation> annotations) {`
Original file line number	Diff line number	Diff line change
`@@ -33,23 +33,23 @@ public String toString() {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public String getName() {`
`36`		`- return this.name;`
	`36`	`+ return name;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void setName(final String name) {`
`40`	`40`	`this.name = name;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public Integer getPosition() {`
`44`		`- return this.position;`
	`44`	`+ return position;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public void setPosition(final Integer position) {`
`48`	`48`	`this.position = position;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public Integer getPositionOfName() {`
`52`		`- return this.positionOfName;`
	`52`	`+ return positionOfName;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public void setPositionOfName(final Integer positionOfName) {`
Original file line number	Diff line number	Diff line change
`@@ -37,39 +37,39 @@ public String toString() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public Integer getDisabled() {`
`40`		`- return this.disabled;`
	`40`	`+ return disabled;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void setDisabled(final Integer disabled) {`
`44`	`44`	`this.disabled = disabled;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public Integer getSuccess() {`
`48`		`- return this.success;`
	`48`	`+ return success;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void setSuccess(final Integer success) {`
`52`	`52`	`this.success = success;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public Integer getFailure() {`
`56`		`- return this.failure;`
	`56`	`+ return failure;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void setFailure(final Integer failure) {`
`60`	`60`	`this.failure = failure;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public Integer getError() {`
`64`		`- return this.error;`
	`64`	`+ return error;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public void setError(final Integer error) {`
`68`	`68`	`this.error = error;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public Integer getWarning() {`
`72`		`- return this.warning;`
	`72`	`+ return warning;`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public void setWarning(final Integer warning) {`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ public String toString() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public String[] getLines() {`
`34`		`- return this.lines;`
	`34`	`+ return lines;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public void setLines(final String[] lines) {`
`38`	`38`	`this.lines = lines;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public Integer getNumlines() {`
`42`		`- return this.numlines;`
	`42`	`+ return numlines;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public void setNumlines(final Integer numlines) {`