You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2007/03/09 15:28:41 UTC
svn commit: r516415 - in /harmony/enhanced/classlib/trunk/modules/swing/src:
main/java/common/javax/swing/ main/java/common/javax/swing/table/
test/api/java/common/javax/swing/ test/api/java/common/javax/swing/table/
Author: ayza
Date: Fri Mar 9 06:28:40 2007
New Revision: 516415
URL: http://svn.apache.org/viewvc?view=rev&rev=516415
Log:
Applying patch from HARMONY-2580 ([classlib][swing] javax.swing.JFileChooser.getName() returns class name instead of null)
Modified:
harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JFileChooser.java
harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableCellRenderer.java
harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JFileChooserTest.java
harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableCellRendererTest.java
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JFileChooser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JFileChooser.java?view=diff&rev=516415&r1=516414&r2=516415
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JFileChooser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JFileChooser.java Fri Mar 9 06:28:40 2007
@@ -603,6 +603,7 @@
if (isAcceptAllFileFilterUsed()) {
addChoosableFileFilter(getAcceptAllFileFilter());
}
+ setName(null);
}
private FileFilter[] toFileFilterArray(final Collection<FileFilter> fileFilterList) {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableCellRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableCellRenderer.java?view=diff&rev=516415&r1=516414&r2=516415
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableCellRenderer.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableCellRenderer.java Fri Mar 9 06:28:40 2007
@@ -42,6 +42,7 @@
public DefaultTableCellRenderer() {
updateUI();
+ setName(null);
}
public void setForeground(final Color c) {
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JFileChooserTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JFileChooserTest.java?view=diff&rev=516415&r1=516414&r2=516415
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JFileChooserTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/JFileChooserTest.java Fri Mar 9 06:28:40 2007
@@ -575,6 +575,11 @@
assertTrue(chooser.getAccessibleContext() instanceof JFileChooser.AccessibleJFileChooser);
}
+ public void testGetName() {
+ JFileChooser fc = new JFileChooser();
+ assertNull(fc.getName());
+ }
+
private class TestActionListener implements ActionListener {
private ActionEvent event;
Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableCellRendererTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableCellRendererTest.java?view=diff&rev=516415&r1=516414&r2=516415
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableCellRendererTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableCellRendererTest.java Fri Mar 9 06:28:40 2007
@@ -180,4 +180,9 @@
renderer.setValue(new Integer("4"));
assertEquals("4", renderer.getText());
}
+
+ public void testGetName() {
+ DefaultTableCellRenderer cr = new DefaultTableCellRenderer();
+ assertNull(cr.getName());
+ }
}