You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/08/31 18:21:46 UTC

svn commit: r809649 - /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/

Author: smartini
Date: Mon Aug 31 16:21:45 2009
New Revision: 809649

URL: http://svn.apache.org/viewvc?rev=809649&view=rev
Log:
add some missing override, in some cases on methods of inner classes (not shown in eclipse warnings)

Modified:
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PanelSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RollupSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
    incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java Mon Aug 31 16:21:45 2009
@@ -39,6 +39,7 @@
     private boolean closeMenuPopup = false;
 
     private ComponentKeyListener menuPopupComponentKeyListener = new ComponentKeyListener.Adapter() {
+        @Override
         public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
             boolean consumed = false;
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Mon Aug 31 16:21:45 2009
@@ -189,10 +189,12 @@
         return consumed;
     }
 
+    @Override
     public void menuChanged(MenuButton menuButton, Menu previousMenu) {
         menuPopup.setMenu(menuButton.getMenu());
     }
 
+    @Override
     public void repeatableChanged(MenuButton menuButton) {
         invalidateComponent();
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuItemSkin.java Mon Aug 31 16:21:45 2009
@@ -242,10 +242,12 @@
         }
     }
 
+    @Override
     public void nameChanged(Menu.Item menuItem, String previousName) {
         // No-op
     }
 
+    @Override
     public void menuChanged(Menu.Item menuItem, Menu previousMenu) {
         menuPopup.setMenu(menuItem.getMenu());
         repaintComponent();

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java Mon Aug 31 16:21:45 2009
@@ -58,6 +58,7 @@
         }
     };
 
+    @Override
     public void install(Component component) {
         super.install(component);
 
@@ -70,6 +71,7 @@
         }
     }
 
+    @Override
     public void uninstall() {
         MovieView movieView = (MovieView)getComponent();
         Movie movie = movieView.getMovie();
@@ -82,6 +84,7 @@
         super.uninstall();
     }
 
+    @Override
     public int getPreferredWidth(int height) {
         MovieView movieView = (MovieView)getComponent();
         Movie movie = movieView.getMovie();
@@ -89,6 +92,7 @@
         return (movie == null) ? 0 : Math.round(movie.getWidth() * scale);
     }
 
+    @Override
     public int getPreferredHeight(int width) {
         MovieView movieView = (MovieView)getComponent();
         Movie movie = movieView.getMovie();
@@ -106,6 +110,7 @@
             Math.round(movie.getHeight() * scale));
     }
 
+    @Override
     public void layout() {
         MovieView movieView = (MovieView)getComponent();
         Movie movie = movieView.getMovie();
@@ -143,6 +148,7 @@
         }
     }
 
