PATCH: AWT peer interface cleanup

[Bryce McKinlay <bryce at albatross dot co dot nz>]

This patch cleans up the java.awt.peer interfaces somewhat by removing
some duplicate methods and renaming others to be more consistent with
their counterparts in java.awt. This is something that Rolf and I agreed
on some time ago...

regards

  [ bryce ]


2000-10-11  Bryce McKinlay  <bryce@albatross.co.nz>

	* java/awt/peer/ChoicePeer.java (addItem): Removed.
	* java/awt/peer/ComponentPeer.java (disable): Removed.
	(enable): Removed.
	(hide): Removed.
	(minimumSize): Removed.
	(preferredSize): Removed.
	(reshape): Removed.
	(show): Removed.
	* java/awt/peer/ListPeer.java (addItem): Removed.
	(clear): Removed.
	(minimumSize): Removed.
	(preferredSize): Removed.
	(setMultipleSelections): Removed.
	* java/awt/peer/MenuBarPeer.java (add): Renamed from addMenu.
	(remove): Renamed from removeMenu.
	* java/awt/peer/MenuItemPeer.java (disable): Removed.
	(enable): Removed.
	* java/awt/peer/MenuPeer.java (add): Renamed from addItem.
	(remove): Renamed from removeItem.
	* java/awt/peer/TextAreaPeer.java (insertText): Removed.
	(getMinimumSize): Removed.
	(getPreferredSize): Removed.
	(minimumSize): Removed.
	(preferredSize): Removed.
	(replaceText): Removed.
	* java/awt/peer/TextFieldPeer.java (minimumSize): Removed.
	(preferredSize): Removed.
	(getMinimumSize): Removed.
	(getPreferredSize): Removed.
	(setEchoCharacter): Removed.

Index: ChoicePeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/ChoicePeer.java,v
retrieving revision 1.1
diff -u -r1.1 ChoicePeer.java
--- ChoicePeer.java	2000/07/12 03:32:07	1.1
+++ ChoicePeer.java	2000/10/11 09:23:02
@@ -11,7 +11,6 @@
 public interface ChoicePeer extends ComponentPeer
 {
   void add(String item, int index);
-  void addItem(String item, int index);
   void remove(int index);
   void select(int index);
 }
Index: ComponentPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/ComponentPeer.java,v
retrieving revision 1.5
diff -u -r1.5 ComponentPeer.java
--- ComponentPeer.java	2000/08/16 18:03:48	1.5
+++ ComponentPeer.java	2000/10/11 09:23:02
@@ -16,9 +16,7 @@
   int checkImage(Image img, int width, int height, ImageObserver o);
   Image createImage(ImageProducer prod);
   Image createImage(int width, int height);
-  void disable();
   void dispose();
-  void enable();
 
   /** 
    * Get the graphics configuration of the component. The color model
@@ -33,16 +31,12 @@
   Dimension getPreferredSize();
   Toolkit getToolkit();
   void handleEvent(AWTEvent e);
-  void hide();
   boolean isFocusTraversable();
-  Dimension minimumSize();
-  Dimension preferredSize();
   void paint(Graphics graphics);
   boolean prepareImage(Image img, int width, int height, ImageObserver o);
   void print(Graphics graphics);
   void repaint(long tm, int x, int y, int width, int height);
   void requestFocus();
-  void reshape(int x, int y, int width, int height);
   void setBackground(Color color);
   void setBounds(int x, int y, int width, int height);
   void setCursor(Cursor cursor);
@@ -51,5 +45,4 @@
   void setFont(Font font);
   void setForeground(Color color);
   void setVisible(boolean visible);
-  void show();
 }
Index: ListPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/ListPeer.java,v
retrieving revision 1.1
diff -u -r1.1 ListPeer.java
--- ListPeer.java	2000/07/12 03:32:07	1.1
+++ ListPeer.java	2000/10/11 09:23:02
@@ -13,16 +13,11 @@
 public interface ListPeer extends ComponentPeer
 {
   void add(String item, int index);
-  void addItem(String item, int index);
-  void clear();
   void delItems(int start_index, int end_index);
   void deselect(int index);
   int[] getSelectedIndexes();
   void makeVisible(int index);
-  Dimension minimumSize(int size);
-  Dimension preferredSize(int size);
   void removeAll();
   void select(int index);
   void setMultipleMode(boolean multipleMode);
-  void setMultipleSelections(boolean multipleSelections);
 }
Index: MenuBarPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/MenuBarPeer.java,v
retrieving revision 1.1
diff -u -r1.1 MenuBarPeer.java
--- MenuBarPeer.java	2000/07/12 03:32:07	1.1
+++ MenuBarPeer.java	2000/10/11 09:23:02
@@ -13,6 +13,6 @@
 public interface MenuBarPeer extends MenuComponentPeer
 {
   void addHelpMenu(Menu menu);
-  void addMenu(Menu menu);
-  void delMenu(int index);
+  void add(Menu menu);
+  void remove(int index);
 }
Index: MenuItemPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/MenuItemPeer.java,v
retrieving revision 1.1
diff -u -r1.1 MenuItemPeer.java
--- MenuItemPeer.java	2000/07/12 03:32:07	1.1
+++ MenuItemPeer.java	2000/10/11 09:23:02
@@ -10,8 +10,6 @@
 
 public interface MenuItemPeer extends MenuComponentPeer
 {
-  void disable();
-  void enable();
   void setEnabled(boolean enabled);
   void setLabel(String text);
 }
Index: MenuPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/MenuPeer.java,v
retrieving revision 1.1
diff -u -r1.1 MenuPeer.java
--- MenuPeer.java	2000/07/12 03:32:07	1.1
+++ MenuPeer.java	2000/10/11 09:23:02
@@ -12,7 +12,7 @@
 
 public interface MenuPeer extends MenuItemPeer
 {
-  void addItem(MenuItem item);
+  void add(MenuItem item);
   void addSeparator();
-  void delItem(int index);
+  void remove(int index);
 }
Index: TextAreaPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/TextAreaPeer.java,v
retrieving revision 1.1
diff -u -r1.1 TextAreaPeer.java
--- TextAreaPeer.java	2000/07/12 03:32:07	1.1
+++ TextAreaPeer.java	2000/10/11 09:23:02
@@ -12,12 +12,6 @@
 
 public interface TextAreaPeer extends TextComponentPeer
 {
-  Dimension getMinimumSize(int rows, int columns);
-  Dimension getPreferredSize(int rows, int columns);
   void insert(String text, int pos);
-  void insertText(String text, int pos);
-  Dimension minimumSize(int rows, int cols);
-  Dimension preferredSize(int rows, int cols);
   void replaceRange(String text, int start, int end);
-  void replaceText(String text, int start, int end);
 }
Index: TextFieldPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/peer/TextFieldPeer.java,v
retrieving revision 1.1
diff -u -r1.1 TextFieldPeer.java
--- TextFieldPeer.java	2000/07/12 03:32:07	1.1
+++ TextFieldPeer.java	2000/10/11 09:23:02
@@ -12,10 +12,5 @@
 
 public interface TextFieldPeer extends TextComponentPeer
 {
-  Dimension getMinimumSize(int columns);
-  Dimension getPreferredSize(int columns);
-  Dimension minimumSize(int columns);
-  Dimension preferredSize(int columns);
   void setEchoChar(char echo);
-  void setEchoCharacter(char echo);
 }