jalview
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
-105 KB b/‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
-105 KB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp
Lines changed: 4 additions & 0 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp
Lines changed: 4 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar
-105 KB b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar
-105 KB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
Lines changed: 4 additions & 0 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
Lines changed: 4 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
Lines changed: 6 additions & 0 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
Lines changed: 6 additions & 0 deletions
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20230329174944 
+=======
+20230329170441 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20230329174944 
+=======
+20230329170441 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script
@@ -1590,6 +1590,12 @@ private boolean addMethodInvocation(SimpleName javaQualifier, List<?> arguments,
 				      	&& ((ThisExpression) expression).getQualifier() != null)
 				|| class_localType == LAMBDA_EXPRESSION)
 			);
+<<<<<<< HEAD
+=======
+		
+bufferDebug("needbname " + needBname + " " + methodName + " " + isStatic);
+		
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script
 		String bname = (needBname ? getThisRefOrSyntheticReference(javaQualifier, declaringClass, null) : null);
 		// add the qualifier
 		int pt = buffer.length();