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/01 12:40:19 UTC
svn commit: r809961 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/
Author: smartini
Date: Tue Sep 1 10:40:18 2009
New Revision: 809961
URL: http://svn.apache.org/viewvc?rev=809961&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/effects/BlurDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TranslationDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/BlurDecorator.java Tue Sep 1 10:40:18 2009
@@ -72,6 +72,7 @@
this.blurMagnitude = blurMagnitude;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
this.graphics = graphics;
@@ -90,6 +91,7 @@
return bufferedImageGraphics;
}
+ @Override
public void update() {
bufferedImageGraphics.dispose();
bufferedImage.flush();
@@ -106,10 +108,12 @@
this.graphics.drawImage(bufferedImage, 0, 0, null);
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ClipDecorator.java Tue Sep 1 10:40:18 2009
@@ -64,19 +64,23 @@
this.height = height;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
graphics.clipRect(x, y, width, height);
return graphics;
}
+ @Override
public void update() {
// No-op
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(x, y, width, height);
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/DropShadowDecorator.java Tue Sep 1 10:40:18 2009
@@ -165,6 +165,7 @@
this.yOffset = yOffset;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
int width = component.getWidth();
int height = component.getHeight();
@@ -192,16 +193,19 @@
return graphics;
}
+ @Override
public void update() {
// No-op
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(xOffset - blurRadius, yOffset - blurRadius,
component.getWidth() + blurRadius * 2,
component.getHeight() + blurRadius * 2);
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/FadeDecorator.java Tue Sep 1 10:40:18 2009
@@ -51,19 +51,23 @@
this.opacity = opacity;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opacity));
return graphics;
}
+ @Override
public void update() {
// No-op
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/GrayscaleDecorator.java Tue Sep 1 10:40:18 2009
@@ -33,6 +33,7 @@
private BufferedImage bufferedImage = null;
private Graphics2D bufferedImageGraphics = null;
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
this.graphics = graphics;
@@ -51,6 +52,7 @@
return bufferedImageGraphics;
}
+ @Override
public void update() {
bufferedImageGraphics.dispose();
bufferedImage.flush();
@@ -58,10 +60,12 @@
graphics.drawImage(bufferedImage, 0, 0, null);
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java Tue Sep 1 10:40:18 2009
@@ -39,6 +39,7 @@
private BufferedImage componentImage = null;
private Graphics2D componentImageGraphics = null;
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
this.graphics = graphics;
this.component = component;
@@ -58,6 +59,7 @@
return componentImageGraphics;
}
+ @Override
public void update() {
// Draw the component
graphics.drawImage(componentImage, 0, 0, null);
@@ -81,10 +83,12 @@
graphics.drawImage(componentImage, 0, 0, null);
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight() * 2);
}
+ @Override
public AffineTransform getTransform(Component component) {
AffineTransform transform = AffineTransform.getScaleInstance(1.0, -1.0);
transform.translate(0, -(component.getHeight() * 2));
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/SaturationDecorator.java Tue Sep 1 10:40:18 2009
@@ -64,6 +64,7 @@
setMultiplier(multiplier.floatValue());
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
int x = 0;
int y = 0;
@@ -93,6 +94,7 @@
* Adjusts the saturation of the component image and draws the resulting
* image using the component's graphics.
*/
+ @Override
public void update() {
int width = componentImage.getWidth();
int height = componentImage.getHeight();
@@ -136,10 +138,12 @@
graphics.drawImage(componentImage, x, y, null);
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java Tue Sep 1 10:40:18 2009
@@ -340,6 +340,7 @@
return ty;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
@@ -358,6 +359,7 @@
return graphics;
}
+ @Override
public void update() {
// No-op
}
@@ -378,6 +380,7 @@
}
}
+ @Override
public Bounds getBounds(Component component) {
int width = (int)Math.ceil(component.getWidth() * scaleX);
int height = (int)Math.ceil(component.getHeight() * scaleY);
@@ -388,6 +391,7 @@
return new Bounds(tx, ty, width, height);
}
+ @Override
public AffineTransform getTransform(Component component) {
return AffineTransform.getScaleInstance(scaleX, scaleY);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ShadeDecorator.java Tue Sep 1 10:40:18 2009
@@ -105,6 +105,7 @@
setColor(Color.decode(color));
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
this.graphics = graphics;
this.component = component;
@@ -112,16 +113,19 @@
return graphics;
}
+ @Override
public void update() {
graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opacity));
graphics.setColor(color);
graphics.fillRect(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java Tue Sep 1 10:40:18 2009
@@ -129,6 +129,7 @@
this.yOffset = yOffset;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
if (tag != null) {
bounds = getBounds(component);
@@ -138,6 +139,7 @@
return graphics;
}
+ @Override
public void update() {
if (tag != null) {
graphics.translate(bounds.x, bounds.y);
@@ -145,6 +147,7 @@
}
}
+ @Override
public Bounds getBounds(Component component) {
Bounds bounds;
@@ -201,6 +204,7 @@
return bounds;
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java Tue Sep 1 10:40:18 2009
@@ -36,6 +36,7 @@
private ApplicationContext.ScheduledCallback transitionCallback = null;
private final Runnable updateCallback = new Runnable() {
+ @Override
public void run() {
currentTime = System.currentTimeMillis();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TranslationDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TranslationDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TranslationDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TranslationDecorator.java Tue Sep 1 10:40:18 2009
@@ -85,15 +85,18 @@
this.clip = clip;
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
graphics.translate(x, y);
return graphics;
}
+ @Override
public void update() {
// No-op
}
+ @Override
public Bounds getBounds(Component component) {
int width = component.getWidth();
int height = component.getHeight();
@@ -107,6 +110,7 @@
return bounds;
}
+ @Override
public AffineTransform getTransform(Component component) {
return AffineTransform.getTranslateInstance(x, y);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java?rev=809961&r1=809960&r2=809961&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/WatermarkDecorator.java Tue Sep 1 10:40:18 2009
@@ -264,6 +264,7 @@
boxPane.validate();
}
+ @Override
public Graphics2D prepare(Component component, Graphics2D graphics) {
this.component = component;
this.graphics = graphics;
@@ -271,6 +272,7 @@
return graphics;
}
+ @Override
public void update() {
int width = component.getWidth();
int height = component.getHeight();
@@ -310,10 +312,12 @@
watermarkGraphics.dispose();
}
+ @Override
public Bounds getBounds(Component component) {
return new Bounds(0, 0, component.getWidth(), component.getHeight());
}
+ @Override
public AffineTransform getTransform(Component component) {
return new AffineTransform();
}