aesthetics only

hansonr · hansonr · commit 08c7515a6ccc · 2018-09-05T07:40:28.000+02:00
diff --git a/dist/README.txt b/dist/README.txt
@@ -1,3 +1,3 @@
 SwingJS distribution README.txt  
 
-See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist
+See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist/README.txt
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
@@ -32,11 +32,11 @@
  * @author Bob Hanson
  *
  */
-public class Java2ScriptCompiler {
+class Java2ScriptCompiler {
 	/**
 	 * The name of the J2S options file, aka as the "Dot-j2s" file.
 	 */
-	public static final String J2S_OPTIONS_FILE_NAME = ".j2s";
+	private static final String J2S_OPTIONS_FILE_NAME = ".j2s";
 	
 	// BH: added "true".equals(getProperty(props,
 	// "j2s.compiler.allow.compression")) to ensure compression only occurs when
@@ -77,15 +77,15 @@ public class Java2ScriptCompiler {
 
 	private IJavaProject project;
 
-	public static boolean isActive(IJavaProject project) {
+	static boolean isActive(IJavaProject project) {
 		try {
 			return new File(project.getProject().getLocation().toOSString(), J2S_OPTIONS_FILE_NAME).exists();
 		} catch (@SuppressWarnings("unused") Exception e) {
 			return false;
 		}
 	}
 
-	public Java2ScriptCompiler() {
+	Java2ScriptCompiler() {
 		// initialized only once using CompilationParticipant; every time using
 		// older Builder idea
 	}
@@ -94,7 +94,7 @@ public Java2ScriptCompiler() {
 	 * only for CompilationParticipant
 	 * @param isClean
 	 */
-	public void startBuild(boolean isClean) {
+	void startBuild(boolean isClean) {
 		// at the beginning of a clean build, clear data
 		isCleanBuild = isClean;
 		htmlTemplate = null;
@@ -106,19 +106,7 @@ public void startBuild(boolean isClean) {
 
 	}
 
-//	/**
-//	 * old way from original builder
-//	 * 
-//	 */
-//	public void process(ICompilationUnit sourceUnit, IContainer binaryFolder) {
-//		if (!(sourceUnit instanceof SourceFile))
-//			return;
-//		if (!initializeProject(binaryFolder.getProject(), false))
-//			return;
-//		compileToJavaScript(((SourceFile) sourceUnit).resource);
-//	}
-
-	/**
+ 	/**
 	 * from Java2ScriptCompilationParticipant.java
 	 * 
 	 * get all necessary .j2s params for a build
@@ -128,7 +116,7 @@ public void startBuild(boolean isClean) {
 	 * @return true if this is a j2s project and is enabled
 	 * 
 	 */
-	public boolean initializeProject(IJavaProject project, boolean isCompilationParticipant) {
+	boolean initializeProject(IJavaProject project, boolean isCompilationParticipant) {
 		this.project = project;
 		this.isCompilationParticipant = isCompilationParticipant;
 		if (!isActive(project)) {
@@ -246,7 +234,7 @@ public boolean initializeProject(IJavaProject project, boolean isCompilationPart
 	 * 
 	 * @param javaSource
 	 */
-	public boolean compileToJavaScript(IFile javaSource) {
+	boolean compileToJavaScript(IFile javaSource) {
 
 		String fileName = new String(javaSource.getName());
 		if (lstExcludedPaths != null) {
@@ -312,6 +300,9 @@ public boolean compileToJavaScript(IFile javaSource) {
 		return true;
 	}
 
+	//// private methods ////
+	
+	
 	private void logMethods(String logCalled, String logDeclared, boolean doAppend) {
 		if (htMethodsCalled != null)
 			try {
@@ -353,7 +344,7 @@ private String getProperty(String key) {
 		return val;
 	}
 
-	public void outputJavaScript(Java2ScriptVisitor visitor,
+	private void outputJavaScript(Java2ScriptVisitor visitor,
 			// DependencyASTVisitor dvisitor, CompilationUnit fRoot,
 			String j2sPath) {
 
@@ -420,6 +411,8 @@ private void writeToFile(File file, String data) {
 	/**
 	 * The default .j2s file. Replaces .j2s only if it is found but is empty.
 	 * 
+	 * OK, I know this should be a resource.
+	 * 
 	 * 
 	 * 
 	 */

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`SwingJS distribution README.txt`
`2`	`2`
`3`		`-See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist`
	`3`	`+See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist/README.txt`