JLayerPane issue when resizing pallette-depth frames

Author: hansonr

sources/net.sf.j2s.java.core/src/java/awt/Container.java

@@ -808,7 +808,12 @@ private void addDelicately(Component comp, Container curParent, int index) {
         checkTreeLock();
 
         // Check if moving between containers
-        if (curParent != this) {
+        if (curParent == this) {
+            if (index < component.size()) {
+                component.set(index, comp);
+                _childTainted = true;
+            }
+        } else {
             //index == -1 means add to the end.
             if (index == -1) {
                 component.add(comp);
@@ -823,11 +828,6 @@ private void addDelicately(Component comp, Container curParent, int index) {
             adjustListeningChildren(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK,
                                     comp.numListening(AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK));
             adjustDescendants(comp.countHierarchyMembers());
-        } else {
-            if (index < component.size()) {
-                component.set(index, comp);
-                _childTainted = true;
-            }
         }
 
         invalidateIfValid();

sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java

@@ -284,15 +284,18 @@ public boolean isBackgroundSet() {
 	}
 
 	protected void updateUIZOrder() {
-		if (uiClassID != "DesktopPaneUI")
-			return;
+		
+// developer could have created their own LayeredPane
+//       if (uiClassID != "DesktopPaneUI")
+//			return;
+		
 		// set the n by their position in the component list using the 
 		// same z orders that are already there - probably something like 
 		// 10000, 11000, 12000
     	int n = ((Container) this).getComponentCount();
-    	JSComponent[] components = (JSComponent[]) getChildArray((Container) this);
     	if (n < 2)
     		return;
+    	JSComponent[] components = (JSComponent[]) getChildArray((Container) this);
     	int[] zorders = new int[n];
         for (int i = 0; i < n; i++)
             zorders[i] = ((JSComponentUI) components[i].getUI()).getZIndex(null);

sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java

@@ -698,7 +698,6 @@ protected void paintChildren(Graphics g) {
 					jsg.setColor(jc.getForeground());
 					jsg.setFont(jc.getFont());
 					boolean shouldSetFlagBack = false;
-					// System.out.println("JC Painting " + comp.getName() + " " + cr);
 					try {
 //						if (isJComponent) {
 							// if (getFlag(ANCESTOR_USING_BUFFER)) {
@@ -3511,7 +3510,7 @@ void setUIProperty(String propertyName, Object value) {
 			// }
 		} else {
 			// SwingJS throw new IllegalArgumentException
-			System.out.println(JSToolkit.getClassNameForObject(this) + " property \""
+			System.out.println(getClass().getName() + " property \""
 					+ propertyName + "\" cannot be set using this method"
 					+ JSUtil.getStackTrace(5));
 		}
@@ -3788,10 +3787,6 @@ boolean rectangleIsObscured(int x, int y, int width, int height) {
 					&& (y + height) <= (cy + ch) && child.isVisible()) {
 
 				if (child instanceof JComponent) {
-					// System.out.println("A) checking opaque: " +
-					// ((JComponent)child).isOpaque() + "  " + child);
-					// System.out.print("B) ");
-					// Thread.dumpStack();
 					return ((JComponent) child).isOpaque();
 				} else {
 					/**
@@ -4227,7 +4222,6 @@ public void revalidate() {
 		// internal structural change.
 		if (ui != null)
 			((JSComponentUI)ui).setTainted();
-		// System.out.println("revalidate on " + this);
 		if (getParent() == null) {
 			// Note: We don't bother invalidating here as once added
 			// to a valid parent invalidate will be invoked (addImpl
@@ -4238,11 +4232,9 @@ public void revalidate() {
 			return;
 		}
 		if (SwingUtilities.isEventDispatchThread()) {
-			// System.out.println("JC revalidate invalidating dispatch " + this);
 			invalidate();
 			RepaintManager.currentManager(this).addInvalidComponent(this);
 		} else {
-			// System.out.println("JC revalidate checking flag " +
 			// getFlag(REVALIDATE_RUNNABLE_SCHEDULED) + " " + this);
 			// To avoid a flood of Runnables when constructing GUIs off
 			// the EDT, a flag is maintained as to whether or not
@@ -4253,15 +4245,13 @@ public void revalidate() {
 				}
 				setFlag(REVALIDATE_RUNNABLE_SCHEDULED, true);
 			}
-			// System.out.println("JC revalidate invoking later " + this);
 			// final Object me = this;
 			Runnable callRevalidate = new Runnable() {
 				@Override
 				public void run() {
 					synchronized (JComponent.this) {
 						setFlag(REVALIDATE_RUNNABLE_SCHEDULED, false);
 					}
-					// System.out.println("JC revalidating " + me);
 					revalidate();
 				}
 			};
@@ -4422,8 +4412,6 @@ void _paintImmediately(int x, int y, int w, int h) {
 		paintImmediatelyClip.width = w;
 		paintImmediatelyClip.height = h;
 
-		// System.out.println("1) ************* in _paintImmediately for " + this);
-
 		boolean ontop = alwaysOnTop() && isOpaque();
 		if (ontop) {
 			SwingUtilities.computeIntersection(0, 0, getWidth(), getHeight(),

sources/net.sf.j2s.java.core/src/javax/swing/JLayeredPane.java

@@ -381,6 +381,7 @@ public void setLayer(Component c, int layer, int position)  {
         layerObj = getObjectForLayer(layer);
 
         if(layer == getLayer(c) && position == getPosition(c)) {
+            updateUIZOrder();
             //SwingJS - not necessary    repaint(c.getBounds());
             return;
         }
@@ -392,13 +393,11 @@ public void setLayer(Component c, int layer, int position)  {
             getComponentToLayer().put((Component)c, layerObj);
 
         if(c.getParent() == null || c.getParent() != this) {
-            //SwingJS not necessary repaint(c.getBounds());
+            //SwingJS not necessary: repaint(c.getBounds());
             return;
         }
 
-        int index = insertIndexForLayer(c, layer, position);
-
-        setComponentZOrder(c, index);
+        setComponentZOrder(c, insertIndexForLayer(c, layer, position));
         // SwingJS not necessary repaint(c.getBounds());
     }
 

sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java

@@ -153,7 +153,7 @@ public void setTainted() {
 	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		String prop = e.getPropertyName();
-		System.out.println("JSTableUI prop=" + e);
+		System.out.println("JSTableUI prop=" + prop);
 		switch (prop) {
 		case "model":
 			currentRowMin = currentRowMax = -1;