java2script
diff --git a/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
175 Bytes b/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
175 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
175 Bytes b/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
175 Bytes
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 12 additions & 1 deletion b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
-57 Bytes b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
-57 Bytes
diff --git a/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java‎
Lines changed: 2 additions & 11 deletions b/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java‎
Lines changed: 2 additions & 11 deletions
@@ -122,6 +122,7 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// BH 7/3/2018 -- adds tryWithResource
 // BH 7/3/2018 -- adds effectively final -- FINAL keyword no longer necessary  
 // BH 6/27/2018 -- fix for a[Integer] not becoming a[Integer.valueOf]
 // BH 6/26/2018 -- method logging via j2s.log.methods.called and j2s.log.methods.declared
@@ -1005,10 +1006,20 @@ public boolean visit(ThrowStatement node) {
 		return false;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "null" })
 	public boolean visit(TryStatement node) {
 		buffer.append("try ");
+		List<VariableDeclarationExpression> resources = node.resources();
+		int pt = (resources == null || resources.size() == 0 ? -1 : buffer.length() + 1);
 		node.getBody().accept(this);
+		if (pt >= 0) {
+			String buf = buffer.substring(pt);
+			buffer.setLength(pt);
+			for (int i = 0; i  < resources.size(); i++) {
+			   resources.get(i).accept(this);	
+			}			
+			buffer.append(buf);			
+		}
 		List<CatchClause> catchClauses = node.catchClauses();
 		int size = catchClauses.size();
 		if (size > 0) {
 
@@ -985,17 +985,8 @@ private int compare(int model1, int model2) {
                     result = 1;
                 } else {
                 		Comparator c = sortComparators[counter];
-                		// BH ??????? BH
-                		/**
-                		 *  @j2sNative
-                		 *  
-                		 *  result = (c != null ? c.compare$O$O(v1, v2) : typeof c == "object" ? 
-                		 *    ((v1 = v1.toString()) < (v2 = v2.toString) ? -1 : v1 == v2 ? 0 : 1)
-                		 *    : (v1 < v2 ? -1 : v1 == v2 ? 0 : 1));   
-                		 */
-                		{
-                			result = c.compare(v1, v2);
-                		}
+                		// problem here is that comparators are T, but here we have I
+             			result = (/** @j2sNative  c.compare$O$O ? c.compare$O$O(v1,v2) : */ c.compare(v1, v2));
                 }
                 if (sortOrder == SortOrder.DESCENDING) {
                     result *= -1;