bit less use of new Dimension()

BobHanson · BobHanson · commit f7e05706baaa · 2020-05-04T23:42:21.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -41,6 +41,7 @@
 import swingjs.api.js.J2SInterface;
 import swingjs.api.js.JQuery;
 import swingjs.json.JSON;
+import swingjs.plaf.JSComponentUI;
 import swingjs.plaf.JSFrameUI;
 
 public class JSUtil implements JSUtilI {
@@ -388,7 +389,7 @@ public static boolean isClassLoaded(String className) {
 	static String processCSS(String css, String path) {
 		if (path != null && css.indexOf("images/") >= 0) {
 			path = path.substring(0, path.lastIndexOf("/") + 1) + "images/";
-			css = PT.rep(css, "images/", path);
+			css = css.replaceAll("images/", path);
 		}
 		jQuery.$("head").append(jQuery.$("<style type='text/css'>" + css + "</style>"));
 	return css;
@@ -577,7 +578,7 @@ public static Locale getDefaultLocale(String language) {
 		String region, country, variant;
 		if (language == null)
 			language = J2S.getDefaultLanguage(true);
-		language = language.replace('-','_');
+		language = language.replaceAll("-","_");
 		if (language == null || language.length() == 0 || language.equalsIgnoreCase("en"))
 			language = "en_US";
 		int i = language.indexOf('_');
@@ -1060,5 +1061,10 @@ public void showStatus(String msg, boolean doFadeOut) {
 		J2S.showStatus(msg, doFadeOut);
 	}
 
+	@Override
+	public void setUIEnabled(JComponent jc, boolean enabled) {
+		((JSComponentUI) jc.getUI()).setUIDisabled(!enabled);
+	}
+
 }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java
@@ -774,8 +774,8 @@ protected void installDefaults(AbstractButton b) {
 	//
 
 	@Override
-	protected Dimension getCSSAdjustment(boolean addingCSS) {
-		return new Dimension((itemNode == null ? 0 : 10), 0);
+	protected Dimension getCSSAdjustment(boolean addingCSS, boolean mutable) {
+		return mutable || itemNode != null ? new Dimension((itemNode == null ? 0 : 10), 0) : ZERO_SIZE;
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -774,8 +774,8 @@ protected void installDefaults(AbstractButton b) {`
`774`	`774`	`//`
`775`	`775`
`776`	`776`	`@Override`
`777`		`- protected Dimension getCSSAdjustment(boolean addingCSS) {`
`778`		`- return new Dimension((itemNode == null ? 0 : 10), 0);`
	`777`	`+ protected Dimension getCSSAdjustment(boolean addingCSS, boolean mutable) {`
	`778`	`+ return mutable \|\| itemNode != null ? new Dimension((itemNode == null ? 0 : 10), 0) : ZERO_SIZE;`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`@Override`