moved STYLER instance to UtplsqlToStringStyler

PhilippSalvisberg · PhilippSalvisberg · commit 81bf82193c43 · 2020-05-25T11:27:18.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/AbstractModel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/AbstractModel.xtend
@@ -16,16 +16,14 @@
 package org.utplsql.sqldev.model
 
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder
-import org.springframework.core.style.ToStringStyler
 
 abstract class AbstractModel {
-	static final ToStringStyler STYLER = new UtplsqlToStringStyler();
 	
 	override toString() {
 		new ToStringBuilder(this).addAllFields.toString
 	}
 	
 	def getStyler() {
-		return STYLER;
+		return UtplsqlToStringStyler.STYLER;
 	}
 }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/UtplsqlToStringStyler.java b/sqldev/src/main/java/org/utplsql/sqldev/model/UtplsqlToStringStyler.java
@@ -16,9 +16,11 @@
 package org.utplsql.sqldev.model;
 
 import org.springframework.core.style.DefaultToStringStyler;
+import org.springframework.core.style.ToStringStyler;
 import org.springframework.util.ClassUtils;
 
 public class UtplsqlToStringStyler extends DefaultToStringStyler {
+    public static final ToStringStyler STYLER = new UtplsqlToStringStyler();
 
     public UtplsqlToStringStyler() {
         super(new UtplsqlValueStyler());

Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,14 @@`
`16`	`16`	`package org.utplsql.sqldev.model`
`17`	`17`
`18`	`18`	`import org.eclipse.xtext.xbase.lib.util.ToStringBuilder`
`19`		`-import org.springframework.core.style.ToStringStyler`
`20`	`19`
`21`	`20`	`abstract class AbstractModel {`
`22`		`- static final ToStringStyler STYLER = new UtplsqlToStringStyler();`
`23`	`21`
`24`	`22`	`override toString() {`
`25`	`23`	`new ToStringBuilder(this).addAllFields.toString`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`def getStyler() {`
`29`		`- return STYLER;`
	`27`	`+ return UtplsqlToStringStyler.STYLER;`
`30`	`28`	`}`
`31`	`29`	`}`