JSlider, Float, JRadioButton

hansonr · hansonr · commit 37e561f72193 · 2019-01-21T23:39:57.000-06:00
JSlider and JSSliderUI replaced with Java8 originals, with just very
minor changes.
JSSliderUI block increment, not unit
"Button" prefix for disabled text
Float missing nonstatic isInfinite()
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190121071846 
+20190121215259 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190121071846 
+20190121215259 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -317,7 +317,7 @@ protected void restoreCellNodes(DOMNode td) {
 	protected DOMNode actionNode;
 
 	/**
-	 * the "FOR" label for a radio button
+	 * the "FOR" label for a radio button; the Button element itself for simple buttons 
 	 * 
 	 */
 	protected DOMNode buttonNode;
@@ -2015,7 +2015,7 @@ protected void enableNode(DOMNode node, boolean b) {
 			return;
 		DOMNode.setAttr(node, "disabled", (b ? null : "TRUE"));
 		if (!b && inactiveForeground == colorUNKNOWN)
-			getDisabledColors(getPropertyPrefix());
+			getDisabledColors(buttonNode == null ? getPropertyPrefix() : "Button");
 		if (jc.isOpaque()) {
 			Color bg = c.getBackground();
 			setBackground(b || !(bg instanceof UIResource) || inactiveBackground == null ? bg : inactiveBackground);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java
@@ -466,7 +466,7 @@ public void scrollByBlock(int direction)    {
                 }
             }
 
-            int delta = blockIncrement * ((direction > 0) ? POSITIVE_SCROLL : NEGATIVE_SCROLL);
+            int delta = blockIncrement * ((direction > 0) ? POSITIVE_SCROLL : direction == 0 ? 0 : NEGATIVE_SCROLL);
             slider.setValue(slider.getValue() + delta);
         }
     }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_2.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_2.java
@@ -807,6 +807,7 @@ private JComponent addButton(ButtonGroup bg, String text, boolean b) {
 		bg.add(c = new JRadioButton(text, b));
 		c.setName(text);
 		add(c);
+		c.setForeground(Color.BLACK);
 		c.setOpaque(false);//c.setBackground(Color.blue);
 		System.out.println("radio is opaque " + c.isOpaque());
 		c.setEnabled(false);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Scroll.java
@@ -310,8 +310,8 @@ public void stateChanged(ChangeEvent e) {
 		});
 
 		JTextField field = ((JSpinner.DefaultEditor) spinner.getEditor()).getTextField();
-		spinner.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 24));
-		field.setEditable(false);
+		//spinner.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 24));
+		//field.setEditable(false);
 		field.addActionListener(new ActionListener( ) {
 
 			@Override
@@ -335,7 +335,7 @@ public void actionPerformed(ActionEvent e) {
 		
         JSlider redSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, 100);
         redSlider.setMajorTickSpacing( 85 );
-        redSlider.setMinorTickSpacing( 17 );
+        redSlider.setMinorTickSpacing( -90 );
         redSlider.setPaintTicks( true );
         redSlider.setPaintLabels( true );
         
@@ -379,7 +379,7 @@ public void mouseWheelMoved(MouseWheelEvent e) {
 	}
 
 	JSlider mkSlider(JPanel p, final JTextField tf, int orient, int x, int y) {
-		final JSlider bar = new JSlider(orient, 300, 1000, 500);
+		final JSlider bar = new JSlider(orient, -300, 1000, 500);
 		bar.addChangeListener(new ChangeListener() {
 			@Override
 			public void stateChanged(ChangeEvent e) {
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Dialog.java b/sources/net.sf.j2s.java.core/src/test/Test_Dialog.java
@@ -116,7 +116,7 @@ public Test_Dialog() {
 			public void actionPerformed(ActionEvent e) {
 				Test_Dialog.this.onDialogReturn(JOptionPane.showConfirmDialog(
 						Test_Dialog.this, 
-						"The frame is now " + (isResizable() ? "NOT " : "") + "resizable.",
+						"<html>The frame is now " + (isResizable() ? "<b>NOT</b> " : "") + "resizable.</html>",
 						"Testing JOptionPane", JOptionPane.OK_CANCEL_OPTION));
 				setResizable(!isResizable());
 			}
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -3897,10 +3897,10 @@ function(num){
 return isNaN(arguments.length == 1 ? num : this.valueOf());
 });
 
-Float.isInfinite$ = m$(Float,"isInfinite$F",
+Float.isInfinite$F = m$(Float,"isInfinite$",
 function(num){
 return !Number.isFinite(arguments.length == 1 ? num : this.valueOf());
-}, 1);
+});
 
 m$(Float,"equals$O",
 function(s){
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -17497,10 +17497,10 @@ function(num){
 return isNaN(arguments.length == 1 ? num : this.valueOf());
 });
 
-Float.isInfinite$ = m$(Float,"isInfinite$F",
+Float.isInfinite$F = m$(Float,"isInfinite$",
 function(num){
 return !Number.isFinite(arguments.length == 1 ? num : this.valueOf());
-}, 1);
+});
 
 m$(Float,"equals$O",
 function(s){

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ public void scrollByBlock(int direction) {`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`
`469`		`- int delta = blockIncrement * ((direction > 0) ? POSITIVE_SCROLL : NEGATIVE_SCROLL);`
	`469`	`+ int delta = blockIncrement * ((direction > 0) ? POSITIVE_SCROLL : direction == 0 ? 0 : NEGATIVE_SCROLL);`
`470`	`470`	`slider.setValue(slider.getValue() + delta);`
`471`	`471`	`}`
`472`	`472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public Test_Dialog() {`
`116`	`116`	`public void actionPerformed(ActionEvent e) {`
`117`	`117`	`Test_Dialog.this.onDialogReturn(JOptionPane.showConfirmDialog(`
`118`	`118`	`Test_Dialog.this,`
`119`		`- "The frame is now " + (isResizable() ? "NOT " : "") + "resizable.",`
	`119`	`+ "<html>The frame is now " + (isResizable() ? "<b>NOT</b> " : "") + "resizable.</html>",`
`120`	`120`	`"Testing JOptionPane", JOptionPane.OK_CANCEL_OPTION));`
`121`	`121`	`setResizable(!isResizable());`
`122`	`122`	`}`