harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r442042 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt: ./ datatransfer/ dnd/ dnd/peer/
Date Mon, 11 Sep 2006 00:04:06 GMT
Author: ndbeyer
Date: Sun Sep 10 17:04:04 2006
New Revision: 442042

URL: http://svn.apache.org/viewvc?view=rev&rev=442042
Log:
Code cleanup for 'java.awt.**'; add braces, remove compiler warnings, add documentation, etc

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Checkbox.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Choice.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GridBagLayout.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/List.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ScrollPaneAdjustable.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Scrollbar.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/StringSelection.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureRecognizer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDropEvent.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/MouseDragGestureRecognizer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DragSourceContextPeer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DropTargetContextPeer.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Checkbox.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Checkbox.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Checkbox.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Checkbox.java Sun Sep 10 17:04:04 2006
@@ -161,7 +161,7 @@
     }
 
 
-    private AWTListenerList itemListeners = new AWTListenerList(this);
+    private final AWTListenerList itemListeners = new AWTListenerList(this);
     private String label = null;
     private CheckboxGroup group = null;
     boolean checked = false;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Choice.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Choice.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Choice.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Choice.java Sun Sep 10 17:04:04 2006
@@ -49,7 +49,7 @@
 
     private final AWTListenerList itemListeners = new AWTListenerList(this);
 
-    private ArrayList<String> items = new ArrayList<String>();
+    private final ArrayList<String> items = new ArrayList<String>();
 
     int selectedIndex = -1;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java Sun Sep 10 17:04:04 2006
@@ -844,7 +844,7 @@
     private boolean focusTraversalKeysEnabled = true;
     /**  Possible keys are: FORWARD_TRAVERSAL_KEYS, 
      * BACKWARD_TRAVERSAL_KEYS, UP_CYCLE_TRAVERSAL_KEYS */
-    private Map<Integer, Set<? extends AWTKeyStroke>> traversalKeys = new HashMap<Integer, Set<? extends AWTKeyStroke>>();
+    private final Map<Integer, Set<? extends AWTKeyStroke>> traversalKeys = new HashMap<Integer, Set<? extends AWTKeyStroke>>();
     int[] traversalIDs;
 
     private Locale locale;
