harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r511651 - in /harmony/enhanced/drlvm/trunk/vm/tests/kernel: java/lang/ClassGenericsTest.java java/lang/ClassGenericsTest2.java java/lang/ClassGenericsTest3.java org/apache/harmony/lang/generics/TemplateSet.java
Date Sun, 25 Feb 2007 23:04:47 GMT
Author: ndbeyer
Date: Sun Feb 25 15:04:46 2007
New Revision: 511651

URL: http://svn.apache.org/viewvc?view=rev&rev=511651
Log:
Fix kernel test compiler errors; classes that extends Throwable can't be generic, so make
the inner classes static

Modified:
    harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest.java
    harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest2.java
    harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest3.java
    harmony/enhanced/drlvm/trunk/vm/tests/kernel/org/apache/harmony/lang/generics/TemplateSet.java

Modified: harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest.java?view=diff&rev=511651&r1=511650&r2=511651
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest.java (original)
+++ harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest.java Sun Feb
25 15:04:46 2007
@@ -405,7 +405,7 @@
     /**
      * getGenericExceptionTypes(), getGenericParameterTypes(), getGenericReturnType(), getTypeParameters(),
toGenericString() of generalized method
      */
-    class Mc009\u0576\u06C0\u06F1 extends Throwable 
+    static class Mc009\u0576\u06C0\u06F1 extends Throwable 
             implements java.io.Serializable, Cloneable {
         private static final long serialVersionUID = 0L;
     };

Modified: harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest2.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest2.java?view=diff&rev=511651&r1=511650&r2=511651
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest2.java (original)
+++ harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest2.java Sun Feb
25 15:04:46 2007
@@ -206,7 +206,7 @@
     class Mc205 extends Thread implements java.io.Serializable, Cloneable {
         private static final long serialVersionUID = 0L;
     };
-    class Mc209 extends Throwable implements java.io.Serializable, Cloneable {
+    static class Mc209 extends Throwable implements java.io.Serializable, Cloneable {
         private static final long serialVersionUID = 0L;
     };
     public <UuUuU extends Throwable, TM1, TM2 extends Thread &java.io.Serializable
&Cloneable> void foo1For_5(UuUuU a1) throws UuUuU, java.io.IOException {}

Modified: harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest3.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest3.java?view=diff&rev=511651&r1=511650&r2=511651
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest3.java (original)
+++ harmony/enhanced/drlvm/trunk/vm/tests/kernel/java/lang/ClassGenericsTest3.java Sun Feb
25 15:04:46 2007
@@ -339,7 +339,7 @@
     /**
      * use "$" symbol in identifiers for generalized method
      */
-    class $Mc3$09 extends Throwable implements java.io.Serializable, Cloneable {
+    static class $Mc3$09 extends Throwable implements java.io.Serializable, Cloneable {
         private static final long serialVersionUID = 0L;
     };
     public <U$uUuU_ extends Throwable, TM1, TM2 extends Thread &java.io.Serializable
&Cloneable> void foo1For_5(U$uUuU_ a1) throws U$uUuU_, java.io.IOException {}

Modified: harmony/enhanced/drlvm/trunk/vm/tests/kernel/org/apache/harmony/lang/generics/TemplateSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/tests/kernel/org/apache/harmony/lang/generics/TemplateSet.java?view=diff&rev=511651&r1=511650&r2=511651
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/tests/kernel/org/apache/harmony/lang/generics/TemplateSet.java
(original)
+++ harmony/enhanced/drlvm/trunk/vm/tests/kernel/org/apache/harmony/lang/generics/TemplateSet.java
Sun Feb 25 15:04:46 2007
@@ -67,7 +67,7 @@
     public TemplateSet<? super Class>.Mc002<TemplateSet>.Mc004<TemplateSet>
f0;
     public X f111;
     public TemplateSet f112;
-    class Mc009\u0576\u06C0\u06F1 extends Throwable implements java.io.Serializable, Cloneable
{private static final long serialVersionUID = 0L;};
+    static class Mc009\u0576\u06C0\u06F1 extends Throwable implements java.io.Serializable,
Cloneable {private static final long serialVersionUID = 0L;};
     @igt(author="*****") public <UuUuU extends Throwable, TM1, TM2 extends Thread &java.io.Serializable
&Cloneable> void foo1For_5(UuUuU a1) throws UuUuU, java.io.IOException {}
     public <\u0391 extends Throwable, TM1, TM2, TM3, TM4, TM5, TM6, TM7> X foo2For_5()
 throws \u0391, java.io.IOException {X f = null; return f;}
     public <\u0576\u06C0\u06F1 extends Throwable, \u0576\u06C0\u06F11 extends Throwable,
\u0576\u06C0\u06F12 extends Throwable, \u0576\u06C0\u06F13 extends Throwable, TM1, TM2 extends
Thread &java.io.Serializable &Cloneable> TM2 foo3For_5(\u0576\u06C0\u06F1[] BAAB,
TM1 a1, TM2 a2, TemplateSet<? super Class>.Mc002<TemplateSet>.Mc004<TemplateSet>
a3) throws \u0576\u06C0\u06F1, Throwable, \u0576\u06C0\u06F13, \u0576\u06C0\u06F12, \u0576\u06C0\u06F11,
TemplateSet.Mc009\u0576\u06C0\u06F1 {TM2 f = null; return f;}



Mime
View raw message