Prefix generated class names

octachoron · octachoron · commit 74e329d1bade · 2014-08-13T07:45:29.000+02:00
Using only the class name declared in a gir file as the name of
the corresponding generated Java class can lead to confusing
results. An example is having three different classes called
Object: the classes corresponding to GObject and GstObject are
both called Object, with the additional java.lang.Object making
things even worse.

To solve this, prefix the names of all generated classes (except
the namespace-wide function classes) with the c:identifier-prefixes
of the namespace, or if not present, the name of the namespace.
diff --git a/src/gir2java/Constants.java b/src/gir2java/Constants.java
@@ -14,6 +14,6 @@ public class Constants {
 	public static final String CONTEXT_EXTRA_PARAM_TYPES = "param-types";
 	public static final String CONTEXT_EXTRA_SNAPSHOTS = "snapshots";
 	public static final String CONTEXT_EXTRA_UNDEFINED = "undefined";
-	
+	public static final String CONTEXT_EXTRA_PREFIX = "prefix";
 	
 }
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -341,11 +341,17 @@ private void parsePackage(Element root, ParsingContext context) {
 	@SuppressWarnings("unused")
 	private void parseNamespace(Element root, ParsingContext context) {
 		String nsName = root.getAttributeValue("name");
+		String prefix = root.getAttributeValue("identifier-prefixes", Constants.GIR_XMLNS_C);
+		if (prefix == null) {
+			prefix = nsName;
+		}
 		String javaPackageName = NameUtils.javaifyPackageName(nsName);
 		ParsingContext newContext = context.copy();
 		
 		newContext.appendPackage(javaPackageName);
 		newContext.putExtra(Constants.CONTEXT_EXTRA_NAMESPACE, nsName);
+		newContext.putExtra(Constants.CONTEXT_EXTRA_PREFIX, prefix);
+		
 		System.out.println("Namespace " + nsName + " becomes Java package " + newContext.getCurrentPackage());
 		
 		//If there is a shared library defined, it takes precedence over any guesswork
@@ -366,7 +372,7 @@ private void parseEnumeration(Element root, ParsingContext context) {
 		JCodeModel cm = (JCodeModel)context.getCmNode();
 		
 		try {
-			String enumFqcn = context.getCurrentPackage() + '.' + enumName;
+			String enumFqcn = context.getCurrentPackage() + '.' + context.getExtra(Constants.CONTEXT_EXTRA_PREFIX) + enumName;
 			JDefinedClass enumClass = cm._class(enumFqcn, ClassType.ENUM);
 			System.out.println("New enum: " + enumFqcn);
 
@@ -450,7 +456,7 @@ private void parseRecordOrClass(Element root, ParsingContext context) {
 
 		JCodeModel cm = (JCodeModel) context.getCmNode();
 		String name = root.getAttributeValue("name");
-		String className = context.getCurrentPackage() + '.' + name;
+		String className = context.getCurrentPackage() + '.' + context.getExtra(Constants.CONTEXT_EXTRA_PREFIX) + name;
 		
 		Set<String> foundTypes = (Set<String>)context.getExtra(Constants.CONTEXT_EXTRA_DEFINED_TYPES);
 		foundTypes.add("" + context.getExtra(Constants.CONTEXT_EXTRA_NAMESPACE) + '.' + name);

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public class Constants {`
`14`	`14`	`public static final String CONTEXT_EXTRA_PARAM_TYPES = "param-types";`
`15`	`15`	`public static final String CONTEXT_EXTRA_SNAPSHOTS = "snapshots";`
`16`	`16`	`public static final String CONTEXT_EXTRA_UNDEFINED = "undefined";`
`17`		`-`
	`17`	`+ public static final String CONTEXT_EXTRA_PREFIX = "prefix";`
`18`	`18`
`19`	`19`	`}`