java2script · BobHanson · Jan 19, 2024 · Nov 28, 2023 · Dec 1, 2023 · Dec 1, 2023
diff --git a/README.md b/README.md
@@ -19,13 +19,31 @@ within Eclipse, with immediate JavaScript testing and debugging in a browser bas
 in Java. Using the java2script/SwingJS Eclipse plug-in, both Java .class files and their equivalent .js files are created simultaneously. 
 
 
-java2script/SwingJS includes an Eclipse plug-in (technically a "drop-in"), net.sf.j2s.core.zip
+java2script/SwingJS includes an Eclipse plug-in (technically a "drop-in"), net.sf.j2s.cor
+
+e.zip
 (see https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.core/dist/swingjs), 
 along with a JavaScript version of the Java Virtual Machine (SwingJS, https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.java.core/SwingJS-site.zip) 
 to allow the rapid and
 automated production of browser-ready JavaScript versions of Java applications and applets. 
 
 
+# Working Examples
+
+Examples of SwingJS applied to allow single-source Java+JavaScript development include:
+
+Jmol-SwingJS  https://github.com/BobHanson/Jmol-SwingJS
+
+JalView-JS https://www.jalview.org/jalview-js
+
+MathePrisma https://www.matheprisma.de/  (over 600 applets)
+
+Open Source Physics (OSP) https://github.com/OpenSourcePhysics/osp/tree/swingJS
+
+TrackerJS https://physlets.org/tracker/trackerJS
+
+
+
 # QuickStart
 
 See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist and the README file in that directory.

