harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r481609 - in /harmony/enhanced/classlib/trunk/modules/swing: make/ src/main/java/common/javax/swing/text/html/parser/
Date Sat, 02 Dec 2006 19:31:12 GMT
Author: apetrenko
Date: Sat Dec  2 11:31:10 2006
New Revision: 481609

URL: http://svn.apache.org/viewvc?view=rev&rev=481609
Log:
Patch for HARMONY-2354 "[classlib][html][parser] ContentModelCompatilityTest fails"

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl Sat Dec  2 11:31:10
2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm Sat Dec  2 11:31:10
2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl Sat Dec  2
11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm Sat Dec  2
11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl Sat Dec  2
11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm Sat Dec  2
11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl Sat Dec
 2 11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm Sat Dec
 2 11:31:10 2006
@@ -131,4 +131,3 @@
 javax/swing/text/View_VisualPositionTest.java
 javax/swing/text/View_VisualPosition_PartTest.java
 javax/swing/text/CompositeView_VisualPositionTest.java
-org/apache/harmony/swing/tests/javax/swing/text/parser/ContentModelCompatilityTest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java?view=diff&rev=481609&r1=481608&r2=481609
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/ContentModel.java
Sat Dec  2 11:31:10 2006
@@ -206,6 +206,11 @@
 public final class ContentModel implements Serializable {
 
     /**
+     * The serialization UID value.
+     */
+    static final long serialVersionUID = -1130825523866321257L;
+    
+    /**
      * The type of the content model. It should be '*', '+', '?', '|', '&', ','
      * or 0.
      */
@@ -416,7 +421,7 @@
                 auxModel = auxModel.next;
             }
         } else if (type == LINE_TYPE || type == AMPER_TYPE) {
-            found = token.equals(content);
+            found = ((Element) token).equals(content);
             auxModel = (ContentModel) content;
             while (auxModel != null && !found) {
                 found = token.equals(content) || auxModel.first((Element)token);



Mime
View raw message