+    @Override
     public void paint(Graphics2D graphics) {
         MovieView movieView = (MovieView)getComponent();
         Movie movie = movieView.getMovie();
@@ -271,6 +277,7 @@
 
     // MovieViewListener methods
 
+    @Override
     public void movieChanged(MovieView movieView, Movie previousMovie) {
         if (previousMovie != null) {
             previousMovie.getMovieListeners().remove(movieListener);

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PanelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PanelSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PanelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/PanelSkin.java Mon Aug 31 16:21:45 2009
@@ -20,6 +20,7 @@
  * Panel skin.
  */
 public class PanelSkin extends ContainerSkin {
+    @Override
     public void layout() {
         // No-op
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RollupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RollupSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RollupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/RollupSkin.java Mon Aug 31 16:21:45 2009
@@ -46,11 +46,13 @@
         super.uninstall();
     }
 
+    @Override
     public Vote previewExpandedChange(Rollup rollup) {
         // No-op
         return Vote.APPROVE;
     }
 
+    @Override
     public void expandedChangeVetoed(Rollup rollup, Vote reason) {
         // No-op
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java Mon Aug 31 16:21:45 2009
@@ -519,6 +519,7 @@
         return maxScrollLeft;
     }
 
+    @Override
     public void layout() {
         ScrollPane scrollPane = (ScrollPane)getComponent();
 
@@ -847,6 +848,7 @@
 
     // Viewport.Skin methods
 
+    @Override
     public Bounds getViewportBounds() {
         int x = 0;
         int y = 0;
@@ -884,24 +886,29 @@
 
     // ScrollPaneListener methods
 
+    @Override
     public void horizontalScrollBarPolicyChanged(ScrollPane scrollPane,
         ScrollBarPolicy previousHorizontalScrollBarPolicy) {
         invalidateComponent();
     }
 
+    @Override
     public void verticalScrollBarPolicyChanged(ScrollPane scrollPane,
         ScrollBarPolicy previousVerticalScrollBarPolicy) {
         invalidateComponent();
     }
 
+    @Override
     public void rowHeaderChanged(ScrollPane scrollPane, Component previousRowHeader) {
         invalidateComponent();
     }
 
+    @Override
     public void columnHeaderChanged(ScrollPane scrollPane, Component previousColumnHeader) {
         invalidateComponent();
     }
 
+    @Override
     public void cornerChanged(ScrollPane scrollPane, Component previousCorner) {
         invalidateComponent();
     }
@@ -909,6 +916,7 @@
     // ViewportListener methods
 
     @SuppressWarnings("deprecation")
+    @Override
     public void scrollTopChanged(Viewport viewport, int previousScrollTop) {
         // NOTE we don't invalidate the component here because we need only
         // reposition the view and row header. Invalidating would yield
@@ -990,6 +998,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Override
     public void scrollLeftChanged(Viewport viewport, int previousScrollLeft) {
         // NOTE we don't invalidate the component here because we need only
         // reposition the view and column header. Invalidating would yield
@@ -1070,12 +1079,14 @@
         }
     }
 
+    @Override
     public void viewChanged(Viewport viewport, Component previousView) {
         invalidateComponent();
     }
 
     // ScrollBarValueListener methods
 
+    @Override
     public void valueChanged(ScrollBar scrollBar, int previousValue) {
         ScrollPane scrollPane = (ScrollPane)getComponent();
 

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/SeparatorSkin.java Mon Aug 31 16:21:45 2009
@@ -75,6 +75,7 @@
         super.uninstall();
     }
 
+    @Override
     public int getPreferredWidth(int height) {
         int preferredWidth = 0;
 
@@ -91,6 +92,7 @@
         return preferredWidth;
     }
 
+    @Override
     public int getPreferredHeight(int width) {
         int preferredHeight = thickness;
 
@@ -109,15 +111,18 @@
         return preferredHeight;
     }
 
+    @Override
     public Dimensions getPreferredSize() {
         // TODO Optimize
         return new Dimensions(getPreferredWidth(-1), getPreferredHeight(-1));
     }
 
+    @Override
     public void layout() {
         // No-op
     }
 
+    @Override
     public void paint(Graphics2D graphics) {
         Separator separator = (Separator)getComponent();
         int width = getWidth();
@@ -289,6 +294,7 @@
     }
 
     // Separator events
+    @Override
     public void headingChanged(Separator separator, String previousHeading) {
         invalidateComponent();
     }

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/StackPaneSkin.java Mon Aug 31 16:21:45 2009
@@ -28,6 +28,7 @@
 public class StackPaneSkin extends ContainerSkin {
     private Insets padding = Insets.NONE;
 
+    @Override
     public int getPreferredWidth(int height) {
         int preferredWidth = 0;
         StackPane stackPane = (StackPane)getComponent();
@@ -42,6 +43,7 @@
         return preferredWidth;
     }
 
+    @Override
     public int getPreferredHeight(int width) {
         int preferredHeight = 0;
         StackPane stackPane = (StackPane)getComponent();
@@ -56,6 +58,7 @@
         return preferredHeight;
     }
 
+    @Override
     public Dimensions getPreferredSize() {
         int preferredWidth = 0;
         int preferredHeight = 0;
@@ -78,6 +81,7 @@
         return new Dimensions(preferredWidth, preferredHeight);
     }
 
+    @Override
     public void layout() {
         // Set the size of all components to match the size of the stack pane,
         // minus padding

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TablePaneSkin.java Mon Aug 31 16:21:45 2009
@@ -420,6 +420,7 @@
         return new Dimensions(preferredWidth, preferredHeight);
     }
 
+    @Override
     public void layout() {
         TablePane tablePane = (TablePane)getComponent();
 
@@ -1251,6 +1252,7 @@
 
     // TablePane.Skin methods
 
+    @Override
     public int getRowAt(int y) {
         if (rowHeights == null) {
             return -1;
@@ -1272,6 +1274,7 @@
         return rowIndex;
     }
 
+    @Override
     public Bounds getRowBounds(int row) {
         if (rowHeights == null) {
             return new Bounds(0, 0, 0, 0);
@@ -1286,6 +1289,7 @@
         return new Bounds(0, rowY, getWidth(), rowHeights[row]);
     }
 
+    @Override
     public int getColumnAt(int x) {
         if (columnWidths == null) {
             return -1;
@@ -1307,6 +1311,7 @@
         return columnIndex;
     }
 
+    @Override
     public Bounds getColumnBounds(int column) {
         if (columnWidths == null) {
             return new Bounds(0, 0, 0, 0);
@@ -1323,52 +1328,63 @@
 
     // TablePaneListener methods
 
+    @Override
     public void rowInserted(TablePane tablePane, int index) {
         invalidateComponent();
     }
 
+    @Override
     public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows) {
         invalidateComponent();
     }
 
+    @Override
     public void rowHeightChanged(TablePane.Row row, int previousHeight,
         boolean previousRelative) {
         invalidateComponent();
     }
 
+    @Override
     public void rowHighlightedChanged(TablePane.Row row) {
         TablePane tablePane = row.getTablePane();
         repaintComponent(getRowBounds(tablePane.getRows().indexOf(row)));
     }
 
+    @Override
     public void columnInserted(TablePane tablePane, int index) {
         invalidateComponent();
     }
 
+    @Override
     public void columnsRemoved(TablePane tablePane, int index,
         Sequence<TablePane.Column> columns) {
         invalidateComponent();
     }
 
+    @Override
     public void columnWidthChanged(TablePane.Column column, int previousWidth,
         boolean previousRelative) {
         invalidateComponent();
     }
 
+    @Override
     public void columnHighlightedChanged(TablePane.Column column) {
         TablePane tablePane = column.getTablePane();
         repaintComponent(getColumnBounds(tablePane.getColumns().indexOf(column)));
     }
 
+    @Override
     public void cellInserted(TablePane.Row row, int column) {
         invalidateComponent();
     }
 
+    @Override
     public void cellsRemoved(TablePane.Row row, int column,
         Sequence<Component> removed) {
         invalidateComponent();
     }
 
+    @Override
     public void cellUpdated(TablePane.Row row, int column,
         Component previousComponent) {
         invalidateComponent();
@@ -1376,11 +1392,13 @@
 
     // TablePaneAttribute events
 
+    @Override
     public void rowSpanChanged(TablePane tablePane, Component component,
         int previousRowSpan) {
         invalidateComponent();
     }
 
+    @Override
     public void columnSpanChanged(TablePane tablePane, Component component,
         int previousColumnSpan) {
         invalidateComponent();

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Mon Aug 31 16:21:45 2009
@@ -115,11 +115,13 @@
             node.getNodeListeners().remove(this);
         }
 
+        @Override
         public int getWidth() {
             validate();
             return width;
         }
 
+        @Override
         public int getHeight() {
             return getHeight(true);
         }
@@ -245,18 +247,22 @@
         public abstract int getCharacterAt(int x, int y);
         public abstract Bounds getCharacterBounds(int offset);
 
+        @Override
         public void parentChanged(Node node, Element previousParent) {
             // No-op
         }
 
+        @Override
         public void offsetChanged(Node node, int previousOffset) {
             // No-op
         }
 
+        @Override
         public void rangeInserted(Node node, int offset, int span) {
             // No-op
         }
 
+        @Override
         public void rangeRemoved(Node node, int offset, int span) {
             // No-op
         }
@@ -301,6 +307,7 @@
                 return null;
             }
 
+            @Override
             public void paint(Graphics2D graphics) {
                 // No-op
             }
@@ -310,6 +317,7 @@
          * Comparator used to perform binary searches on node views by location.
          */
         private class NodeViewLocationComparator implements Comparator<NodeView> {
+            @Override
             public int compare(NodeView nodeView1, NodeView nodeView2) {
                 int x1 = nodeView1.getX();
                 int y1 = nodeView1.getY();
@@ -327,6 +335,7 @@
          * Comparator used to perform binary searches on node views by offset.
          */
         private class NodeViewOffsetComparator implements Comparator<NodeView> {
+            @Override
             public int compare(NodeView nodeView1, NodeView nodeView2) {
                 int offset1 = nodeView1.getOffset();
                 int offset2 = nodeView2.getOffset();
@@ -365,6 +374,7 @@
             remove(0, getLength());
         }
 
+        @Override
         public int add(NodeView nodeView) {
             int index = getLength();
             insert(nodeView, index);
@@ -372,6 +382,7 @@
             return index;
         }
 
+        @Override
         public void insert(NodeView nodeView, int index) {
             nodeView.setParent(this);
             nodeView.attach();
@@ -379,10 +390,12 @@
             nodeViews.insert(nodeView, index);
         }
 
+        @Override
         public NodeView update(int index, NodeView nodeView) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public int remove(NodeView nodeView) {
             int index = indexOf(nodeView);
             if (index != -1) {
@@ -392,6 +405,7 @@
             return index;
         }
 
+        @Override
         public Sequence<NodeView> remove(int index, int count) {
             Sequence<NodeView> removed = nodeViews.remove(index, count);
 
@@ -404,18 +418,22 @@
             return removed;
         }
 
+        @Override
         public NodeView get(int index) {
             return nodeViews.get(index);
         }
 
+        @Override
         public int indexOf(NodeView nodeView) {
             return nodeViews.indexOf(nodeView);
         }
 
+        @Override
         public int getLength() {
             return nodeViews.getLength();
         }
 
+        @Override
         public void paint(Graphics2D graphics) {
             // Determine the paint bounds
             Bounds paintBounds = new Bounds(0, 0, getWidth(), getHeight());
@@ -515,14 +533,17 @@
             return bounds;
         }
 
+        @Override
         public void nodeInserted(Element element, int index) {
             invalidate();
         }
 
+        @Override
         public void nodesRemoved(Element element, int index, Sequence<Node> nodes) {
             invalidate();
         }
 
+        @Override
         public Iterator<NodeView> iterator() {
             return new ImmutableIterator<NodeView>(nodeViews.iterator());
         }
@@ -539,6 +560,7 @@
                 this.index = index;
             }
 
+            @Override
             public void run() {
                 if (index != -1) {
                     NodeView nodeView = get(index++);
@@ -661,6 +683,7 @@
             return null;
         }
 
+        @Override
         public void nodeInserted(Element element, int index) {
             super.nodeInserted(element, index);
 
@@ -668,6 +691,7 @@
             insert(createNodeView(document.get(index)), index);
         }
 
+        @Override
         public void nodesRemoved(Element element, int index, Sequence<Node> nodes) {
             remove(index, nodes.getLength());
 
@@ -809,6 +833,7 @@
             super.validate();
         }
 
+        @Override
         public void paint(Graphics2D graphics) {
             super.paint(graphics);
 
@@ -985,6 +1010,7 @@
             super.validate();
         }
 
+        @Override
         public void paint(Graphics2D graphics) {
             TextNode textNode = (TextNode)getNode();
             String text = textNode.getText();
@@ -1060,10 +1086,12 @@
             return bounds;
         }
 
+        @Override
         public void charactersInserted(TextNode textNode, int index, int count) {
             invalidate();
         }
 
+        @Override
         public void charactersRemoved(TextNode textNode, int index, String characters) {
             invalidate();
         }
@@ -1113,6 +1141,7 @@
             }
         }
 
+        @Override
         public void paint(Graphics2D graphics) {
             ImageNode imageNode = (ImageNode)getNode();
             Image image = imageNode.getImage();
@@ -1132,6 +1161,7 @@
             return null;
         }
 
+        @Override
         public int getCharacterAt(int x, int y) {
             return 0;
         }
@@ -1141,12 +1171,14 @@
             return new Bounds(0, 0, getWidth(), getHeight());
         }
 
+        @Override
         public void imageChanged(ImageNode imageNode, Image previousImage) {
             invalidate();
         }
     }
 
     private class BlinkCursorCallback implements Runnable {
+        @Override
         public void run() {
             caretOn = !caretOn;
 
@@ -1180,6 +1212,7 @@
         color = Color.BLACK;
     }
 
+    @Override
     public void install(Component component) {
         super.install(component);
 
@@ -1198,6 +1231,7 @@
         selectionChanged(textArea, 0, 0);
     }
 
+    @Override
     public void uninstall() {
         TextArea textArea = (TextArea)getComponent();
         textArea.getTextAreaListeners().remove(this);
@@ -1219,6 +1253,7 @@
         return textArea.isEditable();
     }
 
+    @Override
     public int getPreferredWidth(int height) {
         int preferredWidth;
         if (documentView == null) {
@@ -1231,6 +1266,7 @@
         return preferredWidth;
     }
 
+    @Override
     public int getPreferredHeight(int width) {
         int preferredHeight;
         if (documentView == null) {
@@ -1244,6 +1280,7 @@
         return preferredHeight;
     }
 
+    @Override
     public Dimensions getPreferredSize() {
         int preferredWidth;
         int preferredHeight;
@@ -1266,6 +1303,7 @@
         return false;
     }
 
+    @Override
     public void layout() {
         if (documentView != null) {
             documentView.abortValidateCallback();
@@ -1277,6 +1315,7 @@
         }
     }
 
+    @Override
     public void paint(Graphics2D graphics) {
         if (documentView != null) {
             TextArea textArea = (TextArea)getComponent();
@@ -1293,11 +1332,13 @@
         }
     }
 
+    @Override
     public int getCharacterAt(int x, int y) {
         return (documentView == null) ?
             -1 : documentView.getCharacterAt(x - margin.left, y - margin.top);
     }
 
+    @Override
     public Bounds getCharacterBounds(int offset) {
         return (documentView == null) ? null : documentView.getCharacterBounds(offset);
     }
@@ -1583,6 +1624,7 @@
     }
 
     // Text area events
+    @Override
     public void documentChanged(TextArea textArea, Document previousDocument) {
         if (documentView != null) {
             documentView.detach();
@@ -1598,15 +1640,18 @@
         invalidateComponent();
     }
 
+    @Override
     public void editableChanged(TextArea textArea) {
         // No-op
     }
 
+    @Override
     public void textKeyChanged(TextArea textArea, String previousTextKey) {
         // No-op
     }
 
     // Text area selection events
+    @Override
     public void selectionChanged(TextArea textArea, int previousSelectionStart,
         int previousSelectionLength) {
         if (textArea.getDocument() != null) {

Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java?rev=809649&r1=809648&r2=809649&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/WindowSkin.java Mon Aug 31 16:21:45 2009
@@ -40,6 +40,7 @@
      * ensures that focus does not traverse out of the window.
      */
     public static class WindowFocusTraversalPolicy implements FocusTraversalPolicy {
+        @Override
         public Component getNextComponent(Container container, Component component, Direction direction) {
             assert (container instanceof Window) : "container is not a Window";
 
@@ -83,6 +84,7 @@
         super.uninstall();
     }
 
+    @Override
     public int getPreferredWidth(int height) {
         Window window = (Window)getComponent();
         Component content = window.getContent();
@@ -90,6 +92,7 @@
         return (content != null) ? content.getPreferredWidth(height) : 0;
     }
 
+    @Override
     public int getPreferredHeight(int width) {
         Window window = (Window)getComponent();
         Component content = window.getContent();
@@ -97,6 +100,7 @@
         return (content != null) ? content.getPreferredHeight(width) : 0;
     }
 
+    @Override
     public Dimensions getPreferredSize() {
         Window window = (Window)getComponent();
         Component content = window.getContent();
@@ -104,6 +108,7 @@
         return (content != null) ? content.getPreferredSize() : new Dimensions(0, 0);
     }
 
+    @Override
     public void layout() {
         Window window = (Window)getComponent();
         Component content = window.getContent();
@@ -114,54 +119,67 @@
     }
 
     // Window events
+    @Override
     public void titleChanged(Window window, String previousTitle) {
         // No-op
     }
 
+    @Override
     public void iconChanged(Window window, Image previousIcon) {
         // No-op
     }
 
+    @Override
     public void contentChanged(Window window, Component previousContent) {
         invalidateComponent();
     }
 
+    @Override
     public void ownerChanged(Window window, Window previousOwner) {
         // No-op
     }
 
+    @Override
     public void activeChanged(Window window, Window obverseWindow) {
         // No-op
     }
 
+    @Override
     public void maximizedChanged(Window window) {
         // No-op
     }
 
+    @Override
     public void windowMoved(Window window, int from, int to) {
         // No-op
     }
 
     // Window state events
+    @Override
     public Vote previewWindowOpen(Window window, Display display) {
         return Vote.APPROVE;
     }
 
+    @Override
     public void windowOpenVetoed(Window window, Vote reason) {
         // No-op
     }
 
+    @Override
     public void windowOpened(Window window) {
     }
 
+    @Override
     public Vote previewWindowClose(Window window) {
         return Vote.APPROVE;
     }
 
+    @Override
     public void windowCloseVetoed(Window window, Vote reason) {
         // No-op
     }
 
+    @Override
     public void windowClosed(Window window, Display display) {
     }
 }