Merge pull request #46 from BobHanson/yadav1

BobHanson · web-flow · commit aaef0566462a · 2018-08-07T10:04:50.000-05:00
various fixes
diff --git a/sources/net.sf.j2s.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/dropins/timestamp b/sources/net.sf.j2s.core/dist/dropins/timestamp
@@ -1 +1 @@
-20180807091649 
+20180807100156 
diff --git a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
@@ -1 +1 @@
-20180807091649 
+20180807100156 
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/javax/swing/DefaultRowSorter.java b/sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java
@@ -1390,7 +1390,7 @@ public I getIdentifier() {
      */
     // NOTE: this class is static so that it can be placed in an array
     private static class Row implements Comparable<Row> {
-        private DefaultRowSorter sorter;
+        DefaultRowSorter sorter; 
         int modelIndex;
 
         public Row(DefaultRowSorter sorter, int index) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -228,7 +228,7 @@ Swing.showMenu = function(menu, x, y) {
 	menu.$ulTop.unbind('clickoutjsmol mousemoveoutjsmol');
   if (!J2S._persistentMenu)
   	menu.$ulTop.bind('clickoutjsmol mousemoveoutjsmol', function(evspecial, target, ev) {
-	  if (System.currentTimeMillis() - menu.timestamp > 1000)
+	  if (System.currentTimeMillis$() - menu.timestamp > 1000)
 		  Swing.hideMenu(menu);
 	});
 	menu.$ulTop.bind("contextmenu", function() {return false;});
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -2939,9 +2939,11 @@ java.lang.System = System = {
         v = "50";
         break;
       case "user.home":
-    	v = "https:/./";
+    	v = "https://./";
+    	break;
       case "java.vendor":
     	v = "SwingJS/OpenJDK";
+    	break;
       case "java.version":
         v = "1.6-1.8";
         break;
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -16376,9 +16376,11 @@ java.lang.System = System = {
         v = "50";
         break;
       case "user.home":
-    	v = "https:/./";
+    	v = "https://./";
+    	break;
       case "java.vendor":
     	v = "SwingJS/OpenJDK";
+    	break;
       case "java.version":
         v = "1.6-1.8";
         break;
