harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r910682 - in /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing: ./ plaf/basic/ text/ text/html/parser/
Date Tue, 16 Feb 2010 20:47:44 GMT
Author: hindessm
Date: Tue Feb 16 20:47:43 2010
New Revision: 910682

URL: http://svn.apache.org/viewvc?rev=910682&view=rev
Log:
Trivial JAPI fixes.

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/FocusManager.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/LabelView.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/AttributeList.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/FocusManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/FocusManager.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/FocusManager.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/FocusManager.java
Tue Feb 16 20:47:43 2010
@@ -26,6 +26,7 @@
 
     private static boolean focusManagerEnabled = true;
 
+    @Deprecated
     public static void disableSwingFocusManager() {
         KeyboardFocusManager.getCurrentKeyboardFocusManager().setDefaultFocusTraversalPolicy(new
DefaultFocusTraversalPolicy());
         focusManagerEnabled = false;
@@ -43,6 +44,7 @@
         KeyboardFocusManager.setCurrentKeyboardFocusManager(focusManager);
     }
 
+    @Deprecated
     public static boolean isFocusManagerEnabled() {
         return focusManagerEnabled;
     }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JComponent.java
Tue Feb 16 20:47:43 2010
@@ -1098,6 +1098,7 @@
         return result;
     }
 
+    @Deprecated
     public void setNextFocusableComponent(Component component) {
         Component oldComponent = nextFocusableComponent;
         nextFocusableComponent = component;
@@ -1111,6 +1112,7 @@
         focusCycleRoot.setFocusTraversalPolicy(newFocusTraversalPolicy);
     }
 
+    @Deprecated
     public Component getNextFocusableComponent() {
         return nextFocusableComponent;
     }
@@ -1184,6 +1186,7 @@
         return super.requestFocusInWindow(temporary);
     }
 
+    @Deprecated
     public boolean requestDefaultFocus() {
         Component defaultComponent = null;
         Container cycleRoot = isFocusCycleRoot() ? this : getFocusCycleRootAncestor();
@@ -1197,6 +1200,7 @@
         return true;
     }
 
+    @Deprecated
     public boolean isManagingFocus() {
         return false;
     }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JTable.java
Tue Feb 16 20:47:43 2010
@@ -782,6 +782,7 @@
 
     private static final String UI_CLASS_ID = "TableUI";
 
+    @Deprecated
     public static JScrollPane createScrollPaneForTable(JTable table) {
         return new JScrollPane(table);
     }
@@ -1322,6 +1323,7 @@
         return result;
     }
 
+    @Deprecated
     public void sizeColumnsToFit(boolean lastColumnOnly) {
         int previousSetting = getAutoResizeMode();
         if (lastColumnOnly) {

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java
Tue Feb 16 20:47:43 2010
@@ -282,6 +282,7 @@
         setLowerRightBounds(pane, verticalSBWidth, horizontalSBHeight, rowHeadWidth, colHeadHeight,
rowHeadHeight);
     }
 
+    @Deprecated
     public Rectangle getViewportBorderBounds(final JScrollPane scrollpane) {
         return scrollpane.getViewportBorderBounds();
     }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/SwingUtilities.java
Tue Feb 16 20:47:43 2010
@@ -418,6 +418,7 @@
         return result;
     }
 
+    @Deprecated
     public static Component findFocusOwner(final Component component) {
         return KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
     }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicInternalFrameUI.java
Tue Feb 16 20:47:43 2010
@@ -460,7 +460,10 @@
     }
 
     protected JInternalFrame frame;
+
+    @Deprecated
     protected KeyStroke openMenuKey;
+
     protected BasicInternalFrameTitlePane titlePane;
     protected ComponentListener componentListener;
     protected MouseInputListener glassPaneDispatcher;

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/LabelView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/LabelView.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/LabelView.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/LabelView.java
Tue Feb 16 20:47:43 2010
@@ -85,6 +85,7 @@
         return background;
     }
 
+    @Deprecated
     protected FontMetrics getFontMetrics() {
         lazySync();
         Component component = getComponent();

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/AttributeList.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/AttributeList.java?rev=910682&r1=910681&r2=910682&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/AttributeList.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/html/parser/AttributeList.java
Tue Feb 16 20:47:43 2010
@@ -25,7 +25,7 @@
 
     public int type;
 
-    public Vector values;
+    public Vector<?> values;
 
     public int modifier;
 
@@ -38,7 +38,7 @@
                          final int type,
                          final int modifier,
                          final String value,
-                         final Vector values,
+                         final Vector<?> values,
                          final AttributeList next) {
         this.name = name;
         this.type = type;
@@ -128,7 +128,7 @@
         return value;
     }
 
-    public Enumeration getValues() {
+    public Enumeration<?> getValues() {
         // avoids a NullPointerException if values is null (same as RI)
         return values == null ? null : values.elements();
     }



Mime
View raw message