MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-125820 DOM Generator: problem with XML element names matching default/generated imports

Browse Source 
CR-IC-5549
This commit is contained in:
Yann Cébron
2014-06-05 14:22:06 +02:00
parent eadc889901
commit 3d7f7d2678
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/dom/generator/JetBrainsEmitter.java
+9 -2
View File
@@ -22,6 +22,9 @@
*/
package org.jetbrains.idea.devkit.dom.generator;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.CommonClassNames;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -67,7 +70,7 @@ public class JetBrainsEmitter implements Emitter {
final String typeName = td.name;
final String typeQName = model.getNSDPrefix(td) + typeName;
final String pkgName = typeQName.lastIndexOf('.') > -1 ? typeQName.substring(0, typeQName.lastIndexOf('.')) : "";
final String stringClass = myUseQualifiedClassNames ? "java.lang.String" : "String";
final String stringClass = getStringClassName();
final File outFile = fileManager.getOutputFile(new File(outDir, toJavaFileName(typeQName)));
PrintWriter out = null;
@@ -528,7 +531,7 @@ public class JetBrainsEmitter implements Emitter {
}
if (jtList.size() == 0) return;
final String stringClass = myUseQualifiedClassNames ? "java.lang.String" : "String";
final String stringClass = getStringClassName();
String typeName = nsd.helperClass.substring(nsd.helperClass.lastIndexOf(".") + 1);
final String typeQName = model.toJavaQualifiedTypeName("", nsd.helperClass, false);
String pkgName = typeQName.substring(0, typeQName.lastIndexOf('.'));
@@ -668,6 +671,10 @@ public class JetBrainsEmitter implements Emitter {
return typeName.replace('.', File.separatorChar) + ".java";
}
private String getStringClassName() {
return myUseQualifiedClassNames ? CommonClassNames.JAVA_LANG_STRING : StringUtil.getShortName(CommonClassNames.JAVA_LANG_STRING);
}
public static String toJavaIdName(String javaFieldName) {
if (Util.RESERVED_NAMES_MAP.containsKey(javaFieldName)) {
javaFieldName += "_";