cursor this.name corrected; cursor names consolidated; showing for panel

hansonr · hansonr · commit 58781b5b3b2b · 2018-11-24T12:09:25.000-06:00
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 @@
-20181124101315 
+20181124120031 
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 @@
-20181124101315 
+20181124120031 
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/awt/Cursor.java b/sources/net.sf.j2s.java.core/src/java/awt/Cursor.java
@@ -27,6 +27,8 @@
  */
 package java.awt;
 
+import swingjs.JSToolkit;
+
 /**
  * A class to encapsulate the bitmap representation of the mouse cursor.
  *
@@ -297,9 +299,9 @@ public Cursor(int type) {
             throw new IllegalArgumentException("illegal cursor type");
         }
         this.type = type;
-
-        // Lookup localized name.
-        name = "TODO_CURSOR";//Toolkit.getProperty(cursorProperties[type][0],
+        name = "TODO_CURSOR";
+        name = JSToolkit.getCursorName(this);
+        		//Toolkit.getProperty(cursorProperties[type][0],
                            //        cursorProperties[type][1]);
     }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -770,54 +770,45 @@ public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge)
 		return null;
 	}
 
-	public static void setCursor(Component comp, Cursor c) {
-		String curs = null;
-    switch(c == null ? Cursor.DEFAULT_CURSOR : c.getType()) {
-    case Cursor.CROSSHAIR_CURSOR: 
-      curs = "crosshair";
-      break;
-    case Cursor.WAIT_CURSOR:
-      curs = "wait";
-      break;
-    case Cursor.TEXT_CURSOR:     
-    	curs = "text";
-    	break;
-    case Cursor.N_RESIZE_CURSOR:
-    case Cursor.S_RESIZE_CURSOR: 
-      curs = "ns-resize"; 
-      break;
-    case Cursor.HAND_CURSOR:
-      curs = "grab"; 
-      break;
-    case Cursor.MOVE_CURSOR: 
-    	curs = "move";
-      break;
-    case Cursor.NE_RESIZE_CURSOR:
-    case Cursor.SW_RESIZE_CURSOR:
-      curs = "nesw-resize";
-      break;
-    case Cursor.SE_RESIZE_CURSOR:
-    case Cursor.NW_RESIZE_CURSOR:
-      curs = "nwse-resize";
-      break;
-    case Cursor.E_RESIZE_CURSOR:
-    case Cursor.W_RESIZE_CURSOR:
-      curs = "ew-resize";
-      break;
-    case Cursor.DEFAULT_CURSOR:
-    default:
-      curs = "default";
-      break;
-    }		
-		DOMNode.setCursor(curs, comp);
-		
-	}
-
-	
 
-//////// FONTS ///////
+//////// FONTS and CURSORS ///////
 	
+//	public static void setCursor(Component comp, Cursor c) {
+//		DOMNode.setCursor(getCursorName(c), comp);
+//	}
 	
+	public static String getCursorName(Cursor c) {
+		switch (c == null ? Cursor.DEFAULT_CURSOR : c.getType()) {
+		case Cursor.CROSSHAIR_CURSOR:
+			return "crosshair";
+		case Cursor.WAIT_CURSOR:
+			return "wait";
+		case Cursor.TEXT_CURSOR:
+			return "text";
+		case Cursor.HAND_CURSOR:
+			return "grab";
+		case Cursor.MOVE_CURSOR:
+			return "move";
+		case Cursor.N_RESIZE_CURSOR:
+		case Cursor.S_RESIZE_CURSOR:
+			return "ns-resize";
+		case Cursor.NE_RESIZE_CURSOR:
+		case Cursor.SW_RESIZE_CURSOR:
+			return "nesw-resize";
+		case Cursor.SE_RESIZE_CURSOR:
+		case Cursor.NW_RESIZE_CURSOR:
+			return "nwse-resize";
+		case Cursor.E_RESIZE_CURSOR:
+		case Cursor.W_RESIZE_CURSOR:
+			return "ew-resize";
+		case Cursor.CUSTOM_CURSOR:
+			return c.getName();
+		case Cursor.DEFAULT_CURSOR:
+		default:
+			return "default";
+		}
+	}
+
 	private static String[] hardwiredFontList; 
 
 	// -- Obsolete font names from 1.0.2. It was decided that
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js
@@ -236,7 +236,7 @@
 
 				_destroy : function() {
 					
-					for (i = 0; i < handles.length; i++) {
+					for (i = 0; i < this.handles.length; i++) {
 						J2S.setDraggable(this.handles[i], false);
 					}
 					
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
@@ -2138,31 +2138,12 @@ public void setFont(Font f) {
 
 	@Override
 	public void updateCursorImmediately() {
-		String curs = getCursorName(c.getCursor());
 		setHTMLElement();
-		DOMNode.setStyles(domNode, "cursor", curs);
+		String curs = JSToolkit.getCursorName(c.getCursor());
+		DOMNode.setStyles(outerNode, "cursor", curs);
 		setWaitImage(curs == "wait");
 	}
 
-	static String getCursorName(Cursor cursor) {
-		switch (cursor.getType()) {
-		case Cursor.CROSSHAIR_CURSOR:
-			return "crosshair";
-		case Cursor.WAIT_CURSOR:
-			return "wait";
-		case Cursor.N_RESIZE_CURSOR: // zoom
-			return "ns-resize";
-		case Cursor.HAND_CURSOR: // hand
-			return "grab";
-		case Cursor.MOVE_CURSOR:
-			return "move";
-		case Cursor.CUSTOM_CURSOR:
-			return cursor.getName();
-		default:
-			return "default";
-		}
-	}
-
 	protected void setWaitImage(boolean doShow) {
 		if (waitImage != null) {
 			if (!doShow)
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java
@@ -53,6 +53,7 @@
 import javax.swing.UIManager;
 
 import javajs.api.JSFunction;
+import swingjs.JSToolkit;
 import swingjs.api.js.DOMNode;
 
 /**
@@ -238,7 +239,7 @@ protected void fHandleDrag(Object xyev, int type) {
 				this.xyev = xyev;
 				this.pressedLocation = splitPane.getDividerLocation();
 				divider.setCursor(cursor);
-				DOMNode.setCursor(getCursorName(cursor), null);
+				DOMNode.setCursor(JSToolkit.getCursorName(cursor), null);
 				return;
 			case MouseEvent.MOUSE_DRAGGED:
 				int d = this.pressedLocation + /** @j2sNative (this.isHorizontal ? xyev.dx : xyev.dy) || */

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`*/`
`28`	`28`	`package java.awt;`
`29`	`29`
	`30`	`+import swingjs.JSToolkit;`
	`31`	`+`
`30`	`32`	`/**`
`31`	`33`	`* A class to encapsulate the bitmap representation of the mouse cursor.`
`32`	`34`	`*`
`@@ -297,9 +299,9 @@ public Cursor(int type) {`
`297`	`299`	`throw new IllegalArgumentException("illegal cursor type");`
`298`	`300`	`}`
`299`	`301`	`this.type = type;`
`300`		`-`
`301`		`- // Lookup localized name.`
`302`		`- name = "TODO_CURSOR";//Toolkit.getProperty(cursorProperties[type][0],`
	`302`	`+ name = "TODO_CURSOR";`
	`303`	`+ name = JSToolkit.getCursorName(this);`
	`304`	`+ //Toolkit.getProperty(cursorProperties[type][0],`
`303`	`305`	`// cursorProperties[type][1]);`
`304`	`306`	`}`
`305`	`307`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@`
`236`	`236`
`237`	`237`	`_destroy : function() {`
`238`	`238`
`239`		`- for (i = 0; i < handles.length; i++) {`
	`239`	`+ for (i = 0; i < this.handles.length; i++) {`
`240`	`240`	`J2S.setDraggable(this.handles[i], false);`
`241`	`241`	`}`
`242`	`242`