You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2006/11/04 19:02:51 UTC
svn commit: r471240 - in
/incubator/harmony/enhanced/classlib/trunk/modules/swing: build.xml
src/main/java/common/javax/swing/text/AbstractDocument.java
Author: apetrenko
Date: Sat Nov 4 10:02:50 2006
New Revision: 471240
URL: http://svn.apache.org/viewvc?view=rev&rev=471240
Log:
Patch for HARMONY-2058 "[classlib][swing] tests fail: j.s.t.AbstractDocument_AbstractElementRTest and j.s.t.DefaultStyledDocumentRTest"
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=471240&r1=471239&r2=471240
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Sat Nov 4 10:02:50 2006
@@ -228,8 +228,6 @@
<exclude name="javax/swing/plaf/basic/BasicSplitPaneUITest.java"/>
<exclude name="javax/swing/plaf/metal/MetalComboBoxUITest.java"/>
<exclude name="javax/swing/plaf/metal/MetalLookAndFeelTest.java"/>
- <exclude name="javax/swing/text/AbstractDocument_AbstractElementRTest.java"/>
- <exclude name="javax/swing/text/DefaultStyledDocumentRTest.java"/>
<exclude name="javax/swing/text/GapContent_GapVectorTest.java"/>
<exclude name="javax/swing/text/GlyphView_AttributesTest.java"/>
<exclude name="org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java"/>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java?view=diff&rev=471240&r1=471239&r2=471240
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java Sat Nov 4 10:02:50 2006
@@ -226,7 +226,9 @@
}
public String getName() {
- return (String)getAttribute(ElementNameAttribute);
+ return isDefined(ElementNameAttribute)
+ ? (String)getAttribute(ElementNameAttribute)
+ : null;
}
public TreeNode getParent() {