harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r611156 - /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java
Date Fri, 11 Jan 2008 12:23:27 GMT
Author: tellison
Date: Fri Jan 11 04:23:19 2008
New Revision: 611156

URL: http://svn.apache.org/viewvc?rev=611156&view=rev
Log:
Fix for HARMONY-4933 ([classlib][swing] javac fails to compile javax\swing\text\html\StyleSheet.java
and org\apache\harmony\awt\gl\font\FontManager.java)
Disambiguate the call to removeAttributes for the Sun compiler.


Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java?rev=611156&r1=611155&r2=611156&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/StyleSheet.java
Fri Jan 11 04:23:19 2008
@@ -817,12 +817,12 @@
 
     public AttributeSet removeAttributes(final AttributeSet old,
                                          final AttributeSet rem) {
-        return removeAttributes(old, new NameConverterEnumeration(old, rem));
+        return localRemoveAttributes(old, new NameConverterEnumeration(old, rem));
     }
 
     public AttributeSet removeAttributes(final AttributeSet old,
                                          final Enumeration<?> names) {
-        return removeAttributes(old, new NameConverterEnumeration(names));
+        return localRemoveAttributes(old, new NameConverterEnumeration(names));
     }
 
     public void addCSSAttribute(final MutableAttributeSet attr,
@@ -1251,7 +1251,7 @@
        return result;
     }
 
-    private AttributeSet removeAttributes(final AttributeSet toModify,
+    private AttributeSet localRemoveAttributes(final AttributeSet toModify,
                                           final NameConverterEnumeration keys) {
         if (!keys.isUnderline() && !keys.isLineThrough()) {
             return super.removeAttributes(toModify, keys);



Mime
View raw message