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/09/03 11:55:14 UTC
svn commit: r810856 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/
Author: smartini
Date: Thu Sep 3 09:55:13 2009
New Revision: 810856
URL: http://svn.apache.org/viewvc?rev=810856&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/terra/TerraMenuBarItemSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java Thu Sep 3 09:55:13 2009
@@ -40,6 +40,7 @@
menuBarItem.setCursor(Cursor.DEFAULT);
}
+ @Override
public int getPreferredWidth(int height) {
MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
@@ -49,6 +50,7 @@
return dataRenderer.getPreferredWidth(height);
}
+ @Override
public int getPreferredHeight(int width) {
MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
@@ -58,6 +60,7 @@
return dataRenderer.getPreferredHeight(width);
}
+ @Override
public Dimensions getPreferredSize() {
MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
@@ -67,10 +70,12 @@
return dataRenderer.getPreferredSize();
}
+ @Override
public void layout() {
// No-op
}
+ @Override
public void paint(Graphics2D graphics) {
MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarSkin.java Thu Sep 3 09:55:13 2009
@@ -50,6 +50,7 @@
spacing = 2;
}
+ @Override
public void install(Component component) {
super.install(component);
@@ -57,6 +58,7 @@
menuBar.getMenuBarListeners().add(this);
}
+ @Override
public void uninstall() {
MenuBar menuBar = (MenuBar)getComponent();
menuBar.getMenuBarListeners().remove(this);
@@ -64,6 +66,7 @@
super.uninstall();
}
+ @Override
public int getPreferredWidth(int height) {
int preferredWidth = 0;
@@ -86,6 +89,7 @@
return preferredWidth;
}
+ @Override
public int getPreferredHeight(int width) {
int preferredHeight = 0;
@@ -102,6 +106,7 @@
return preferredHeight;
}
+ @Override
public Dimensions getPreferredSize() {
int preferredWidth = 0;
int preferredHeight = 0;
@@ -125,6 +130,7 @@
return new Dimensions(preferredWidth, preferredHeight);
}
+ @Override
public void layout() {
MenuBar menuBar = (MenuBar)getComponent();
@@ -284,10 +290,12 @@
invalidateComponent();
}
+ @Override
public void itemInserted(MenuBar menuBar, int index) {
invalidateComponent();
}
+ @Override
public void itemsRemoved(MenuBar menuBar, int index, Sequence<MenuBar.Item> removed) {
invalidateComponent();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Thu Sep 3 09:55:13 2009
@@ -63,6 +63,7 @@
private Color disabledBevelColor;
private WindowStateListener menuPopupWindowStateListener = new WindowStateListener.Adapter() {
+ @Override
public void windowClosed(Window window, Display display) {
if (toolbar) {
repaintComponent();
@@ -97,6 +98,7 @@
menuPopup.getWindowStateListeners().add(menuPopupWindowStateListener);
}
+ @Override
public int getPreferredWidth(int height) {
MenuButton menuButton = (MenuButton)getComponent();
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
@@ -109,6 +111,7 @@
return preferredWidth;
}
+ @Override
public int getPreferredHeight(int width) {
MenuButton menuButton = (MenuButton)getComponent();
Button.DataRenderer dataRenderer = menuButton.getDataRenderer();
@@ -121,15 +124,18 @@
return preferredHeight;
}
+ @Override
public Dimensions getPreferredSize() {
// TODO Optimize by performing calcuations locally
return new Dimensions(getPreferredWidth(-1), getPreferredHeight(-1));
}
+ @Override
public void layout() {
// No-op
}
+ @Override
public void paint(Graphics2D graphics) {
MenuButton menuButton = (MenuButton)getComponent();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuItemSkin.java Thu Sep 3 09:55:13 2009
@@ -40,14 +40,17 @@
public static final int SIZE = 14;
public static final int CHECKMARK_SIZE = 10;
+ @Override
public int getWidth() {
return SIZE;
}
+ @Override
public int getHeight() {
return SIZE;
}
+ @Override
public void paint(Graphics2D graphics) {
Menu.Item menuItem = (Menu.Item)getComponent();
Menu menu = menuItem.getSection().getMenu();
@@ -85,6 +88,7 @@
menuItem.setCursor(Cursor.DEFAULT);
}
+ @Override
public int getPreferredWidth(int height) {
Menu.Item menuItem = (Menu.Item)getComponent();
@@ -94,6 +98,7 @@
return dataRenderer.getPreferredWidth(height) + EXPANDER_SIZE;
}
+ @Override
public int getPreferredHeight(int width) {
Menu.Item menuItem = (Menu.Item)getComponent();
@@ -103,6 +108,7 @@
return Math.max(dataRenderer.getPreferredHeight(width), EXPANDER_SIZE);
}
+ @Override
public Dimensions getPreferredSize() {
Menu.Item menuItem = (Menu.Item)getComponent();
@@ -115,10 +121,12 @@
Math.max(preferredSize.height, EXPANDER_SIZE));
}
+ @Override
public void layout() {
// No-op
}
+ @Override
public void paint(Graphics2D graphics) {
Menu.Item menuItem = (Menu.Item)getComponent();
Menu menu = menuItem.getSection().getMenu();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Thu Sep 3 09:55:13 2009
@@ -51,6 +51,7 @@
private Transition closeTransition = null;
private ContainerMouseListener displayMouseListener = new ContainerMouseListener.Adapter() {
+ @Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
MenuPopup menuPopup = (MenuPopup)getComponent();
@@ -72,6 +73,7 @@
return false;
}
+ @Override
public boolean mouseWheel(Container container, Mouse.ScrollType scrollType,
int scrollAmount, int wheelRotation, int x, int y) {
boolean consumed = false;
@@ -91,6 +93,7 @@
};
private MenuItemSelectionListener menuItemPressListener = new MenuItemSelectionListener() {
+ @Override
public void itemSelected(Menu.Item item) {
MenuPopup menuPopup = (MenuPopup)getComponent();
menuPopup.close();
@@ -230,6 +233,7 @@
dropShadowDecorator);
closeTransition.start(new TransitionListener() {
+ @Override
public void transitionCompleted(Transition transition) {
menuPopup.close();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Thu Sep 3 09:55:13 2009
@@ -68,6 +68,7 @@
showKeyboardShortcuts = true;
}
+ @Override
public void install(Component component) {
super.install(component);
@@ -81,6 +82,7 @@
menu.setFocusTraversalPolicy(new IndexFocusTraversalPolicy(true));
}
+ @Override
public void uninstall() {
Menu menu = (Menu)getComponent();
menu.getMenuListeners().remove(this);
@@ -97,6 +99,7 @@
return true;
}
+ @Override
public int getPreferredWidth(int height) {
int preferredWidth = 0;
@@ -117,6 +120,7 @@
return preferredWidth;
}
+ @Override
public int getPreferredHeight(int width) {
int preferredHeight = 0;
@@ -140,6 +144,7 @@
return preferredHeight;
}
+ @Override
public Dimensions getPreferredSize() {
int preferredWidth = 0;
int preferredHeight = 0;
@@ -166,6 +171,7 @@
return new Dimensions(preferredWidth, preferredHeight);
}
+ @Override
public void layout() {
Menu menu = (Menu)getComponent();
Menu.SectionSequence sections = menu.getSections();
@@ -192,6 +198,7 @@
}
}
+ @Override
public void paint(Graphics2D graphics) {
super.paint(graphics);
@@ -401,6 +408,7 @@
return consumed;
}
+ @Override
public void sectionInserted(Menu menu, int index) {
Menu.Section section = menu.getSections().get(index);
section.getSectionListeners().add(this);
@@ -408,6 +416,7 @@
invalidateComponent();
}
+ @Override
public void sectionsRemoved(Menu menu, int index, Sequence<Menu.Section> removed) {
for (int i = 0, n = removed.getLength(); i < n; i++) {
Menu.Section section = removed.get(i);
@@ -417,14 +426,17 @@
invalidateComponent();
}
+ @Override
public void itemInserted(Menu.Section section, int index) {
invalidateComponent();
}
+ @Override
public void itemsRemoved(Menu.Section section, int index, Sequence<Menu.Item> removed) {
invalidateComponent();
}
+ @Override
public void nameChanged(Menu.Section section, String previousName) {
// No-op
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMeterSkin.java Thu Sep 3 09:55:13 2009
@@ -71,27 +71,32 @@
return false;
}
+ @Override
public int getPreferredWidth(int height) {
// Meter has no content, so its preferred width is hard coded in the
// class and is not affected by the height constraint.
return DEFAULT_WIDTH;
}
+ @Override
public int getPreferredHeight(int width) {
// Meter has no content, so its preferred height is hard coded in the
// class and is not affected by the width constraint.
return DEFAULT_HEIGHT;
}
+ @Override
public Dimensions getPreferredSize() {
// Meter has no content, so its preferred size is hard coded in the class.
return new Dimensions(DEFAULT_WIDTH, DEFAULT_HEIGHT);
}
+ @Override
public void layout() {
// No-op
}
+ @Override
public void paint(Graphics2D graphics) {
Meter meter = (Meter)getComponent();
@@ -178,6 +183,7 @@
* @param previousPercentage
* The previous percentage value.
*/
+ @Override
public void percentageChanged(Meter meter, double previousPercentage) {
repaintComponent();
}
@@ -191,6 +197,7 @@
* @param previousText
* The previous text value.
*/
+ @Override
public void textChanged(Meter meter, String previousText) {
invalidateComponent();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Thu Sep 3 09:55:13 2009
@@ -60,14 +60,17 @@
* Close button image.
*/
protected class CloseImage extends Image {
+ @Override
public int getWidth() {
return 6;
}
+ @Override
public int getHeight() {
return 6;
}
+ @Override
public void paint(Graphics2D graphics) {
graphics.setPaint(titleBarColor);
graphics.setStroke(new BasicStroke(2));
@@ -96,6 +99,7 @@
private Insets padding = new Insets(4);
private WindowListener ownerListener = new WindowListener.Adapter() {
+ @Override
public void activeChanged(Window owner, Window obverseWindow) {
Window window = (Window)getComponent();
window.setVisible(owner.isActive());
@@ -161,6 +165,7 @@
});
closeButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
Palette palette = (Palette)getComponent();
palette.close();
@@ -195,6 +200,7 @@
super.uninstall();
}
+ @Override
public int getPreferredWidth(int height) {
int preferredWidth = 0;
@@ -219,6 +225,7 @@
return preferredWidth;
}
+ @Override
public int getPreferredHeight(int width) {
int preferredHeight = 0;
@@ -244,6 +251,7 @@
return preferredHeight;
}
+ @Override
public Dimensions getPreferredSize() {
int preferredWidth = 0;
int preferredHeight = 0;
@@ -269,6 +277,7 @@
return new Dimensions(preferredWidth, preferredHeight);
}
+ @Override
public void layout() {
Palette palette = (Palette)getComponent();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java Thu Sep 3 09:55:13 2009
@@ -47,14 +47,17 @@
* Abstract base class for button images.
*/
protected abstract class ScrollButtonImage extends Image {
+ @Override
public int getWidth() {
return BUTTON_SIZE;
}
+ @Override
public int getHeight() {
return BUTTON_SIZE;
}
+ @Override
public void paint(Graphics2D graphics) {
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
@@ -68,6 +71,7 @@
* North button image.
*/
protected class NorthButtonImage extends ScrollButtonImage {
+ @Override
public void paint(Graphics2D graphics) {
super.paint(graphics);
@@ -82,6 +86,7 @@
* South button image.
*/
protected class SouthButtonImage extends ScrollButtonImage {
+ @Override
public void paint(Graphics2D graphics) {
super.paint(graphics);
@@ -96,6 +101,7 @@
* East button image.
*/
protected class EastButtonImage extends ScrollButtonImage {
+ @Override
public void paint(Graphics2D graphics) {
super.paint(graphics);
@@ -110,6 +116,7 @@
* West button image.
*/
protected class WestButtonImage extends ScrollButtonImage {
+ @Override
public void paint(Graphics2D graphics) {
super.paint(graphics);
@@ -135,18 +142,22 @@
}
public class ScrollButtonSkin extends ButtonSkin {
+ @Override
public int getPreferredWidth(int height) {
return BUTTON_SIZE + buttonPadding;
}
+ @Override
public int getPreferredHeight(int width) {
return BUTTON_SIZE + buttonPadding;
}
+ @Override
public Dimensions getPreferredSize() {
return new Dimensions(getPreferredWidth(-1), getPreferredHeight(-1));
}
+ @Override
public void paint(Graphics2D graphics) {
ScrollButton scrollButton = (ScrollButton)getComponent();
int width = getWidth();
@@ -176,6 +187,7 @@
}
private class ScrollCallback implements Runnable {
+ @Override
public void run() {
Panorama panorama = (Panorama)getComponent();
@@ -248,6 +260,7 @@
}
private ComponentMouseListener buttonMouseListener = new ComponentMouseListener.Adapter() {
+ @Override
public void mouseOver(Component component) {
// Start scroll timer
scrollDistance = INITIAL_SCROLL_DISTANCE;
@@ -255,6 +268,7 @@
ApplicationContext.scheduleRecurringCallback(scrollCallback, SCROLL_RATE);
}
+ @Override
public void mouseOut(Component component) {
// Stop scroll timer
if (scheduledScrollCallback != null) {
@@ -356,6 +370,7 @@
return preferredSize;
}
+ @Override
public void layout() {
Panorama panorama = (Panorama)getComponent();
int width = getWidth();
@@ -404,6 +419,7 @@
updateScrollButtonVisibility();
}
+ @Override
public Bounds getViewportBounds() {
int x = 0;
int y = 0;
@@ -621,6 +637,7 @@
}
// Viewport events
+ @Override
public void scrollTopChanged(Viewport panorama, int previousScrollTop) {
Component view = panorama.getView();
if (view != null) {
@@ -631,6 +648,7 @@
}
}
+ @Override
public void scrollLeftChanged(Viewport panorama, int previousScrollLeft) {
Component view = panorama.getView();
if (view != null) {
@@ -641,6 +659,7 @@
}
}
+ @Override
public void viewChanged(Viewport panorama, Component previousView) {
invalidateComponent();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Thu Sep 3 09:55:13 2009
@@ -97,6 +97,7 @@
optionButton.getStyles().put("minimumAspectRatio", 3);
optionButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
int optionIndex = optionButtons.indexOf(button);
@@ -137,6 +138,7 @@
}
}
+ @Override
public void selectedOptionChanged(Prompt prompt, int previousSelectedOption) {
int index = prompt.getSelectedOption();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=810856&r1=810855&r2=810856&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Thu Sep 3 09:55:13 2009
@@ -77,6 +77,7 @@
disabledBevelColor = disabledBackgroundColor;
}
+ @Override
public int getPreferredWidth(int height) {
int preferredWidth = 0;
@@ -107,6 +108,7 @@
return preferredWidth;
}
+ @Override
public int getPreferredHeight(int width) {
int preferredHeight = 0;
@@ -137,6 +139,7 @@
return preferredHeight;
}
+ @Override
public Dimensions getPreferredSize() {
PushButton pushButton = (PushButton)getComponent();
Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
@@ -167,6 +170,7 @@
return new Dimensions(preferredWidth, preferredHeight);
}
+ @Override
public void paint(Graphics2D graphics) {
PushButton pushButton = (PushButton)getComponent();