2005-01-25 Michael Koch <konqueror@gmx.de>

	* javax/swing/DefaultCellRenderer.java: Removed.
	* Makefile.am: Removed javax/swing/DefaultCellRenderer.java.
	* Makefile.in: Regenerated.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/java-gui-branch@94211 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 7 insertions, 79 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 60e4214e367..3324c497a72 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 2005-01-25  Michael Koch  <konqueror@gmx.de>
 
+	* javax/swing/DefaultCellRenderer.java: Removed.
+	* Makefile.am: Removed javax/swing/DefaultCellRenderer.java.
+	* Makefile.in: Regenerated.
+
+2005-01-25  Michael Koch  <konqueror@gmx.de>
+
 	* javax/swing/AbstractButton.java
 	(fireItemStateChanged): Made protected.
 	(fireActionPerformed): Likewise.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 873da7042a1..9c3be936b8c 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1540,7 +1540,6 @@ javax/swing/ButtonGroup.java \
 javax/swing/ButtonModel.java \
 javax/swing/ComponentInputMap.java \
 javax/swing/DefaultButtonModel.java \
-javax/swing/DefaultCellRenderer.java \
 javax/swing/DefaultListModel.java \
 javax/swing/DefaultListSelectionModel.java \
 javax/swing/Icon.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 7632028dadd..3c7e3b19a43 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1136,7 +1136,6 @@ javax/swing/ButtonGroup.java \
 javax/swing/ButtonModel.java \
 javax/swing/ComponentInputMap.java \
 javax/swing/DefaultButtonModel.java \
-javax/swing/DefaultCellRenderer.java \
 javax/swing/DefaultListModel.java \
 javax/swing/DefaultListSelectionModel.java \
 javax/swing/Icon.java \
@@ -3355,8 +3354,7 @@ javax/swing/table/DefaultTableCellRenderer.lo javax/swing/Action.lo \
 javax/swing/BorderFactory.lo javax/swing/Box.lo \
 javax/swing/BoxLayout.lo javax/swing/ButtonGroup.lo \
 javax/swing/ButtonModel.lo javax/swing/ComponentInputMap.lo \
-javax/swing/DefaultButtonModel.lo javax/swing/DefaultCellRenderer.lo \
-javax/swing/DefaultListModel.lo \
+javax/swing/DefaultButtonModel.lo javax/swing/DefaultListModel.lo \
 javax/swing/DefaultListSelectionModel.lo javax/swing/Icon.lo \
 javax/swing/ImageIcon.lo javax/swing/InputMap.lo \
 javax/swing/InternalFrameFocusTraversalPolicy.lo javax/swing/JApplet.lo \
@@ -5420,7 +5418,6 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/javax/swing/DefaultBoundedRangeModel.P \
 .deps/javax/swing/DefaultButtonModel.P \
 .deps/javax/swing/DefaultCellEditor.P \
-.deps/javax/swing/DefaultCellRenderer.P \
 .deps/javax/swing/DefaultComboBoxModel.P \
 .deps/javax/swing/DefaultDesktopManager.P \
 .deps/javax/swing/DefaultFocusManager.P \
diff --git a/libjava/javax/swing/DefaultCellRenderer.java b/libjava/javax/swing/DefaultCellRenderer.java
deleted file mode 100644
index fca2f1d70c9..00000000000
--- a/libjava/javax/swing/DefaultCellRenderer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* DefaultCellRenderer.java -- 
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package javax.swing;
-
-// this is what SUN basically told us to do so:
-// no icon though as that's not implemented yet....
-
-import java.awt.Component;
-
-public class DefaultCellRenderer extends JLabel implements ListCellRenderer 
-{
-    public Component getListCellRendererComponent(JList list,
-						  Object value,           
-						  int index,            
-						  boolean isSelected,     
-						  boolean cellHasFocus)   
-    {
-	String s = value.toString();
-	setText(s);	
-
-	//	System.out.println("=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + s);
-
-
-	if (isSelected) 
-	    {
-		setBackground(list.getSelectionBackground());
-		setForeground(list.getSelectionForeground());
-	    }
-	else 
-	    {
-		setBackground(list.getBackground());
-		setForeground(list.getForeground());
-	    }
-
-	setEnabled(list.isEnabled());
-	setFont(list.getFont());
-	return this;
-    }
-}