I'm checking this in on the generics branch.

This fixes a few problems on the generics branch as pointed out by
japi.

Tom

2006-04-25  Tom Tromey  <[EMAIL PROTECTED]>

        * javax/swing/JComboBox.java (AccessibleJComboBox): Now public.
        * javax/swing/tree/VariableHeightLayoutCache.java
        (getVisiblePathsFrom): Genericized.
        * javax/swing/tree/FixedHeightLayoutCache.java (getVisiblePathsFrom):
        Genericized.

Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComboBox.java,v
retrieving revision 1.8.2.11
diff -u -r1.8.2.11 JComboBox.java
--- javax/swing/JComboBox.java  14 Apr 2006 06:50:33 -0000      1.8.2.11
+++ javax/swing/JComboBox.java  25 Apr 2006 23:06:18 -0000
@@ -1219,7 +1219,7 @@
   {
     private static final long serialVersionUID = 8217828307256675666L;
 
-    protected AccessibleJComboBox()
+    public AccessibleJComboBox()
     {
       // Nothing to do here.
     }
Index: javax/swing/tree/FixedHeightLayoutCache.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/tree/FixedHeightLayoutCache.java,v
retrieving revision 1.2.2.6
diff -u -r1.2.2.6 FixedHeightLayoutCache.java
--- javax/swing/tree/FixedHeightLayoutCache.java        14 Apr 2006 06:50:34 
-0000      1.2.2.6
+++ javax/swing/tree/FixedHeightLayoutCache.java        25 Apr 2006 23:06:19 
-0000
@@ -390,7 +390,7 @@
    * @param parentPath the parent path
    * @return the enumeration over pathes
    */
-  public Enumeration getVisiblePathsFrom(TreePath parentPath)
+  public Enumeration<TreePath> getVisiblePathsFrom(TreePath parentPath)
   {
     if (dirty)
       update();
Index: javax/swing/tree/VariableHeightLayoutCache.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/tree/VariableHeightLayoutCache.java,v
retrieving revision 1.2.2.6
diff -u -r1.2.2.6 VariableHeightLayoutCache.java
--- javax/swing/tree/VariableHeightLayoutCache.java     14 Apr 2006 06:50:34 
-0000      1.2.2.6
+++ javax/swing/tree/VariableHeightLayoutCache.java     25 Apr 2006 23:06:19 
-0000
@@ -468,7 +468,7 @@
    * @param parentPath the parent path
    * @return the enumeration over pathes
    */
-  public Enumeration getVisiblePathsFrom(TreePath parentPath)
+  public Enumeration<TreePath> getVisiblePathsFrom(TreePath parentPath)
   {
     if (dirty)
       update();

Reply via email to