moparisthebest/fernflower
1
0
Fork 0
mirror of https://github.com/moparisthebest/fernflower synced 2024-11-27 03:32:14 -05:00
Code Issues Releases Wiki Activity

single "extends Object" omitted for type parameters

Browse Source
This commit is contained in:
Roman Shevchenko 2014-05-20 19:43:24 +04:00
parent 6c2cc096fb
commit 310058e6eb
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/de/fernflower/main/ClassWriter.java
View File

@ -418,14 +418,17 @@ public class ClassWriter {
if(i>0) { if(i>0) {
writer.write(", "); writer.write(", ");
} }
writer.write(descriptor.fparameters.get(i)+" extends "); writer.write(descriptor.fparameters.get(i));
List<GenericType> lstBounds = descriptor.fbounds.get(i); List<GenericType> lstBounds = descriptor.fbounds.get(i);
writer.write(GenericMain.getGenericCastTypeName(lstBounds.get(0))); if (lstBounds.size() > 1 || !"java/lang/Object".equals(lstBounds.get(0).value)) {
writer.write(" extends ");
writer.write(GenericMain.getGenericCastTypeName(lstBounds.get(0)));
for(int j=1;j<lstBounds.size();j++) { for(int j=1;j<lstBounds.size();j++) {
writer.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j))); writer.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
} }
}
} }
writer.write(">"); writer.write(">");
} }
@ -819,14 +822,17 @@ public class ClassWriter {
if(i>0) { if(i>0) {
bufstrwriter.write(", "); bufstrwriter.write(", ");
} }
bufstrwriter.write(descriptor.fparameters.get(i)+" extends "); bufstrwriter.write(descriptor.fparameters.get(i));
List<GenericType> lstBounds = descriptor.fbounds.get(i); List<GenericType> lstBounds = descriptor.fbounds.get(i);
bufstrwriter.write(GenericMain.getGenericCastTypeName(lstBounds.get(0))); if (lstBounds.size() > 1 || !"java/lang/Object".equals(lstBounds.get(0).value)) {
bufstrwriter.write(" extends ");
bufstrwriter.write(GenericMain.getGenericCastTypeName(lstBounds.get(0)));
for(int j=1;j<lstBounds.size();j++) { for(int j=1;j<lstBounds.size();j++) {
bufstrwriter.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j))); bufstrwriter.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
} }
}
} }
bufstrwriter.write("> "); bufstrwriter.write("> ");
} }