predefined package names that cannot be var names

BobHanson · BobHanson · commit 3ebec8955623 · 2017-08-25T16:25:47.000+05:30
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -642,8 +642,10 @@ private void addMethodArgument(Expression exp, String clazzName, String methodNa
 		}
 		ITypeBinding expTypeBinding = exp.resolveTypeBinding();
 		String expTypeName = (expTypeBinding == null ? null : expTypeBinding.getName());
-		if (expTypeBinding == null)
+		if (expTypeBinding == null) {
 			System.err.println("typeBinding was null in " + clazzName + "." + methodName + " " + parameterTypeName  + " " + exp);
+			return;
+		}
 		// BH: Question: When does typeBinding == null?
 		// only continue if we are converting a character to a non-character type
 		// Keep String#indexOf(int) and String#lastIndexOf(int)'s first char argument
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -384,13 +384,15 @@ public boolean visit(PackageDeclaration node) {
 
 	
 
+	private String[] defaultPackageNamesDefined = {"java", "javax", "sun", "jsjava", "jsjavax", "jssun"};	
 	private void addPackage(String name) {
 		int pt = name. indexOf(".");
 		if (pt >= 0)
 			name = name.substring(0, pt);
 		if (definedBasePackageNames == null) {
 			definedBasePackageNames = new HashSet<String>();
-			definedBasePackageNames.add("java");
+			for (int i = defaultPackageNamesDefined.length; --i >= 0;)
+				definedBasePackageNames.add(defaultPackageNamesDefined[i]);
 		}
 		if (definedBasePackageNames.add(name)) {
 			System.err.println("adding package " + name);