@@ -4449,7 +4449,7 @@
 
     private class ImageParameters {
 
-        private LinkedList<DrawingParameters> drawingParams = new LinkedList<DrawingParameters>();
+        private final LinkedList<DrawingParameters> drawingParams = new LinkedList<DrawingParameters>();
 
         Dimension size = new Dimension(Component.this.w, Component.this.h);
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java Sun Sep 10 17:04:04 2006
@@ -38,7 +38,7 @@
 public class Container extends Component {
     private static final long serialVersionUID = 4613797578919906343L;
 
-    private Vector<Component> children = new Vector<Component>();
+    private final Vector<Component> children = new Vector<Component>();
 
     private final AWTListenerList containerListeners = new AWTListenerList(this);
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GridBagLayout.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GridBagLayout.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GridBagLayout.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GridBagLayout.java Sun Sep 10 17:04:04 2006
@@ -975,8 +975,8 @@
 
     private class Grid {
 
-        private GridSide cols = new GridSide();
-        private GridSide rows = new GridSide();
+        private final GridSide cols = new GridSide();
+        private final GridSide rows = new GridSide();
 
         public void validate(ParentInfo info) {
             cols.validate(info.horCompSides, columnWidths, columnWeights);
@@ -1069,15 +1069,15 @@
 
         private class GridSide {
 
-            private int coordinates[] = new int[MAXGRIDSIZE];
-            private int lengths[] = new int[MAXGRIDSIZE];
+            private final int coordinates[] = new int[MAXGRIDSIZE];
+            private final int lengths[] = new int[MAXGRIDSIZE];
 
             /*Cashed data. Validation controlled by parent class*/
-            private int minLengths[] = new int[MAXGRIDSIZE];
+            private final int minLengths[] = new int[MAXGRIDSIZE];
             private int minLength = 0;
-            private int prefLengths[] = new int[MAXGRIDSIZE];
+            private final int prefLengths[] = new int[MAXGRIDSIZE];
             private int prefLength = 0;
-            private double weights[] = new double[MAXGRIDSIZE];
+            private final double weights[] = new double[MAXGRIDSIZE];
             private double weight = 0.;
             private int weightlessPrefLength = 0;
             private int weightlessMinLength = 0;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java Sun Sep 10 17:04:04 2006
@@ -56,7 +56,7 @@
                                            UP_CYCLE_TRAVERSAL_KEYS,
                                            DOWN_CYCLE_TRAVERSAL_KEYS };
 
-    private Map<Integer, Set<AWTKeyStroke>> defaultFocusTraversalKeys =
+    private final Map<Integer, Set<AWTKeyStroke>> defaultFocusTraversalKeys =
         new HashMap<Integer, Set<AWTKeyStroke>>();
 
     private FocusTraversalPolicy defaultFocusTraversalPolicy =

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/List.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/List.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/List.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/List.java Sun Sep 10 17:04:04 2006
@@ -59,8 +59,8 @@
 
     private boolean multipleMode;
 
-    private ArrayList<String> items = new ArrayList<String>();
-    private ArrayList<Integer> selection = new ArrayList<Integer>();
+    private final ArrayList<String> items = new ArrayList<String>();
+    private final ArrayList<Integer> selection = new ArrayList<Integer>();
 
     private int visibleIndex = -1;
     private int currentIndex; // "focused" item index

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java Sun Sep 10 17:04:04 2006
@@ -41,7 +41,7 @@
 
     // Fields for mouse entered/exited support
     private Component lastUnderPointer = null;
-    private Point lastScreenPos = new Point(-1, -1);
+    private final Point lastScreenPos = new Point(-1, -1);
 
     // Fields for redundant mouse moved/dragged filtering
     private Component lastUnderMotion = null;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/RedrawManager.java Sun Sep 10 17:04:04 2006
@@ -21,7 +21,6 @@
 
 import java.awt.event.PaintEvent;
 import java.util.IdentityHashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ScrollPaneAdjustable.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ScrollPaneAdjustable.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ScrollPaneAdjustable.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/ScrollPaneAdjustable.java Sun Sep 10 17:04:04 2006
@@ -46,17 +46,17 @@
     private int blockIncrement;
     private boolean valueIsAdjusting;
     private ScrollbarStateController stateController;
-    private Rectangle bounds = new Rectangle();
+    private final Rectangle bounds = new Rectangle();
     final transient State state = new State();
     private boolean callAWTListener = false;
 
     class State implements ScrollbarState {
-        private Rectangle decreaseRect = new Rectangle();
-        private Rectangle increaseRect = new Rectangle();
-        private Rectangle sliderRect = new Rectangle();
-        private Rectangle trackRect = new Rectangle();
-        private Rectangle upperTrackRect = new Rectangle();
-        private Rectangle lowerTrackRect = new Rectangle();
+        private final Rectangle decreaseRect = new Rectangle();
+        private final Rectangle increaseRect = new Rectangle();
+        private final Rectangle sliderRect = new Rectangle();
+        private final Rectangle trackRect = new Rectangle();
+        private final Rectangle upperTrackRect = new Rectangle();
+        private final Rectangle lowerTrackRect = new Rectangle();
         private int trackSize;
 
         public Adjustable getAdjustable() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Scrollbar.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Scrollbar.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Scrollbar.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Scrollbar.java Sun Sep 10 17:04:04 2006
@@ -176,12 +176,12 @@
 
     class State extends Component.ComponentState implements ScrollbarState {
 
-        private Rectangle decreaseRect = new Rectangle();
-        private Rectangle increaseRect = new Rectangle();
-        private Rectangle sliderRect = new Rectangle();
-        private Rectangle trackRect = new Rectangle();
-        private Rectangle upperTrackRect = new Rectangle();
-        private Rectangle lowerTrackRect = new Rectangle();
+        private final Rectangle decreaseRect = new Rectangle();
+        private final Rectangle increaseRect = new Rectangle();
+        private final Rectangle sliderRect = new Rectangle();
+        private final Rectangle trackRect = new Rectangle();
+        private final Rectangle upperTrackRect = new Rectangle();
+        private final Rectangle lowerTrackRect = new Rectangle();
         private int trackSize;
 
         public boolean isDecreasePressed() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java Sun Sep 10 17:04:04 2006
@@ -13,30 +13,86 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Pavel Dolgov, Michael Danilov
- * @version $Revision$
- */
+
 package java.awt;
 
 import java.awt.datatransfer.Clipboard;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragGestureRecognizer;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.InvalidDnDOperationException;
+import java.awt.dnd.MouseDragGestureRecognizer;
 import java.awt.dnd.peer.DragSourceContextPeer;
+import java.awt.event.AWTEventListener;
+import java.awt.event.AWTEventListenerProxy;
+import java.awt.event.InputEvent;
 import java.awt.im.InputMethodHighlight;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageObserver;
+import java.awt.image.ImageProducer;
+import java.awt.peer.ButtonPeer;
+import java.awt.peer.CanvasPeer;
+import java.awt.peer.CheckboxMenuItemPeer;
+import java.awt.peer.CheckboxPeer;
+import java.awt.peer.ChoicePeer;
+import java.awt.peer.DialogPeer;
+import java.awt.peer.FileDialogPeer;
+import java.awt.peer.FontPeer;
+import java.awt.peer.FramePeer;
+import java.awt.peer.LabelPeer;
+import java.awt.peer.LightweightPeer;
+import java.awt.peer.ListPeer;
+import java.awt.peer.MenuBarPeer;
+import java.awt.peer.MenuItemPeer;
+import java.awt.peer.MenuPeer;
+import java.awt.peer.MouseInfoPeer;
+import java.awt.peer.PanelPeer;
+import java.awt.peer.PopupMenuPeer;
+import java.awt.peer.ScrollPanePeer;
+import java.awt.peer.ScrollbarPeer;
+import java.awt.peer.TextAreaPeer;
+import java.awt.peer.TextFieldPeer;
+import java.awt.peer.WindowPeer;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
-import java.security.*;
-import java.awt.image.*;
-import java.awt.peer.*;
-import java.beans.*;
-import java.util.*;
-import java.awt.dnd.*;
-import java.awt.event.*;
-
-import org.apache.harmony.awt.*;
-import org.apache.harmony.awt.datatransfer.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import org.apache.harmony.awt.ChoiceStyle;
+import org.apache.harmony.awt.ComponentInternals;
+import org.apache.harmony.awt.ContextStorage;
+import org.apache.harmony.awt.MouseEventPreprocessor;
+import org.apache.harmony.awt.ReadOnlyIterator;
+import org.apache.harmony.awt.Theme;
+import org.apache.harmony.awt.datatransfer.DTK;
+import org.apache.harmony.awt.datatransfer.NativeClipboard;
 import org.apache.harmony.awt.gl.MultiRectArea;
-import org.apache.harmony.awt.text.*;
-import org.apache.harmony.awt.wtk.*;
+import org.apache.harmony.awt.text.TextFieldKit;
+import org.apache.harmony.awt.text.TextKit;
+import org.apache.harmony.awt.wtk.CreationParams;
+import org.apache.harmony.awt.wtk.GraphicsFactory;
+import org.apache.harmony.awt.wtk.NativeCursor;
+import org.apache.harmony.awt.wtk.NativeEventQueue;
+import org.apache.harmony.awt.wtk.NativeEventThread;
+import org.apache.harmony.awt.wtk.NativeMouseInfo;
+import org.apache.harmony.awt.wtk.NativeWindow;
+import org.apache.harmony.awt.wtk.ShutdownWatchdog;
+import org.apache.harmony.awt.wtk.Synchronizer;
+import org.apache.harmony.awt.wtk.WTK;
+import org.apache.harmony.awt.wtk.WindowFactory;
 
 
 public abstract class Toolkit {
@@ -657,17 +713,15 @@
         }
     }
 
-    public DragGestureRecognizer createDragGestureRecognizer(
-            Class<?> recognizerAbstractClass, 
-            DragSource ds, 
-            Component c, 
-            int srcActions, 
+    @SuppressWarnings("unchecked")
+    public <T extends DragGestureRecognizer> T createDragGestureRecognizer(
+            Class<T> recognizerAbstractClass, DragSource ds, Component c, int srcActions,
             DragGestureListener dgl) {
         if (recognizerAbstractClass == null) {
             return null;
         }
         if (recognizerAbstractClass.isAssignableFrom(MouseDragGestureRecognizer.class)) {
-            return new DefaultMouseDragGestureRecognizer(ds, c, srcActions, dgl);
+            return (T) new DefaultMouseDragGestureRecognizer(ds, c, srcActions, dgl);
         }
         return null;
     }
@@ -1283,7 +1337,7 @@
 
         AWTPermission permission = new AWTPermission("listenToAllAWTEvents");
 
-        private AWTListenerList listeners = new AWTListenerList(null);
+        private final AWTListenerList listeners = new AWTListenerList(null);
 
         void addAWTEventListener(AWTEventListener listener, long eventMask) {
             if (listener != null) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java Sun Sep 10 17:04:04 2006
@@ -56,7 +56,7 @@
     private final AWTListenerList windowFocusListeners = new AWTListenerList(this);
     private final AWTListenerList windowListeners = new AWTListenerList(this);
     private final AWTListenerList windowStateListeners = new AWTListenerList(this);
-    private ArrayList<Window> ownedWindows = new ArrayList<Window>();
+    private final ArrayList<Window> ownedWindows = new ArrayList<Window>();
     private transient Component focusOwner;
     private boolean focusableWindowState = true;//By default, all Windows have a focusable Window state of true
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/DataFlavor.java Sun Sep 10 17:04:04 2006
@@ -596,9 +596,7 @@
         }
         Arrays.sort(charsets, String.CASE_INSENSITIVE_ORDER);
 
-        for (Iterator<DataFlavor> i = list.iterator(); i.hasNext();) {
-            DataFlavor flavor = i.next();
-
+        for (DataFlavor flavor : list) {
             if (charsets[0].equalsIgnoreCase(flavor.getCharset())) {
                 best.add(flavor);
             }
@@ -649,9 +647,7 @@
     private static List<DataFlavor> getFlavors(List<DataFlavor> list, Class<?> klass) {
         LinkedList<DataFlavor> sublist = new LinkedList<DataFlavor>();
 
-        for (Iterator<DataFlavor> i = list.iterator(); i.hasNext();) {
-            DataFlavor flavor = i.next();
-
+        for (DataFlavor flavor : list) {
             if (flavor.representationClass.equals(klass)) {
                 sublist.add(flavor);
             }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/StringSelection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/StringSelection.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/StringSelection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/datatransfer/StringSelection.java Sun Sep 10 17:04:04 2006
@@ -13,20 +13,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.datatransfer;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.StringBufferInputStream;
 
+@SuppressWarnings("deprecation")
 public class StringSelection implements Transferable, ClipboardOwner {
 
-    private static final DataFlavor[] supportedFlavors = {
-            DataFlavor.stringFlavor,
-            DataFlavor.plainTextFlavor
-    };
+    private static final DataFlavor[] supportedFlavors = { DataFlavor.stringFlavor,
+            DataFlavor.plainTextFlavor };
 
     private String string;
 
@@ -34,9 +31,8 @@
         string = data;
     }
 
-    public Object getTransferData(DataFlavor flavor)
-            throws UnsupportedFlavorException, IOException
-    {
+    public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException,
+            IOException {
         if (flavor.equals(DataFlavor.stringFlavor)) {
             return string;
         } else if (flavor.equals(DataFlavor.plainTextFlavor)) {
@@ -47,8 +43,8 @@
     }
 
     public boolean isDataFlavorSupported(DataFlavor flavor) {
-        return (flavor.equals(DataFlavor.stringFlavor)
-                || flavor.equals(DataFlavor.plainTextFlavor));
+        return (flavor.equals(DataFlavor.stringFlavor) || flavor
+                .equals(DataFlavor.plainTextFlavor));
     }
 
     public DataFlavor[] getTransferDataFlavors() {
@@ -57,5 +53,4 @@
 
     public void lostOwnership(Clipboard clipboard, Transferable contents) {
     }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureEvent.java Sun Sep 10 17:04:04 2006
@@ -13,13 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Image;
+import java.awt.Point;
 import java.awt.datatransfer.Transferable;
 import java.awt.event.InputEvent;
 import java.util.EventObject;
@@ -29,13 +29,18 @@
 public class DragGestureEvent extends EventObject {
 
     private static final long serialVersionUID = 9080172649166731306L;
+
     private final DragGestureRecognizer recognizer;
+
     private final Point origin;
-    private final List eventList;
+
+    private final List<InputEvent> eventList;
+
     private final int action;
 
-    public DragGestureEvent(DragGestureRecognizer dgr, 
-                            int act, Point ori, List evs) {
+    @SuppressWarnings("unchecked")
+    public DragGestureEvent(DragGestureRecognizer dgr, int act, Point ori,
+            List<? extends InputEvent> evs) {
         super(dgr);
 
         if (dgr.getComponent() == null) {
@@ -60,7 +65,7 @@
         recognizer = dgr;
         action = act;
         origin = ori;
-        eventList = evs;
+        eventList = (List<InputEvent>) evs;
     }
 
     public DragSource getDragSource() {
@@ -91,7 +96,7 @@
         return eventList.toArray();
     }
 
-    public Iterator iterator() {
+    public Iterator<InputEvent> iterator() {
         return eventList.iterator();
     }
 
@@ -100,33 +105,25 @@
     }
 
     public void startDrag(Cursor dragCursor, Transferable transferable)
-            throws InvalidDnDOperationException
-    {
-        DragSourceListener[] listeners = 
-            recognizer.dragSource.getDragSourceListeners();
-        DragSourceListener dsl = 
-            listeners.length > 0 ? new DragSourceMulticaster(listeners) : null;
+            throws InvalidDnDOperationException {
+        DragSourceListener[] listeners = recognizer.dragSource.getDragSourceListeners();
+        DragSourceListener dsl = listeners.length > 0 ? new DragSourceMulticaster(listeners)
+                : null;
         startDrag(dragCursor, transferable, dsl);
     }
 
-    public void startDrag(Cursor dragCursor, 
-                          Image dragImage, 
-                          Point imageOffset,
-                          Transferable transferable, 
-                          DragSourceListener dsl) 
+    public void startDrag(Cursor dragCursor, Image dragImage, Point imageOffset,
+            Transferable transferable, DragSourceListener dsl)
             throws InvalidDnDOperationException {
 
-        recognizer.getDragSource().startDrag(this, dragCursor, dragImage, 
-                                             imageOffset, transferable, dsl);
+        recognizer.getDragSource().startDrag(this, dragCursor, dragImage, imageOffset,
+                transferable, dsl);
     }
 
-    public void startDrag(Cursor dragCursor, 
-                          Transferable transferable, 
-                          DragSourceListener dsl)
+    public void startDrag(Cursor dragCursor, Transferable transferable, DragSourceListener dsl)
             throws InvalidDnDOperationException {
 
-        recognizer.getDragSource().startDrag(
-                this, dragCursor, transferable, dsl);
+        recognizer.getDragSource().startDrag(this, dragCursor, transferable, dsl);
     }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureRecognizer.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureRecognizer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragGestureRecognizer.java Sun Sep 10 17:04:04 2006
@@ -13,16 +13,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
+import java.awt.Component;
+import java.awt.Point;
 import java.awt.event.InputEvent;
 import java.io.Serializable;
-import java.util.*;
-import java.awt.*;
+import java.util.ArrayList;
+import java.util.TooManyListenersException;
 
 public abstract class DragGestureRecognizer implements Serializable {
 
@@ -34,7 +33,7 @@
 
     protected Component component;
 
-    protected ArrayList events;
+    protected ArrayList<InputEvent> events;
 
     protected transient DragGestureListener dragGestureListener;
 
@@ -97,7 +96,7 @@
         }
 
         if (events == null) {
-            events = new ArrayList();
+            events = new ArrayList<InputEvent>();
         }
 
         events.add(awtie);
@@ -108,7 +107,7 @@
             return null;
         }
 
-        return (InputEvent) events.get(0);
+        return events.get(0);
     }
 
     public void resetRecognizer() {
@@ -116,8 +115,7 @@
     }
 
     public synchronized void addDragGestureListener(DragGestureListener dgl)
-            throws TooManyListenersException
-    {
+            throws TooManyListenersException {
         if (dgl == null) {
             return;
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSource.java Sun Sep 10 17:04:04 2006
@@ -13,14 +13,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
-import java.awt.*;
-import java.awt.datatransfer.*;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.awt.datatransfer.FlavorMap;
+import java.awt.datatransfer.SystemFlavorMap;
+import java.awt.datatransfer.Transferable;
 import java.awt.dnd.peer.DragSourceContextPeer;
 import java.io.Serializable;
 import java.util.EventListener;
@@ -45,8 +50,8 @@
 
     public static final Cursor DefaultLinkNoDrop;
 
-    private static DragSource defaultSource = null;
-    private static DragSourceContext curContext = null;
+    private static DragSource defaultSource;
+    private static DragSourceContext curContext;
 
     private final ListenerList dragSourceListeners;
     private final ListenerList dragSourceMotionListeners;
@@ -129,15 +134,16 @@
         dragSourceMotionListeners.removeUserListener(dsml);
     }
 
-    public EventListener[] getListeners(Class listenerType) {
+    @SuppressWarnings("unchecked")
+    public <T extends EventListener> T[] getListeners(Class<T> listenerType) {
         if (DragSourceListener.class.isAssignableFrom(listenerType)) {
-            return getDragSourceListeners();
+            return (T[])getDragSourceListeners();
         } else if (DragSourceMotionListener.class.isAssignableFrom(
                 listenerType)) {
-            return getDragSourceMotionListeners();
+            return (T[])getDragSourceMotionListeners();
         }
 
-        return new EventListener[0];
+        return (T[])new EventListener[0];
     }
 
     protected DragSourceContext createDragSourceContext(
@@ -208,15 +214,12 @@
         startDrag(trigger, dragCursor, transferable, dsl, null);
     }
 
-    public DragGestureRecognizer createDragGestureRecognizer(
-                            Class recognizerAbstractClass, 
-                            Component c, 
-                            int actions, 
-                            DragGestureListener dgl) {
+    @SuppressWarnings("unchecked")
+    public <T extends DragGestureRecognizer> T createDragGestureRecognizer(
+            Class<T> recognizerAbstractClass, Component c, int actions, DragGestureListener dgl) {
 
         Toolkit t = Toolkit.getDefaultToolkit();
-        return t.createDragGestureRecognizer(
-                    recognizerAbstractClass, this, c, actions, dgl);
+        return t.createDragGestureRecognizer(recognizerAbstractClass, this, c, actions, dgl);
     }
 
     public DragGestureRecognizer createDefaultDragGestureRecognizer(

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceContext.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceContext.java Sun Sep 10 17:04:04 2006
@@ -45,8 +45,6 @@
     private final DragGestureEvent trigger;
     private final Transferable transferable;
     private final Component component;
-    private final Image image;
-    private final Point imageOffset;
     private final DragSourceContextPeer peer;
 
     private int sourceAction;
@@ -93,8 +91,6 @@
         dragSource = trigger.getDragSource();
         sourceAction = trigger.getDragAction();
         component = trigger.getComponent();
-        image = dragImage;
-        imageOffset = offset;
         peer = dscp;
 
         try {
@@ -260,8 +256,8 @@
     public void dragMouseMoved(DragSourceDragEvent dsde) {
         DragSourceMotionListener[] listeners = dragSource.getDragSourceMotionListeners();
 
-        for (int i = 0; i < listeners.length; i++) {
-            listeners[i].dragMouseMoved(dsde);
+        for (DragSourceMotionListener element : listeners) {
+            element.dragMouseMoved(dsde);
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DragSourceMulticaster.java Sun Sep 10 17:04:04 2006
@@ -13,10 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/** 
- * @author Pavel Dolgov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
 /**
@@ -24,39 +21,39 @@
  */
 class DragSourceMulticaster implements DragSourceListener {
 
-    final DragSourceListener[] listeners;
-    
+    private final DragSourceListener[] listeners;
+
     DragSourceMulticaster(DragSourceListener[] listeners) {
         this.listeners = listeners;
     }
 
     public void dragExit(DragSourceEvent dsde) {
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].dragExit(dsde);
+        for (DragSourceListener element : listeners) {
+            element.dragExit(dsde);
         }
     }
 
     public void dragDropEnd(DragSourceDropEvent dsde) {
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].dragDropEnd(dsde);
+        for (DragSourceListener element : listeners) {
+            element.dragDropEnd(dsde);
         }
     }
 
     public void dropActionChanged(DragSourceDragEvent dsde) {
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].dropActionChanged(dsde);
+        for (DragSourceListener element : listeners) {
+            element.dropActionChanged(dsde);
         }
     }
 
     public void dragOver(DragSourceDragEvent dsde) {
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].dragOver(dsde);
+        for (DragSourceListener element : listeners) {
+            element.dragOver(dsde);
         }
     }
 
     public void dragEnter(DragSourceDragEvent dsde) {
-        for (int i=0; i<listeners.length; i++) {
-            listeners[i].dragEnter(dsde);
+        for (DragSourceListener element : listeners) {
+            element.dragEnter(dsde);
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetContext.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetContext.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetContext.java Sun Sep 10 17:04:04 2006
@@ -13,10 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov, Pavel Dolgov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
 import java.awt.Component;
@@ -37,27 +34,28 @@
 public class DropTargetContext implements Serializable {
 
     private static final long serialVersionUID = -634158968993743371L;
-    
+
     protected class TransferableProxy implements Transferable {
-        
+
         protected boolean isLocal;
+
         protected Transferable transferable;
-        
+
         TransferableProxy(boolean isLocal, Transferable transferable) {
             this.isLocal = isLocal;
             this.transferable = transferable;
         }
 
-        public Object getTransferData(DataFlavor flavor) 
-                throws UnsupportedFlavorException, IOException {
-            
+        public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException,
+                IOException {
+
             if (isLocal && flavor.isMimeTypeSerializedObject()) {
                 Object data = transferable.getTransferData(flavor);
                 if (data instanceof Serializable) {
-                    return getSerializedCopy((Serializable)data);
+                    return getSerializedCopy((Serializable) data);
                 }
             }
-            
+
             return transferable.getTransferData(flavor);
         }
 
@@ -66,8 +64,7 @@
                 ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
                 ObjectOutputStream objOut = new ObjectOutputStream(byteOut);
                 objOut.writeObject(data);
-                ByteArrayInputStream byteIn = 
-                    new ByteArrayInputStream(byteOut.toByteArray());
+                ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray());
                 ObjectInputStream objIn = new ObjectInputStream(byteIn);
                 return objIn.readObject();
             } catch (Exception e) {
@@ -85,23 +82,22 @@
     }
 
     final DropTarget target;
-    
+
     DropTargetContextPeer peer;
-    
+
     DropTargetContext(DropTarget target) {
         this.target = target;
     }
 
-    protected Transferable createTransferableProxy(
-            Transferable t, boolean local) {
+    protected Transferable createTransferableProxy(Transferable t, boolean local) {
         return new TransferableProxy(local, t);
     }
 
-    protected List getCurrentDataFlavorsAsList() {
+    protected List<DataFlavor> getCurrentDataFlavorsAsList() {
         if (peer != null) {
             return Arrays.asList(peer.getTransferDataFlavors());
         }
-        return new ArrayList();
+        return new ArrayList<DataFlavor>();
     }
 
     public void addNotify(DropTargetContextPeer peer) {
@@ -112,21 +108,18 @@
         return target;
     }
 
-    protected Transferable getTransferable() 
-            throws InvalidDnDOperationException {
+    protected Transferable getTransferable() throws InvalidDnDOperationException {
         if (peer == null) {
-            throw new InvalidDnDOperationException(
-                "Transfer data is not available");
+            throw new InvalidDnDOperationException("Transfer data is not available");
         }
-        return new TransferableProxy(
-                peer.isTransferableJVMLocal(), peer.getTransferable());
+        return new TransferableProxy(peer.isTransferableJVMLocal(), peer.getTransferable());
     }
 
     protected boolean isDataFlavorSupported(DataFlavor flavor) {
         if (peer != null) {
             DataFlavor[] df = peer.getTransferDataFlavors();
-            for (int i=0; i<df.length; i++) {
-                if (df[i].equals(flavor)) {
+            for (DataFlavor element : df) {
+                if (element.equals(flavor)) {
                     return true;
                 }
             }
@@ -145,8 +138,7 @@
         return target.getComponent();
     }
 
-    public void dropComplete(boolean success) 
-            throws InvalidDnDOperationException {
+    public void dropComplete(boolean success) throws InvalidDnDOperationException {
         if (peer != null) {
             peer.dropComplete(success);
         }
@@ -193,5 +185,4 @@
         }
         return target.getDefaultActions();
     }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDragEvent.java Sun Sep 10 17:04:04 2006
@@ -13,10 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
 import java.awt.Point;
@@ -28,12 +25,12 @@
 
     private static final long serialVersionUID = -8422265619058953682L;
 
-    public DropTargetDragEvent(DropTargetContext dtc, Point cursorLocn,
-            int dropAction, int srcActions)
-    {
+    public DropTargetDragEvent(DropTargetContext dtc, Point cursorLocn, int dropAction,
+            int srcActions) {
         super(dtc, cursorLocn, dropAction, srcActions);
     }
 
+    @Override
     public Point getLocation() {
         return super.getLocation();
     }
@@ -54,7 +51,7 @@
         context.rejectDrag();
     }
 
-    public List getCurrentDataFlavorsAsList() {
+    public List<DataFlavor> getCurrentDataFlavorsAsList() {
         return context.getCurrentDataFlavorsAsList();
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDropEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDropEvent.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDropEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/DropTargetDropEvent.java Sun Sep 10 17:04:04 2006
@@ -13,38 +13,35 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd;
 
 import java.awt.Point;
-import java.awt.datatransfer.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
 import java.util.List;
 
 public class DropTargetDropEvent extends DropTargetEvent {
 
-    private static final long serialVersionUID = -1721911170440459322L
-;
+    private static final long serialVersionUID = -1721911170440459322L;
+
     private final boolean local;
 
     public DropTargetDropEvent(DropTargetContext dtc, Point cursorLocn, int dropAction,
-            int srcActions)
-    {
+            int srcActions) {
         super(dtc, cursorLocn, dropAction, srcActions);
 
         local = false;
     }
 
     public DropTargetDropEvent(DropTargetContext dtc, Point cursorLocn, int dropAction,
-            int srcActions, boolean isLocal)
-    {
+            int srcActions, boolean isLocal) {
         super(dtc, cursorLocn, dropAction, srcActions);
 
         local = isLocal;
     }
 
+    @Override
     public Point getLocation() {
         return super.getLocation();
     }
@@ -61,7 +58,7 @@
         return local;
     }
 
-    public List getCurrentDataFlavorsAsList() {
+    public List<DataFlavor> getCurrentDataFlavorsAsList() {
         return context.getCurrentDataFlavorsAsList();
     }
 
@@ -88,5 +85,4 @@
     public void rejectDrop() {
         context.rejectDrop();
     }
-
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/MouseDragGestureRecognizer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/MouseDragGestureRecognizer.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/MouseDragGestureRecognizer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/MouseDragGestureRecognizer.java Sun Sep 10 17:04:04 2006
@@ -46,6 +46,7 @@
         super(ds);
     }
 
+    @Override
     protected void registerListeners() {
         if (component != null) {
             component.addMouseListener(this);
@@ -53,6 +54,7 @@
         }
     }
 
+    @Override
     protected void unregisterListeners() {
         if (component != null) {
             component.removeMouseListener(this);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DragSourceContextPeer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DragSourceContextPeer.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DragSourceContextPeer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DragSourceContextPeer.java Sun Sep 10 17:04:04 2006
@@ -13,14 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd.peer;
 
-import java.awt.*;
-import java.awt.dnd.*;
+import java.awt.Cursor;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.dnd.DragSourceContext;
+import java.awt.dnd.InvalidDnDOperationException;
 
 public interface DragSourceContextPeer {
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DropTargetContextPeer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DropTargetContextPeer.java?view=diff&rev=442042&r1=442041&r2=442042
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DropTargetContextPeer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/dnd/peer/DropTargetContextPeer.java Sun Sep 10 17:04:04 2006
@@ -13,18 +13,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Michael Danilov
- * @version $Revision$
- */
+
 package java.awt.dnd.peer;
 
-import java.awt.dnd.*;
-import java.awt.datatransfer.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.InvalidDnDOperationException;
 
 public interface DropTargetContextPeer {
 
-    int  getTargetActions();
+    int getTargetActions();
 
     void setTargetActions(int actions);
 



Mime
View raw message