harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r468258 - in /incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing: table/ text/ tree/
Date Fri, 27 Oct 2006 04:08:45 GMT
Author: smishura
Date: Thu Oct 26 21:08:44 2006
New Revision: 468258

URL: http://svn.apache.org/viewvc?view=rev&rev=468258
Log:
Apply patch for HARMONY-1975 ([classlib][swing] Further generification of the javax.swing.table,
javax.swing.text.* and javax.swing.tree packages)

Note: except update for javax/swing/text/GapContent.java - need regression test

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/AbstractDocument.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/SimpleAttributeSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/AbstractTableModel.java
Thu Oct 26 21:08:44 2006
@@ -58,7 +58,7 @@
         return result < getColumnCount() ? result : -1;
     }
 
-    public Class getColumnClass(final int columnIndex) {
+    public Class<?> getColumnClass(final int columnIndex) {
         return Object.class;
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/table/DefaultTableColumnModel.java
Thu Oct 26 21:08:44 2006
@@ -114,7 +114,7 @@
         return tableColumns.size();
     }
 
-    public Enumeration getColumns() {
+    public Enumeration<TableColumn> getColumns() {
         return Collections.enumeration(tableColumns);
     }
 

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=468258&r1=468257&r2=468258
==============================================================================
--- 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
Thu Oct 26 21:08:44 2006
@@ -192,7 +192,7 @@
             return attrs.getAttributeCount();
         }
 
-        public Enumeration getAttributeNames() {
+        public Enumeration<?> getAttributeNames() {
             return attrs.getAttributeNames();
         }
 
@@ -267,7 +267,7 @@
             attrs = context.removeAttributes(attrs, attrSet);
         }
 
-        public void removeAttributes(final Enumeration attrNames) {
+        public void removeAttributes(final Enumeration<?> attrNames) {
             checkWriteLock();
 
             attrs = context.removeAttributes(attrs, attrNames);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/SimpleAttributeSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/SimpleAttributeSet.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/SimpleAttributeSet.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/SimpleAttributeSet.java
Thu Oct 26 21:08:44 2006
@@ -107,7 +107,7 @@
         return hashtable.size();
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<?> getAttributeNames() {
         return hashtable.keys();
     }
 
@@ -163,7 +163,7 @@
         }
     }
 
-    public void removeAttributes(final Enumeration names) {
+    public void removeAttributes(final Enumeration<?> names) {
         while (names.hasMoreElements()) {
             removeAttribute(names.nextElement());
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/StyleContext.java
Thu Oct 26 21:08:44 2006
@@ -110,7 +110,7 @@
             return attrs.getAttributeCount();
         }
 
-        public Enumeration getAttributeNames() {
+        public Enumeration<?> getAttributeNames() {
             return attrs.getAttributeNames();
         }
 
@@ -155,7 +155,7 @@
             fireStateChanged();
         }
 
-        public void removeAttributes(final Enumeration names) {
+        public void removeAttributes(final Enumeration<?> names) {
             attrs = StyleContext.this.removeAttributes(attrs, names);
             fireStateChanged();
         }
@@ -289,7 +289,7 @@
             return attributes.length / 2;
         }
 
-        public Enumeration getAttributeNames() {
+        public Enumeration<?> getAttributeNames() {
             return new Enumeration() {
 
                 private int count = 0;
@@ -641,7 +641,7 @@
     }
 
     public synchronized AttributeSet removeAttributes(final AttributeSet old,
-                                                      final Enumeration names) {
+                                                      final Enumeration<?> names) {
         attrSet.addAttributes(old);
         attrSet.removeAttributes(names);
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/AbstractLayoutCache.java
Thu Oct 26 21:08:44 2006
@@ -532,15 +532,15 @@
         return correspondingNode != null ? correspondingNode.getTotalChildrenCount() : 0;
     }
 
-    Enumeration getVisiblePathsFromImpl(final TreePath path) {
+    Enumeration<TreePath> getVisiblePathsFromImpl(final TreePath path) {
         if (!isModelPath(path) || !isRoot(path) && !isVisible(path)) {
             return null;
         }
 
-        return new Enumeration() {
+        return new Enumeration<TreePath>() {
             private TreePath currentPath = path;
 
-            public Object nextElement() {
+            public TreePath nextElement() {
                 if (currentPath == null) {
                     throw new NoSuchElementException();
                 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/FixedHeightLayoutCache.java
Thu Oct 26 21:08:44 2006
@@ -148,7 +148,7 @@
         return getVisibleChildCountImpl(path);
     }
 
-    public Enumeration getVisiblePathsFrom(final TreePath path) {
+    public Enumeration<TreePath> getVisiblePathsFrom(final TreePath path) {
         return getVisiblePathsFromImpl(path);
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java?view=diff&rev=468258&r1=468257&r2=468258
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/tree/VariableHeightLayoutCache.java
Thu Oct 26 21:08:44 2006
@@ -251,7 +251,7 @@
         }
     }
 
-    public Enumeration getVisiblePathsFrom(final TreePath path) {
+    public Enumeration<TreePath> getVisiblePathsFrom(final TreePath path) {
         return getVisiblePathsFromImpl(path);
     }
 



Mime
View raw message