UI upgrade

BobHanson · BobHanson · commit 81b7164fdcd1 · 2020-07-08T08:16:56.000-05:00
- JTable minor performance improvements
- JSSliderUI fix for labels only
- JSPopupMenuUI for no invoker
- needless XXX.super.yyy() removed (functional, just indicating
unnecessarily large nested anonymous class methods)
- JSFrameUI comment out
- JLabel video icon may not have ui.domNode yet
- JSUtil check for File vs Path in caching
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/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200701220712 
+20200708070833 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200701220712 
+20200708070833 
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/java/util/concurrent/ScheduledThreadPoolExecutor.java b/sources/net.sf.j2s.java.core/src/java/util/concurrent/ScheduledThreadPoolExecutor.java
@@ -263,8 +263,8 @@ public void run() {
             if (!canRunInCurrentRunState(periodic))
                 cancel(false);
             else if (!periodic)
-                ScheduledFutureTask.super.run();
-            else if (ScheduledFutureTask.super.runAndReset()) {
+            	super.run();
+            else if (super.runAndReset()) {
                 setNextRunTime();
                 reExecutePeriodic(outerTask);
             }
diff --git a/sources/net.sf.j2s.java.core/src/java/util/jar/JarFile.java b/sources/net.sf.j2s.java.core/src/java/util/jar/JarFile.java
@@ -262,7 +262,7 @@ public ZipEntry getEntry(String name) {
     private class JarEntryIterator implements Enumeration<JarEntry>,
             Iterator<JarEntry>
     {
-        final Enumeration<? extends ZipEntry> e = JarFile.super.entries();
+        final Enumeration<? extends ZipEntry> e = superEntries();
 
         public boolean hasNext() {
             return e.hasMoreElements();
@@ -289,7 +289,11 @@ public Enumeration<JarEntry> entries() {
         return new JarEntryIterator();
     }
 
-    @Override
+    public Enumeration<? extends ZipEntry> superEntries() {
+		return super.entries();
+	}
+
+	@Override
     public Stream<JarEntry> stream() {
         return StreamSupport.stream(Spliterators.spliterator(
                 new JarEntryIterator(), size(),
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JLabel.java b/sources/net.sf.j2s.java.core/src/javax/swing/JLabel.java
@@ -1001,6 +1001,7 @@ public void setLabelFor(Component c) {
 	public Object getClientProperty(Object key) {
     	if (key == "jsvideo") {
     		getOrCreatePeer();
+    		秘getUI().updateDOMNode();
     		return 秘getUI().imageNode;
     	}
     	return super.getClientProperty(key);
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JTable.java b/sources/net.sf.j2s.java.core/src/javax/swing/JTable.java
@@ -2730,7 +2730,7 @@ public int convertColumnIndexToView(int modelColumnIndex) {
 			return modelColumnIndex;
 		}
 		TableColumnModel cm = getColumnModel();
-		for (int column = 0; column < getColumnCount(); column++) {
+		for (int column = 0, n = getColumnCount(); column < n; column++) {
 			if (cm.getColumn(column).getModelIndex() == modelColumnIndex) {
 				return column;
 			}
@@ -3115,7 +3115,7 @@ public Rectangle _getCellRect(int row, int column, boolean includeSpacing, Recta
 
 	private int viewIndexForColumn(TableColumn aColumn) {
 		TableColumnModel cm = getColumnModel();
-		for (int column = 0; column < cm.getColumnCount(); column++) {
+		for (int column = cm.getColumnCount(); --column >= 0;) {
 			if (cm.getColumn(column) == aColumn) {
 				return column;
 			}
@@ -3847,7 +3847,7 @@ public void updateUI() {
 		// Update the UIs of the cell renderers, cell editors and header
 		// renderers.
 		TableColumnModel cm = getColumnModel();
-		for (int column = 0; column < cm.getColumnCount(); column++) {
+		for (int column = cm.getColumnCount(); --column >= 0;) {
 			TableColumn aColumn = cm.getColumn(column);
 			SwingUtilities.updateRendererOrEditorUI(aColumn.getCellRenderer());
 			SwingUtilities.updateRendererOrEditorUI(aColumn.getCellEditor());
@@ -4786,8 +4786,8 @@ public void columnMarginChanged(ChangeEvent e) {
 		resizeAnd秘repaint();
 	}
 
-	private int limit(int i, int a, int b) {
-		return Math.min(b, Math.max(i, a));
+	private static int limit(int i, int min, int max) {
+		return Math.min(Math.max(i, min), max);
 	}
 
 	/**
@@ -4813,13 +4813,14 @@ public void columnSelectionChanged(ListSelectionEvent e) {
 		}
 		columnSelectionAdjusting = isAdjusting;
 		// The getCellRect() call will fail unless there is at least one row.
-		if (getRowCount() <= 0 || getColumnCount() <= 0) {
+		int nr, nc;
+		if ((nr = getRowCount()) <= 0 || (nc = getColumnCount()) <= 0) {
 			return;
 		}
-		int firstIndex = limit(e.getFirstIndex(), 0, getColumnCount() - 1);
-		int lastIndex = limit(e.getLastIndex(), 0, getColumnCount() - 1);
+		int firstIndex = limit(e.getFirstIndex(), 0, nc - 1);
+		int lastIndex = limit(e.getLastIndex(), 0, nc - 1);
 		int minRow = 0;
-		int maxRow = getRowCount() - 1;
+		int maxRow = nr - 1;
 		if (getRowSelectionAllowed()) {
 			minRow = selectionModel.getMinSelectionIndex();
 			maxRow = selectionModel.getMaxSelectionIndex();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -931,7 +931,7 @@ public static boolean setFileBytesStatic(Object f, Object isOrBytes) {
 			File outFile = (File) f;
 			outFile.秘bytes = bytes;
 			if (outFile.秘isTempFile) {
-				cacheFileData(outFile.getAbsolutePath(), bytes);
+				cacheFileData(outFile instanceof File ? outFile.getAbsolutePath() : outFile.toString(), bytes);
 			}
 		}
 		return (bytes != null);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -403,7 +403,7 @@ public Rectangle getBoundsPrivate() {
 	@Override
 	public Insets getInsets() {
 		Insets i = (isDummyFrame ? null : frame.isUndecorated() ? ZERO_INSETS : jc.getFrameViewer().getInsets());
-		System.out.println("JSFrameUI.getInsets " + id + " "+frame.isUndecorated() + " " + i);
+		//System.out.println("JSFrameUI.getInsets " + id + " "+frame.isUndecorated() + " " + i);
 		return i;
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -1239,8 +1239,8 @@ public static void processJ2SMenuCmd(Object[] data) {
 				((JMenu) invoker).setSelected(false);
 				invoker = invoker.getRootPane();
 			}
-			invoker.requestFocus();
-			
+			if (invoker != null)
+				invoker.requestFocus();
 	        MenuSelectionManager.defaultManager().setSelectedPath(null);
 			break;
 		case "setFocus":
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
@@ -59,7 +59,6 @@ public class JSSliderUI extends JSLightweightUI implements PropertyChangeListene
 	protected boolean paintTicks;
 	protected boolean paintLabels;
 	private boolean snapToTicks;
-	private Dictionary<Integer, JLabel> labelTable;
 	
 	protected String orientation;
 	
@@ -96,7 +95,7 @@ public DOMNode updateDOMNode() {
 			minorSpacing = slider.getMinorTickSpacing();
 			majorSpacing = slider.getMajorTickSpacing();
 			paintTicks = (majorSpacing > 0 && slider.getPaintTicks());
-			paintLabels = (majorSpacing > 0 && slider.getPaintLabels());
+			paintLabels = slider.getPaintLabels();
 			paintTrack = slider.getPaintTrack();
 			snapToTicks = (majorSpacing > 0 && slider.getSnapToTicks());
 		}
@@ -391,7 +390,7 @@ public void setSlider() {
 		$(domNode).find("." + tickClass).remove();
 		$(domNode).find(".jslider-label").remove();
 		getHTMLSizePreferred(jqSlider, false);
-		if (majorSpacing == 0 && minorSpacing == 0 || !paintTicks && !paintLabels) {
+		if ((majorSpacing == 0 && minorSpacing == 0 || !paintTicks) && !paintLabels) {
 			if (myScrollPaneUI != null) {
 				DOMNode.setStyles(sliderHandle, "transform", null);
 				DOMNode.setStyles(sliderTrack, "transform", null);
@@ -438,27 +437,33 @@ public void setSlider() {
 			if (!paintLabels)
 				getHTMLSizePreferred(domNode, false);
 		}
-		if (paintLabels) {
+		Dictionary<Integer, JLabel> labelTable = slider.getLabelTable();
+		if (paintLabels && labelTable != null) {
 			myHeight += 20;
-			labelTable = slider.getLabelTable();
 			Enumeration keys = labelTable.keys();
 			while (keys.hasMoreElements()) {
 				Object key = keys.nextElement();
 				int n = Integer.parseInt(key.toString());
 				JLabel label = labelTable.get(key);
-				DOMNode labelNode = ((JSComponentUI) label.getUI()).getOuterNode();
+				JSComponentUI lui = label.秘getUI();
+				if (!lui.imagePersists) {
+					lui.imagePersists = true;
+					lui.setTainted();
+					lui.updateDOMNode();
+				}
+				DOMNode labelNode = lui.getOuterNode();
 				// need calculation of pixels
 				float frac = (n - min) * 1f / (max - min);
 				if (isHoriz == isInverted)
 					frac = 1 - frac;
 				float px = (frac * length + margin);
 				int left, top;
 				if (isHoriz) {
-					top = 20;
+					top = (paintTicks ? 20 : 15);
 					left = (int) (px - label.getWidth() / 2);
 				} else {
 					top = (int) (px - label.getHeight() / 2);
-					left = 20;
+					left = (paintTicks ? 20 : 15);
 				}
 				DOMNode.setTopLeftAbsolute(labelNode, top, left);
 				addClass(labelNode, "jslider-label");
@@ -798,6 +803,7 @@ protected int getWidthOfWidestLabel() {
             while ( keys.hasMoreElements() ) {
                 JComponent label = (JComponent) dictionary.get(keys.nextElement());
                 widest = Math.max( label.getPreferredSize().width, widest );
+                label.秘getUI().imagePersists = true;
             }
         }
         return widest;
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Anon.java b/sources/net.sf.j2s.java.core/src/test/Test_Anon.java
@@ -12,11 +12,13 @@ class Test_Anon extends Test_ {
 	private static boolean b = !(true);
 	private static int x = -(3);
 	public static final Enumeration<?> EMPTY_ENUMERATION = new Enumeration<Object>() {
-        public boolean hasMoreElements() {
+        @Override
+		public boolean hasMoreElements() {
             return isAnonymous(); 
         }
         
-        public Object nextElement() {
+        @Override
+		public Object nextElement() {
             throw new NoSuchElementException();
         }
         
@@ -29,8 +31,36 @@ public boolean isAnonymous() {
 
   public Test_Anon() {}
   
+  int myInt = 33;
+  
+  private void privTest(int testInt) {
+	  System.out.println(this.myInt);
+  }
+  
+  @Override
+public int showt() {
+	  System.out.println("OHOH");
+	  assert(false);
+	  return 0;
+  }
+  private void testThis() {
+	  int testInt = 44;
+	  Runnable r = new Runnable() {
+
+		@Override
+		public void run() {
+			privTest(testInt);
+			Test_Anon.super.showt();
+		}
+	  };
+
+	  r.run();  
+	  
+  }
   public static void main(String[] args) { 
 	  int z = x;
+	  new Test_Anon().testThis();
+	  
 	  boolean a = !(Test_Class.Test_Class_Inner.i == 3);
 	  new Test_Class.Test_Class_Inner();
 	  new Test_Class.Test_Class_Inner().newInstance();
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Applet_Slider.java b/sources/net.sf.j2s.java.core/src/test/Test_Applet_Slider.java
@@ -4,9 +4,12 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
+import java.util.Dictionary;
+import java.util.Hashtable;
 
 import javax.swing.JApplet;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.event.ChangeEvent;
@@ -24,15 +27,30 @@ public class Test_Applet_Slider extends JApplet {
 		 */
 	}
 
+	private boolean paintTicks;
+
 	@Override
 	public void init() {
 
+		paintTicks = false;
 		JPanel p = new JPanel();
         JSlider redSlider = new JSlider(JSlider.HORIZONTAL, 0, 200, 80);
         redSlider.setFont(new Font("Helvetica", Font.PLAIN, 10));
-        redSlider.setMajorTickSpacing( 25 );
-        redSlider.setMinorTickSpacing( 5 );
-        redSlider.setPaintTicks( true );
+        if (paintTicks) { 
+            redSlider.setMajorTickSpacing( 25 );
+            redSlider.setMinorTickSpacing( 5 );
+            redSlider.setPaintTicks( true );
+        	
+        } else {
+        	Hashtable<Integer, JLabel> sliderLabels = new Hashtable<>();
+        	sliderLabels.put(Integer.valueOf(0),  new JLabel("0"));
+        	sliderLabels.put(Integer.valueOf(200),  new JLabel("200"));
+        	
+            redSlider.setMajorTickSpacing( 0 );
+            redSlider.setMinorTickSpacing( 0 );
+            redSlider.setPaintTicks( false );
+            redSlider.setLabelTable(sliderLabels);
+        }
         redSlider.setPaintLabels( true );
         redSlider.addChangeListener(new ChangeListener() {
 
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Video.java b/sources/net.sf.j2s.java.core/src/test/Test_Video.java

Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,7 @@ public void setLabelFor(Component c) {`
`1001`	`1001`	`public Object getClientProperty(Object key) {`
`1002`	`1002`	`if (key == "jsvideo") {`
`1003`	`1003`	`getOrCreatePeer();`
	`1004`	`+ 秘getUI().updateDOMNode();`
`1004`	`1005`	`return 秘getUI().imageNode;`
`1005`	`1006`	`}`
`1006`	`1007`	`return super.getClientProperty(key);`