diff --git a/sources/net.sf.j2s.core/dist/swingjs/j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20231128000108 
+20240114215407 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20231128000108 
+20240114215407 
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SASTVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SASTVisitor.java
@@ -84,17 +84,12 @@ public boolean visit(PackageDeclaration node) {
 
 	public boolean visit(Block node) {
 		blockLevel++;
-		if (buffer != null) {
-			buffer.append("{\r\n");
-		}
 		ASTNode parent = node.getParent();
 		if (parent instanceof MethodDeclaration) {
 			MethodDeclaration method = (MethodDeclaration) parent;
 			Javadoc javadoc = method.getJavadoc();
-			/*
-			 * if comment contains "@j2sNative", then output the given native JavaScript
-			 * codes directly.
-			 */
+			// if comment contains "@j2sNative", then output the given native JavaScript
+			// codes directly.
 			if (!processJ2STags(javadoc, node, true)) {
 				return false;
 			}
@@ -118,10 +113,10 @@ public boolean visit(Block node) {
 						superclass = superclass.getSuperclass();
 					}
 					if (containsSuperPrivateMethod) {
-						buffer.append("var $private = Clazz.checkPrivateMethod (arguments);\r\n");
-						buffer.append("if ($private != null) {\r\n");
-						buffer.append("return $private.apply (this, arguments);\r\n");
-						buffer.append("}\r\n");
+						buffer.append("var $private = Clazz.checkPrivateMethod (arguments);\n");
+						buffer.append("if ($private != null) {\n");
+						buffer.append("return $private.apply (this, arguments);\n");
+						buffer.append("}\n");
 					}
 				}
 			}
@@ -244,8 +239,24 @@ protected boolean processJ2STags(Javadoc javadoc, Block node, boolean superVisit
 					if ("@j2sNative".equals(tagEl.getTagName())) {
 						if (superVisit)
 							super.visit(node);
-						if (buffer != null)
-							writeJavaScript(tagEl);
+						if (buffer != null) {
+							List<?> fragments = tagEl.fragments();
+							boolean isFirstLine = true;
+							StringBuffer buf = new StringBuffer();
+							for (Iterator<?> iterator = fragments.iterator(); iterator
+									.hasNext();) {
+								TextElement commentEl = (TextElement) iterator.next();
+								String text = commentEl.getText().trim();
+								if (isFirstLine) {
+									if (text.length() == 0) {
+										continue;
+									}
+								}
+								buf.append(text);
+								buf.append("\n");
+							}
+							buffer.append(fixCommentBlock(buf.toString()));
+						}
 						return false;
 					}
 				}
@@ -254,25 +265,6 @@ protected boolean processJ2STags(Javadoc javadoc, Block node, boolean superVisit
 		return true;
 	}
 
-	private void writeJavaScript(TagElement tagEl) {
-		List<?> fragments = tagEl.fragments();
-		boolean isFirstLine = true;
-		StringBuffer buf = new StringBuffer();
-		for (Iterator<?> iterator = fragments.iterator(); iterator
-				.hasNext();) {
-			TextElement commentEl = (TextElement) iterator.next();
-			String text = commentEl.getText().trim();
-			if (isFirstLine) {
-				if (text.length() == 0) {
-					continue;
-				}
-			}
-			buf.append(text);
-			buf.append("\r\n");
-		}
-		buffer.append(fixCommentBlock(buf.toString()));
-	}
-
 	private String fixCommentBlock(String text) {
 		if (text == null || text.length() == 0) {
 			return text;
@@ -284,16 +276,19 @@ private String fixCommentBlock(String text) {
 
 	/**
 	 * Write JavaScript source from @j2sNative and @J2SIgnore
+	 * 
+	 * @return true if JavaScript was written
 	 */
-	protected boolean writeJ2SSources(BodyDeclaration node, String tagName, String prefix, String suffix, boolean both) {
-		boolean existed = false;
+	protected boolean writeJ2STags(BodyDeclaration node, boolean needScope) {
+		String prefix = (needScope ? "{\n" : "");
+		String suffix = (needScope ? "\n}" : "");
 		Javadoc javadoc = node.getJavadoc();
 		if (javadoc != null) {
 			List<?> tags = javadoc.tags();
 			if (tags.size() != 0) {
 				for (Iterator<?> iter = tags.iterator(); iter.hasNext();) {
 					TagElement tagEl = (TagElement) iter.next();
-					if (tagName.equals(tagEl.getTagName())) {
+					if ("@j2sNative".equals(tagEl.getTagName())) {
 						List<?> fragments = tagEl.fragments();
 						StringBuffer buf = new StringBuffer();
 						boolean isFirstLine = true;
@@ -306,19 +301,16 @@ protected boolean writeJ2SSources(BodyDeclaration node, String tagName, String p
 								}
 							}
 							buf.append(text);
-							buf.append("\r\n");
+							buf.append("\n");
 						}
 						String sources = buf.toString().trim();
 						sources = sources.replaceAll("(\\/)-\\*|\\*-(\\/)", "$1*$2").replaceAll("<@>", "@");
 						buffer.append(prefix + sources + suffix);
-						existed = true;
+						return true;
 					}
 				}
 			}
 		}
-		if (existed && !both) {
-			return existed;
-		}
 		List<?> modifiers = node.modifiers();
 		for (Iterator<?> iter = modifiers.iterator(); iter.hasNext();) {
 			Object obj = iter.next();
@@ -327,9 +319,7 @@ protected boolean writeJ2SSources(BodyDeclaration node, String tagName, String p
 				String qName = annotation.getTypeName().getFullyQualifiedName();
 				int index = qName.indexOf("J2S");
 				if (index != -1) {
-					String annName = qName.substring(index);
-					annName = annName.replaceFirst("J2S", "@j2s");
-					if (annName.startsWith(tagName)) {
+					if (qName.substring(index).startsWith("J2SNative")) {
 						StringBuffer buf = new StringBuffer();
 						IAnnotationBinding annotationBinding = annotation.resolveAnnotationBinding();
 						if (annotationBinding != null) {
@@ -342,23 +332,23 @@ protected boolean writeJ2SSources(BodyDeclaration node, String tagName, String p
 											Object[] lines = (Object[]) value;
 											for (int j = 0; j < lines.length; j++) {
 												buf.append(lines[j]);
-												buf.append("\r\n");
+												buf.append("\n");
 											}
 										} else if (value instanceof String) {
 											buf.append(value);
-											buf.append("\r\n");
+											buf.append("\n");
 										}
 									}
 								}
 							}
 						}
 						buffer.append(prefix + buf.toString().trim() + suffix);
-						existed = true;
+						return true;
 					}
 				}
 			}
 		}
-		return existed;
+		return false;
 	}
 
 }
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SDependencyVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SDependencyVisitor.java
@@ -330,10 +330,8 @@ public boolean visit(TypeDeclaration node) {
 			allClassBindings.add(resolveBinding);
 		}
 		readJ2sImportTags(node);
-
 		processImports(node);
 		processJ2SRequireImport(node);
-		//visitForOptionals(node);
 		return super.visit(node);
 	}
 
@@ -345,7 +343,6 @@ public boolean visit(EnumDeclaration node) {
 			allClassBindings.add(resolveBinding);
 		}
 		readJ2sImportTags(node);
-
 		imports.add("java.lang.Enum");
 		processImports(node);
 		processJ2SRequireImport(node);
@@ -508,8 +505,8 @@ public boolean visit(MethodInvocation node) {
 
 	public boolean visit(Initializer node) {
 		if (J2SUtil.getJ2STag(node, "@j2sIgnore") != null) {
-			return false;
-		}
+		return false;
+	}
 		return super.visit(node);
 	}
 
@@ -842,7 +839,6 @@ private void processImports(AbstractTypeDeclaration node) {
 				if (mustAddDependency(qualifiedName, node, false)) {
 					imports.add(qn);
 				}
-				//musts.add(superBinding.getQualifiedName());
 			}
 		}
 		List<?> superInterfaces = null;