moparisthebest/fernflower
1
0
Fork 0
mirror of https://github.com/moparisthebest/fernflower synced 2024-11-23 09:42:18 -05:00
Code Issues Releases Wiki Activity

leading "extends Object" omitted for type parameters

Browse Source
This commit is contained in:
Roman Shevchenko 2014-05-21 12:38:35 +04:00
parent c23845ae4a
commit 290c3ae066
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,11 +421,11 @@ public class ClassWriter {
writer.write(descriptor.fparameters.get(i)); writer.write(descriptor.fparameters.get(i));
List<GenericType> lstBounds = descriptor.fbounds.get(i); List<GenericType> lstBounds = descriptor.fbounds.get(i);
if (lstBounds.size() > 1 || !"java/lang/Object".equals(lstBounds.get(0).value)) { int skip = InterpreterUtil.equalObjects(VarType.VARTYPE_OBJECT.value, lstBounds.get(0).value) ? 1 : 0;
if(skip<lstBounds.size()) {
writer.write(" extends "); writer.write(" extends ");
writer.write(GenericMain.getGenericCastTypeName(lstBounds.get(0))); writer.write(GenericMain.getGenericCastTypeName(lstBounds.get(skip)));
for(int j=skip+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)));
} }
} }
@ -825,11 +825,11 @@ public class ClassWriter {
bufstrwriter.write(descriptor.fparameters.get(i)); bufstrwriter.write(descriptor.fparameters.get(i));
List<GenericType> lstBounds = descriptor.fbounds.get(i); List<GenericType> lstBounds = descriptor.fbounds.get(i);
if (lstBounds.size() > 1 || !"java/lang/Object".equals(lstBounds.get(0).value)) { int skip = InterpreterUtil.equalObjects(VarType.VARTYPE_OBJECT.value, lstBounds.get(0).value) ? 1 : 0;
if(skip<lstBounds.size()) {
bufstrwriter.write(" extends "); bufstrwriter.write(" extends ");
bufstrwriter.write(GenericMain.getGenericCastTypeName(lstBounds.get(0))); bufstrwriter.write(GenericMain.getGenericCastTypeName(lstBounds.get(skip)));
for(int j=skip+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)));
} }
} }