more getMin/getPref/getMax UI revisions

hansonr · hansonr · commit 806843ff5f83 · 2018-12-29T17:44:54.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLabelUI.java
@@ -74,7 +74,7 @@ public void uninstallUI(JComponent jc) {
 	}
 
 	@Override
-	Dimension getMaximumSize(JComponent jc) {
+	protected Dimension getMaximumSize() {
 		return getPreferredSize();
 	}
 
@@ -106,8 +106,8 @@ public void paint(Graphics g, JComponent c) {
 	}
 
 	@Override
-	Dimension getPreferredSize(JComponent jc) {
-		return (label == null ? super.getPreferredSize(jc) : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));
+	public Dimension getPreferredSize() {
+		return (label == null ? super.getPreferredSize() : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));
 	}
 
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java
@@ -700,7 +700,7 @@ public Component.BaselineResizeBehavior getBaselineResizeBehavior(JComponent c)
 	 * @return The total size of the list.
 	 */
 	@Override
-	public Dimension getPreferredSize() {// JComponent c) {
+	public Dimension getPreferredSize() {
 		maybeUpdateLayoutState();
 		return getListDimensions();
 	}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void uninstallUI(JComponent jc) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- Dimension getMaximumSize(JComponent jc) {`
	`77`	`+ protected Dimension getMaximumSize() {`
`78`	`78`	`return getPreferredSize();`
`79`	`79`	`}`
`80`	`80`
`@@ -106,8 +106,8 @@ public void paint(Graphics g, JComponent c) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
`109`		`- Dimension getPreferredSize(JComponent jc) {`
`110`		`- return (label == null ? super.getPreferredSize(jc) : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));`
	`109`	`+ public Dimension getPreferredSize() {`
	`110`	`+ return (label == null ? super.getPreferredSize() : JSGraphicsUtils.getPreferredButtonSize(((AbstractButton) jc), ((AbstractButton) jc).getIconTextGap()));`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ public Component.BaselineResizeBehavior getBaselineResizeBehavior(JComponent c)`
`700`	`700`	`* @return The total size of the list.`
`701`	`701`	`*/`
`702`	`702`	`@Override`
`703`		`- public Dimension getPreferredSize() {// JComponent c) {`
	`703`	`+ public Dimension getPreferredSize() {`
`704`	`704`	`maybeUpdateLayoutState();`
`705`	`705`	`return getListDimensions();`
`706`	`706`	`}`