Author: noelgrandin
Date: Tue Oct 25 07:20:54 2011
New Revision: 1188544
URL: http://svn.apache.org/viewvc?rev=1188544&view=rev
Log:
remove unnecessary semi-colons
add comment to work-around in LabelSkin
remove unused field in TaskSequence
Modified:
pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
Modified: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java?rev=1188544&r1=1188543&r2=1188544&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Tue Oct 25
07:20:54 2011
@@ -226,7 +226,7 @@ public class BXMLSerializer implements S
return value;
}
- };
+ }
private XMLInputFactory xmlInputFactory;
private ScriptEngineManager scriptEngineManager;
Modified:
pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java?rev=1188544&r1=1188543&r2=1188544&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java
(original)
+++ pivot/trunk/core/src/org/apache/pivot/util/concurrent/TaskSequence.java Tue
Oct 25 07:20:54 2011
@@ -31,7 +31,6 @@ import org.apache.pivot.util.ImmutableIt
public class TaskSequence extends Task<Void>
implements Sequence<Task<?>>, Iterable<Task<?>> {
private ArrayList<Task<?>> tasks = new ArrayList<Task<?>>();
- private int complete = 0;
public TaskSequence() {
this(DEFAULT_EXECUTOR_SERVICE);
@@ -48,7 +47,6 @@ public class TaskSequence extends Task<V
@Override
public void taskExecuted(Task<Object> task) {
synchronized (TaskSequence.this) {
- complete++;
TaskSequence.this.notify();
}
}
@@ -56,13 +54,11 @@ public class TaskSequence extends Task<V
@Override
public void executeFailed(Task<Object> task) {
synchronized (TaskSequence.this) {
- complete++;
TaskSequence.this.notify();
}
}
};
- complete = 0;
for (Task<?> task : tasks) {
if (abort) {
throw new AbortException();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java?rev=1188544&r1=1188543&r2=1188544&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButtonGroup.java Tue Oct 25
07:20:54 2011
@@ -94,7 +94,7 @@ public class RadioButtonGroup extends Bu
}
return include;
}
- };
+ }
/**
* ComponentKeyListener to be applied to all buttons as they are added to
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=1188544&r1=1188543&r2=1188544&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Tue Oct 25
07:20:54 2011
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Font;
-import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.PrintGraphics;
import java.awt.Transparency;
@@ -345,15 +344,16 @@ public class LabelSkin extends Component
}
}
- if (!((Graphics) graphics instanceof PrintGraphics)) {
- graphics.drawGlyphVector(glyphVector, x, y + ascent);
+ if (graphics instanceof PrintGraphics) {
+ /* Work-around for printing problem in applets */
+ Label label = (Label)getComponent();
+ String text = label.getText();
+ if (text != null && text.length() > 0) {
+ graphics.drawString(text, x, y + ascent);
+ }
}
else {
- Label label = (Label)getComponent();
- String text = label.getText();
- if (text != null && text.length() > 0) {
- graphics.drawString(text, x, y + ascent);
- }
+ graphics.drawGlyphVector(glyphVector, x, y + ascent);
}
// Draw the text decoration
