create dex with correct name when Java class name is explicitly specified

Author: Mihail Slavchev

binding-generator/src/main/java/com/tns/bindings/Dump.java

@@ -189,30 +189,23 @@ else if (c.isArray())
 		return buf.toString();
 	}
 
-	public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescriptor classTo, String[] methodOverrides, int ignored)
-	{
-		HashSet<String> methodOverridesSet = new HashSet<String>();
-		for (int i = 0; i < methodOverrides.length; i++)
-		{
-			String methodOverride = methodOverrides[i];
-			methodOverridesSet.add(methodOverride);
-		}
-
-    	generateProxy(aw, proxyName, classTo, methodOverridesSet, null, null);
-    }
-
     public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescriptor classTo, HashSet<String> methodOverrides, HashSet<ClassDescriptor> implementedInterfaces, AnnotationDescriptor[] annotations)
 	{
 		String classSignature = getAsmDescriptor(classTo);
 
-		String tnsClassSignature = LCOM_TNS +
-				classSignature.substring(1, classSignature.length() - 1).replace("$", "_");
+		String tnsClassSignature;
+		if (proxyName.contains(".")) {
+			tnsClassSignature = "L" + proxyName.replace('.', '/') + ";";
+		} else {
+			tnsClassSignature = LCOM_TNS +
+					classSignature.substring(1, classSignature.length() - 1).replace("$", "_");
 
-		if(!classTo.isInterface()) {
-			tnsClassSignature += CLASS_NAME_LOCATION_SEPARATOR + proxyName;
-		}
+			if (!classTo.isInterface()) {
+				tnsClassSignature += CLASS_NAME_LOCATION_SEPARATOR + proxyName;
+			}
 
-		tnsClassSignature += ";";
+			tnsClassSignature += ";";
+		}
 
 		ClassVisitor cv = generateClass(aw, classTo, classSignature, tnsClassSignature, implementedInterfaces, annotations);
 		MethodDescriptor[] methods = getSupportedMethods(classTo, methodOverrides, implementedInterfaces);

binding-generator/src/main/java/com/tns/bindings/ProxyGenerator.java

@@ -56,16 +56,18 @@ public String generateProxy(String proxyName, ClassDescriptor classToProxy, Hash
 		aw.visitEnd();
 		byte[] generatedBytes = aw.toByteArray();
 
-		String proxyFileName = classToProxy.getName().replace('$', '_');
+		String proxyFileName;
 
-		if(!isInterface)
-		{
-			proxyFileName += Dump.CLASS_NAME_LOCATION_SEPARATOR + proxyName;
-		}
-
-		if (proxyThumb != null)
-		{
-			proxyFileName += "-" + proxyThumb;
+		if (proxyName.contains(".")) {
+			proxyFileName = proxyName;
+		} else {
+			proxyFileName = classToProxy.getName().replace('$', '_');
+			if (!isInterface) {
+				proxyFileName += Dump.CLASS_NAME_LOCATION_SEPARATOR + proxyName;
+			}
+			if (proxyThumb != null) {
+				proxyFileName += "-" + proxyThumb;
+			}
 		}
 
 		if (IsLogEnabled) System.out.println("Generator: Saving proxy with file name: " + proxyFileName);