Skip to content

Commit d8963e8

Browse files
committed
temp fix
1 parent 85cae06 commit d8963e8

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

dts-generator/src/main/java/com/telerik/dts/DtsApi.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
5858
JavaClass superClass = getSuperClass(currClass);
5959
String extendsLine = getExtendsLine(superClass);
6060

61-
sbContent.appendln(tabs + "export class " + getSimpleClassname(currClass) + extendsLine + " {");
62-
61+
if(getSimpleClassname(currClass).equals("AccessibilityDelegate")) {
62+
sbContent.appendln(tabs + "export class " + getFullClassNameConcatenated(currClass) + extendsLine + " {");
63+
}
64+
else {
65+
sbContent.appendln(tabs + "export class " + getSimpleClassname(currClass) + extendsLine + " {");
66+
}
6367
// process member scope
6468
List<FieldOrMethod> foms = getMembers(currClass);
6569
for(FieldOrMethod fom : foms) {
@@ -76,6 +80,10 @@ else if(fom instanceof Method) {
7680
// process member scope end
7781

7882
sbContent.appendln(tabs + "}");
83+
if(getSimpleClassname(currClass).equals("AccessibilityDelegate")) {
84+
String innerClassAlias = "export type " + getSimpleClassname(currClass) + " = " + getFullClassNameConcatenated(currClass);
85+
sbContent.appendln(tabs + innerClassAlias);
86+
}
7987
this.prevClass = currClass;
8088
}
8189
closePackage(prevClass, null);
@@ -98,7 +106,8 @@ private String getExtendsLine(JavaClass superClass) {
98106
if(superClass == null) {
99107
return "";
100108
}
101-
return " exports " + superClass.getClassName();
109+
110+
return " extends " + superClass.getClassName().replaceAll("\\$", "\\.");
102111
}
103112

104113
private int closePackage(JavaClass prevClass, JavaClass currClass) {
@@ -254,7 +263,8 @@ private void loadBaseMethods(JavaClass clazz) {
254263

255264
if(currClass != null) {
256265
//get all base methods and method names
257-
while (true) {
266+
while (true && currClass != null) {
267+
258268
for (Method m : currClass.getMethods()) {
259269
if (!m.isSynthetic() && (m.isPublic() || m.isProtected())) {
260270
baseMethods.add(m);
@@ -471,6 +481,11 @@ private String getSimpleClassname(JavaClass javaClass) {
471481
return parts[parts.length - 1];
472482
}
473483

484+
private String getFullClassNameConcatenated(JavaClass javaClass) {
485+
String fullName = javaClass.getClassName().replaceAll("[$.]", "");
486+
return fullName;
487+
}
488+
474489
private String getTabs(int count) {
475490
String tabs = new String(new char[count]).replace("\0", "\t");
476491
return tabs;

0 commit comments

Comments
 (0)