Skip to content

Commit 88aa1ca

Browse files
committed
added super overrides
1 parent 34e1f4f commit 88aa1ca

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class DtsApi {
4545
private static Map<String, String> globalAliases = new HashMap<>();
4646

4747
private Map<String, String> extendsOverrides = new HashMap<>();
48+
private Map<String, String> superOverrides = new HashMap<>();
4849
private Map<String, String> typeOverrides = new HashMap<>();
4950

5051
private StringBuilder2 sbContent;
@@ -826,6 +827,11 @@ private JavaClass getSuperClass(JavaClass clazz) {
826827
}
827828

828829
String scn = clazz.getSuperclassName();
830+
String override = this.superOverrides.get(clazz.getClassName());
831+
if(override != null) {
832+
scn = override;
833+
}
834+
829835
if(scn.equals("") || scn == null) {
830836
return null;
831837
}
@@ -1151,17 +1157,19 @@ public int hashCode(Object o) {
11511157
private void setOverrides() {
11521158
this.setTypeOverrides();
11531159
this.setExtendsOverrides();
1160+
this.setSuperOverrides();
11541161
}
11551162

11561163
private void setExtendsOverrides() {
11571164
// here we put extends overrides to avoid manual work to fix the generated .d.ts file
11581165
this.extendsOverrides.put("android.renderscript.ProgramFragmentFixedFunction$Builder", "android.renderscript.Program.BaseProgramBuilder"); // android-17
11591166
this.extendsOverrides.put("android.renderscript.ProgramVertexFixedFunction$Builder", "android.renderscript.ProgramVertex.Builder"); // android-17
11601167
this.extendsOverrides.put("android.support.v4.app.JobIntentService$JobServiceEngineImpl", "android.support.v4.app.JobIntentService.CompatJobEngine"); // android-support
1168+
}
11611169

1162-
// this.extendsOverrides.put("android.net.wifi.SupplicantState", "android.os.Parcelable");
1163-
// this.extendsOverrides.put("java.util.concurrent.ScheduledFuture", "java.util.concurrent.Delayed implements java.util.concurrent.Future<V>"); // android-17
1164-
// this.extendsOverrides.put("java.util.concurrent.RunnableScheduledFuture", "java.util.concurrent.ScheduledFuture<V> implements java.util.concurrent.RunnableFuture<V>"); // android-17
1170+
private void setSuperOverrides() {
1171+
// here we put super overrides
1172+
this.superOverrides.put("android.support.v4.view.GestureDetectorCompat", "android.view.GestureDetector"); // android-17
11651173
}
11661174

11671175
private void setTypeOverrides() {

0 commit comments

Comments
 (0)