Skip to content

Commit e7a5580

Browse files
vtrifonovvtrifonov
committed
Improve file naming
1 parent 6465577 commit e7a5580

File tree

2 files changed

+58
-46
lines changed

2 files changed

+58
-46
lines changed

‎Makefile‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
1-
android-17:
1+
android-platform-17:
22
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-17/android.jar
3-
mv out/android.d.ts out/android-17.d.ts
3+
mv out/android.d.ts out/android-platform-17.d.ts
44

5-
android-18:
5+
android-platform-18:
66
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-18/android.jar
7-
mv out/android.d.ts out/android-18.d.ts
7+
mv out/android.d.ts out/android-platform-18.d.ts
88

9-
android-19:
9+
android-platform-19:
1010
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-19/android.jar
11-
mv out/android.d.ts out/android-19.d.ts
11+
mv out/android.d.ts out/android-platform-19.d.ts
1212

13-
android-20:
13+
android-platform-20:
1414
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-20/android.jar
15-
mv out/android.d.ts out/android-20.d.ts
15+
mv out/android.d.ts out/android-platform-20.d.ts
1616

17-
android-21:
17+
android-platform-21:
1818
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-21/android.jar
19-
mv out/android.d.ts out/android-21.d.ts
19+
mv out/android.d.ts out/android-platform-21.d.ts
2020

21-
android-22:
21+
android-platform-22:
2222
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-22/android.jar
23-
mv out/android.d.ts out/android-22.d.ts
23+
mv out/android.d.ts out/android-platform-22.d.ts
2424

25-
android-23:
25+
android-platform-23:
2626
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-23/android.jar
27-
mv out/android.d.ts out/android-23.d.ts
27+
mv out/android.d.ts out/android-platform-23.d.ts
2828

29-
android-24:
29+
android-platform-24:
3030
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-24/android.jar
31-
mv out/android.d.ts out/android-24.d.ts
31+
mv out/android.d.ts out/android-platform-24.d.ts
3232

33-
android-25:
33+
android-platform-25:
3434
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-25/android.jar
35-
mv out/android.d.ts out/android-25.d.ts
35+
mv out/android.d.ts out/android-platform-25.d.ts
3636

37-
android-26:
37+
android-platform-26:
3838
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-26/android.jar
39-
mv out/android.d.ts out/android-26.d.ts
39+
mv out/android.d.ts out/android-platform-26.d.ts
4040

41-
android-27:
41+
android-platform-27:
4242
java -jar dts-generator/build/libs/dts-generator.jar -input ~/Library/Android/sdk/platforms/android-27/android.jar
43-
mv out/android.d.ts out/android-27.d.ts
43+
mv out/android.d.ts out/android-platform-27.d.ts
4444

45-
android-all: android-17 android-18 android-19 android-20 android-21 android-22 android-23 android-24 android-25 android-26 android-27
45+
android-platform-all: android-platform-17 android-platform-18 android-platform-19 android-platform-20 android-platform-21 \
46+
android-platform-22 android-platform-23 android-platform-24 android-platform-25 android-platform-26 android-platform-27
4647

4748
android-support-17:
4849
java -jar dts-generator/build/libs/dts-generator.jar \

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

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private String replaceIgnoredNamespaces(String content) {
209209
String javalangObject = "java.lang.Object";
210210

211211
// replace "extends any" with "extends java.lang.Object"
212-
content = content.replace(" extends any ", " extends " + javalangObject );
212+
content = content.replace(" extends any ", String.format(" extends %s ", javalangObject));
213213

214214
return content;
215215
}
@@ -285,34 +285,45 @@ private String getExtendsLine(JavaClass currClass, TypeDefinition typeDefinition
285285
if (typeDefinition != null) {
286286
StringBuilder result = new StringBuilder();
287287
ReferenceType parent = typeDefinition.getParent();
288-
if(parent != null) {
289-
result.append(" extends ");
290-
result.append(getTypeScriptTypeFromJavaType(parent, typeDefinition));
291-
}
288+
292289
if(!this.generateGenericImplements) {
293-
return result.toString();
294-
}
295-
List<ReferenceType> interfaces = typeDefinition.getInterfaces();
296-
if(interfaces.size() > 0) {
297-
result.append(" implements ");
298-
299-
for (ReferenceType referenceType : interfaces) {
300-
String tsType = getTypeScriptTypeFromJavaType(referenceType, typeDefinition);
301-
if(!this.isPrimitiveTSType(tsType)) {
302-
result.append(tsType + ", ");
290+
if(parent != null) {
291+
result.append(" extends ");
292+
result.append(getTypeScriptTypeFromJavaType(parent, typeDefinition));
293+
}
294+
} else {
295+
List<ReferenceType> interfaces = typeDefinition.getInterfaces();
296+
if(interfaces.size() == 1 && parent == null && getTypeScriptTypeFromJavaType(parent, typeDefinition).equals("java.lang.Object")) {
297+
result.append(" extends ");
298+
result.append(getTypeScriptTypeFromJavaType(interfaces.get(0), typeDefinition));
299+
} else {
300+
if(parent != null) {
301+
result.append(" extends ");
302+
result.append(getTypeScriptTypeFromJavaType(parent, typeDefinition));
303+
}
304+
if(interfaces.size() > 0) {
305+
result.append(" implements ");
306+
307+
for (ReferenceType referenceType : interfaces) {
308+
String tsType = getTypeScriptTypeFromJavaType(referenceType, typeDefinition);
309+
if(!this.isPrimitiveTSType(tsType)) {
310+
result.append(tsType + ", ");
311+
}
312+
}
313+
result.deleteCharAt(result.lastIndexOf(","));
303314
}
304315
}
305-
result.deleteCharAt(result.lastIndexOf(","));
306316
}
307317
return result.toString();
318+
} else {
319+
JavaClass superClass = getSuperClass(currClass);
320+
List<JavaClass> interfaces = getInterfaces(currClass);
321+
if(interfaces.size() == 1 && superClass == null && currClass.getSuperclassName().equals("java.lang.Object")) {
322+
superClass = interfaces.get(0);
323+
interfaces.clear();
324+
}
325+
return getExtendsLine(superClass, interfaces);
308326
}
309-
JavaClass superClass = getSuperClass(currClass);
310-
List<JavaClass> interfaces = getInterfaces(currClass);
311-
if(interfaces.size() == 1 && superClass == null && currClass.getSuperclassName().equals("java.lang.Object")) {
312-
superClass = interfaces.get(0);
313-
interfaces.clear();
314-
}
315-
return getExtendsLine(superClass, interfaces);
316327
}
317328

318329
private String getExtendsLine(JavaClass superClass, List<JavaClass> interfaces) {

0 commit comments

Comments
 (0)