Merge branch 'extra-space' into 'master'

Remove an extra space at the end of a line of the methods generated by the Textifier.

See merge request asm/asm!381

6 files changed, 8 insertions, 8 deletions

diff --git a/asm-util/src/main/java/org/objectweb/asm/util/Textifier.java b/asm-util/src/main/java/org/objectweb/asm/util/Textifier.java
index 0049d357..43dcca37 100644
--- a/asm-util/src/main/java/org/objectweb/asm/util/Textifier.java
+++ b/asm-util/src/main/java/org/objectweb/asm/util/Textifier.java
@@ -437,10 +437,10 @@ public class Textifier extends Printer {
     stringBuilder.append(name);
     appendDescriptor(METHOD_DESCRIPTOR, descriptor);
     if (exceptions != null && exceptions.length > 0) {
-      stringBuilder.append(" throws ");
+      stringBuilder.append(" throws");
       for (String exception : exceptions) {
-        appendDescriptor(INTERNAL_NAME, exception);
         stringBuilder.append(' ');
+        appendDescriptor(INTERNAL_NAME, exception);
       }
     }
 
diff --git a/asm-util/src/test/resources/jdk3.AllInstructions.txt b/asm-util/src/test/resources/jdk3.AllInstructions.txt
index 6abf2a12..1f095ce0 100644
--- a/asm-util/src/test/resources/jdk3.AllInstructions.txt
+++ b/asm-util/src/test/resources/jdk3.AllInstructions.txt
@@ -1639,7 +1639,7 @@ class jdk3/AllInstructions {
     MAXLOCALS = 1
 
   // access flags 0x1
-  public jsrAndRetInstructions(I)I throws java/lang/Exception 
+  public jsrAndRetInstructions(I)I throws java/lang/Exception
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
     TRYCATCHBLOCK L0 L3 L3 null
    L4
diff --git a/asm-util/src/test/resources/jdk3.AllStructures.txt b/asm-util/src/test/resources/jdk3.AllStructures.txt
index cd8cf5d5..0d27a4ba 100644
--- a/asm-util/src/test/resources/jdk3.AllStructures.txt
+++ b/asm-util/src/test/resources/jdk3.AllStructures.txt
@@ -190,7 +190,7 @@ abstract class jdk3/AllStructures implements java/lang/Runnable java/lang/Clonea
   private native nativeMethod()V
 
   // access flags 0x2
-  private anonymousInnerClass()Ljava/lang/Runnable; throws java/lang/Exception 
+  private anonymousInnerClass()Ljava/lang/Runnable; throws java/lang/Exception
    L0
     LINENUMBER 71 L0
     ALOAD 0
diff --git a/asm-util/src/test/resources/jdk5.AllInstructions.txt b/asm-util/src/test/resources/jdk5.AllInstructions.txt
index 94cb8a04..859f6f5e 100644
--- a/asm-util/src/test/resources/jdk5.AllInstructions.txt
+++ b/asm-util/src/test/resources/jdk5.AllInstructions.txt
@@ -1612,7 +1612,7 @@ class jdk5/AllInstructions {
     MAXLOCALS = 1
 
   // access flags 0x1
-  public jsrAndRetInstructions(I)I throws java/lang/Exception 
+  public jsrAndRetInstructions(I)I throws java/lang/Exception
     TRYCATCHBLOCK L0 L1 L2 java/lang/Throwable
     TRYCATCHBLOCK L0 L1 L3 null
     TRYCATCHBLOCK L2 L4 L3 null
diff --git a/asm-util/src/test/resources/jdk5.AllStructures.txt b/asm-util/src/test/resources/jdk5.AllStructures.txt
index 24387ab1..fe23e3bc 100644
--- a/asm-util/src/test/resources/jdk5.AllStructures.txt
+++ b/asm-util/src/test/resources/jdk5.AllStructures.txt
@@ -139,7 +139,7 @@ class jdk5/AllStructures implements java/util/Comparator {
   // access flags 0x0
   // signature <U0:Ljava/lang/Object;U1:Ljava/lang/Number;U2::Ljava/util/List<Ljava/lang/String;>;U3::Ljava/util/List<*>;U4::Ljava/util/List<+Ljava/lang/Number;>;U5::Ljava/util/List<-Ljava/lang/Number;>;U6:Ljava/lang/Number;:Ljava/lang/Runnable;:Ljava/lang/Cloneable;U7:Ljava/lang/Exception;U8:Ljava/io/IOException;>(Ljava/util/List<TU0;>;Ljava/util/List<[TU1;>;Ljava/util/List<[[TU2;>;Ljava/util/List<TU3;>;Ljava/util/List<TU4;>;Ljava/util/List<TU5;>;Ljava/util/List<TU6;>;Ljdk5/AllStructures<TU0;TU1;TU2;TU3;TU4;TU5;TU6;>.InnerClass;Ljdk5/AllStructures<TU0;TU1;TU2;TU3;TU4;TU5;TU6;>.GenericInnerClass<TU1;>;)V^TU7;^TU8;
   // declaration: void genericMethod<U0, U1 extends java.lang.Number, U2 extends java.util.List<java.lang.String>, U3 extends java.util.List<?>, U4 extends java.util.List<? extends java.lang.Number>, U5 extends java.util.List<? super java.lang.Number>, U6 extends java.lang.Number extends java.lang.Runnable, java.lang.Cloneable, U7 extends java.lang.Exception, U8 extends java.io.IOException>(java.util.List<U0>, java.util.List<U1[]>, java.util.List<U2[][]>, java.util.List<U3>, java.util.List<U4>, java.util.List<U5>, java.util.List<U6>, jdk5.AllStructures<U0, U1, U2, U3, U4, U5, U6>.InnerClass, jdk5.AllStructures<U0, U1, U2, U3, U4, U5, U6>.GenericInnerClass<U1>) throws U7, U8
-  genericMethod(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljdk5/AllStructures$InnerClass;Ljdk5/AllStructures$GenericInnerClass;)V throws java/lang/Exception java/io/IOException 
+  genericMethod(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljdk5/AllStructures$InnerClass;Ljdk5/AllStructures$GenericInnerClass;)V throws java/lang/Exception java/io/IOException
    L0
     LINENUMBER 130 L0
     RETURN
diff --git a/asm-util/src/test/resources/jdk8.AllStructures.txt b/asm-util/src/test/resources/jdk8.AllStructures.txt
index a6a11ed2..d4dd6cf7 100644
--- a/asm-util/src/test/resources/jdk8.AllStructures.txt
+++ b/asm-util/src/test/resources/jdk8.AllStructures.txt
@@ -101,7 +101,7 @@ public abstract class jdk8/AllStructures extends java/util/HashMap implements ja
   // access flags 0x1
   // signature <V0:TU0;V1:TU1;>(TV0;TV1;Ljava/util/Map<+TV0;+TV1;>;)Ljava/util/Map<+TV0;+TV1;>;
   // declaration: java.util.Map<? extends V0, ? extends V1> m<V0 extends U0, V1 extends U1>(V0, V1, java.util.Map<? extends V0, ? extends V1>)
-  public m(Ljava/lang/Object;Ljava/util/List;Ljava/util/Map;)Ljava/util/Map; throws java/lang/IllegalStateException java/lang/IllegalArgumentException 
+  public m(Ljava/lang/Object;Ljava/util/List;Ljava/util/Map;)Ljava/util/Map; throws java/lang/IllegalStateException java/lang/IllegalArgumentException
     // parameter  p0
     // parameter  p1
     // parameter  p2
@@ -253,7 +253,7 @@ public abstract class jdk8/AllStructures extends java/util/HashMap implements ja
     MAXLOCALS = 1
 
   // access flags 0x2
-  private anonymousInnerClass()Ljava/lang/Runnable; throws java/lang/Exception 
+  private anonymousInnerClass()Ljava/lang/Runnable; throws java/lang/Exception
    L0
     LINENUMBER 130 L0
     NEW jdk8/AllStructures$1