From 310058e6ebb570413b1ed1211163bfa842ba4acc Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 20 May 2014 19:43:24 +0400
Subject: single "extends Object" omitted for type parameters

---
 src/de/fernflower/main/ClassWriter.java | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/de/fernflower/main/ClassWriter.java b/src/de/fernflower/main/ClassWriter.java
index a4732f8..d05e494 100644
--- a/src/de/fernflower/main/ClassWriter.java
+++ b/src/de/fernflower/main/ClassWriter.java
@@ -418,14 +418,17 @@ public class ClassWriter {
 					if(i>0) {
 						writer.write(", ");
 					}
-					writer.write(descriptor.fparameters.get(i)+" extends ");
+					writer.write(descriptor.fparameters.get(i));
 					
 					List<GenericType> lstBounds = descriptor.fbounds.get(i);
-					writer.write(GenericMain.getGenericCastTypeName(lstBounds.get(0)));
-					
-					for(int j=1;j<lstBounds.size();j++) {
-						writer.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
-					}
+          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++) {
+              writer.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
+            }
+          }
 				}
 				writer.write(">");
 			}
@@ -819,14 +822,17 @@ public class ClassWriter {
 					if(i>0) {
 						bufstrwriter.write(", ");
 					}
-					bufstrwriter.write(descriptor.fparameters.get(i)+" extends ");
+					bufstrwriter.write(descriptor.fparameters.get(i));
 					
 					List<GenericType> lstBounds = descriptor.fbounds.get(i);
-					bufstrwriter.write(GenericMain.getGenericCastTypeName(lstBounds.get(0)));
-					
-					for(int j=1;j<lstBounds.size();j++) {
-						bufstrwriter.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
-					}
+          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++) {
+              bufstrwriter.write(" & " + GenericMain.getGenericCastTypeName(lstBounds.get(j)));
+            }
+          }
 				}
 				bufstrwriter.write("> ");
 			}
-- 
cgit v1.2.3