Browse Source

Fix method signatures containing only the short name instead of full class name.

Stan Hebben 5 years ago
parent
commit
5ea804b3d3

+ 1
- 1
JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java View File

596
 			mapping.put(context.get(javaParameters[i]), loadType(loadContext, parameters[i], false, false));
596
 			mapping.put(context.get(javaParameters[i]), loadType(loadContext, parameters[i], false, false));
597
 		
597
 		
598
 		JavaMethod method = new JavaMethod(
598
 		JavaMethod method = new JavaMethod(
599
-				JavaClass.fromInternalName(cls.getName().replace('.', '/'), JavaClass.Kind.INTERFACE),
599
+				JavaClass.fromInternalName(getInternalName(cls), JavaClass.Kind.INTERFACE),
600
 				JavaMethod.Kind.INTERFACE,
600
 				JavaMethod.Kind.INTERFACE,
601
 				functionalInterfaceMethod.getName(),
601
 				functionalInterfaceMethod.getName(),
602
 				false,
602
 				false,

+ 2
- 1
JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeGenericVisitor.java View File

118
 
118
 
119
 	@Override
119
 	@Override
120
 	public String visitDefinition(StoredType context, DefinitionTypeID definition) {
120
 	public String visitDefinition(StoredType context, DefinitionTypeID definition) {
121
-		StringBuilder builder = new StringBuilder("L").append(definition.definition.name);
121
+		JavaClass cls = this.context.getJavaClass(definition.definition);
122
+		StringBuilder builder = new StringBuilder("L").append(cls.internalName);
122
 
123
 
123
 		if (definition.typeArguments.length > 0) {
124
 		if (definition.typeArguments.length > 0) {
124
 			builder.append("<");
125
 			builder.append("<");

Loading…
Cancel
Save