java2script
diff --git a/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
25 Bytes b/‎sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar‎
25 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
25 Bytes b/‎sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar‎
25 Bytes
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 19 additions & 16 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java‎
Lines changed: 19 additions & 16 deletions
@@ -122,6 +122,7 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// 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
 // BH 6/24/2018 -- synchronized(a = new Object()) {...} ---> ...; only if an assignment or not a simple function call to Object.getTreeLock()
@@ -745,12 +746,23 @@ private void acceptVariableFinal(SimpleName name, int offset) {
 			int level = blockLevel + offset;
 			VariableAdapter.FinalVariable f = new VariableAdapter.FinalVariable(level, identifier,
 					methodDeclareNameStack.size() == 0 ? null : methodDeclareNameStack.peek());
-			addVariable(f, identifier, binding);
+			List<VariableAdapter.FinalVariable> finalVars = getVariableList('f');
+			List<VariableAdapter.FinalVariable> normalVars = getVariableList('n');
+			f.toVariableName = identifier;
+			normalVars.add(f);			
+			if (isFinalOrEffectivelyFinal(binding)) {
+				finalVars.add(f);
+			}
 			//buffer.append("/*blockLevel " + blockLevel + " level " + level + "*/");
 		}
 		name.accept(this);
 	}
 
+	private static boolean isFinalOrEffectivelyFinal(IBinding binding) {
+		return Modifier.isFinal(binding.getModifiers()) 
+				|| binding instanceof IVariableBinding && ((IVariableBinding)binding).isEffectivelyFinal();
+	}
+
 	private void removeVariableFinals(MethodDeclaration node) {
 		IMethodBinding mBinding = node.resolveBinding();
 		if (mBinding != null)
@@ -771,7 +783,7 @@ private void removeVariableFinals(MethodDeclaration node) {
 				f.toVariableName = identifier;
 				normalVars.remove(f);
 				//buffer.append("/*remNorm " + f.variableName + "/to/" + f.toVariableName + "*/");
-				if (Modifier.isFinal(binding.getModifiers())) {
+				if (isFinalOrEffectivelyFinal(binding)) {
 					finalVars.remove(f);
 					//buffer.append("/*remFinal " + f.variableName + "/to/" + f.toVariableName + "*/");
 				}
@@ -1670,7 +1682,7 @@ private boolean addFieldDeclaration(FieldDeclaration field, int mode) {
 				: ((PrimitiveType) nodeType).getPrimitiveTypeCode());
 		ITypeBinding classBinding = resolveAbstractOrAnonymousBinding(field);
 		// have to check here for final Object = "foo", as that must not be ignored.
-		boolean checkFinalConstant = (isStatic && Modifier.isFinal(field.getModifiers())
+		boolean checkFinalConstant = (isStatic && Modifier.isFinal(field.getModifiers())				
 				&& var != null && !var.getType().getQualifiedName().equals("java.lang.Object"));
 		if (needDefault)
 			preVisit2(field);
@@ -2903,7 +2915,7 @@ private String simpleNameInVarBinding(SimpleName node, char ch, IVariableBinding
 				}
 			}
 			String fieldVar = null;
-			if (isAnonymousClass() && Modifier.isFinal(varBinding.getModifiers())
+			if (isAnonymousClass() && isFinalOrEffectivelyFinal(varBinding)
 					&& varBinding.getDeclaringMethod() != null) {
 				String key = varBinding.getDeclaringMethod().getKey();
 				if (methodDeclareNameStack.size() == 0 || !key.equals(methodDeclareNameStack.peek())) {
@@ -3036,6 +3048,9 @@ public boolean visit(VariableDeclarationExpression node) {
 	}
 
 	public boolean visit(VariableDeclarationFragment node) {
+		
+		
+		
 		SimpleName name = node.getName();
 		IBinding binding = name.resolveBinding();
 		if (binding == null)
@@ -3690,18 +3705,6 @@ private void addQualifiedNameFromBinding(IVariableBinding varBinding, boolean is
 				isStatic(varBinding), true);
 	}
 
-	private void addVariable(VariableAdapter.FinalVariable f, String identifier, IBinding binding) {
-		List<VariableAdapter.FinalVariable> finalVars = getVariableList('f');
-		List<VariableAdapter.FinalVariable> normalVars = getVariableList('n');
-		f.toVariableName = identifier;
-		normalVars.add(f);
-		//buffer.append("/*addVar n " + identifier + " */");
-		if (Modifier.isFinal(binding.getModifiers())) {
-			finalVars.add(f);
-			//buffer.append("/*addVar f " + identifier + " */");
-		}
-	}
-
 	/**
 	 * Determine the qualifier for a method or variable. 
 	 *