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 2013/02/21 18:38:52 UTC
svn commit: r1448740 - in
/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk: media/ skin/
Author: smartini
Date: Thu Feb 21 17:38:52 2013
New Revision: 1448740
URL: http://svn.apache.org/r1448740
Log:
fix many eclipse (4.2.x) warnings, enforcing best practice coding
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Picture.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinBulletedListView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinListItemView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNumberedListView.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinVerticalElementView.java
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Picture.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Picture.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Picture.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/media/Picture.java Thu Feb 21 17:38:52 2013
@@ -118,16 +118,17 @@ public class Picture extends Image {
interpolationHint = RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
break;
}
-
case BILINEAR: {
interpolationHint = RenderingHints.VALUE_INTERPOLATION_BILINEAR;
break;
}
-
case BICUBIC: {
interpolationHint = RenderingHints.VALUE_INTERPOLATION_BICUBIC;
break;
}
+ default: {
+ break;
+ }
}
bufferedImageGraphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, interpolationHint);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java Thu Feb 21 17:38:52 2013
@@ -188,6 +188,10 @@ public class BoxPaneSkin extends Contain
break;
}
+
+ default: {
+ break;
+ }
}
// Include padding
@@ -235,13 +239,16 @@ public class BoxPaneSkin extends Contain
componentBaseline += (contentHeight - size.height) / 2;
break;
}
-
case BOTTOM: {
componentBaseline += contentHeight - size.height;
break;
}
- case TOP:
+ case TOP: {
break;
+ }
+ default: {
+ break;
+ }
}
}
@@ -281,6 +288,10 @@ public class BoxPaneSkin extends Contain
break;
}
+
+ default: {
+ break;
+ }
}
if (baseline != -1) {
@@ -302,6 +313,10 @@ public class BoxPaneSkin extends Contain
baseline += height - (contentHeight + padding.bottom);
break;
}
+
+ default: {
+ break;
+ }
}
}
}
@@ -329,13 +344,16 @@ public class BoxPaneSkin extends Contain
x = (width - preferredWidth) / 2;
break;
}
-
case RIGHT: {
x = width - preferredWidth;
break;
}
- case LEFT:
+ case LEFT: {
break;
+ }
+ default: {
+ break;
+ }
}
x += padding.left;
@@ -375,6 +393,10 @@ public class BoxPaneSkin extends Contain
y = height - padding.bottom - componentHeight;
break;
}
+
+ default: {
+ break;
+ }
}
// Set the component's size and position
@@ -403,6 +425,10 @@ public class BoxPaneSkin extends Contain
}
case TOP:
break;
+
+ default: {
+ break;
+ }
}
y += padding.top;
@@ -432,16 +458,17 @@ public class BoxPaneSkin extends Contain
x = padding.left;
break;
}
-
case CENTER: {
x = (width - componentWidth) / 2;
break;
}
-
case RIGHT: {
x = width - padding.right - componentWidth;
break;
}
+ default: {
+ break;
+ }
}
// Set the component's size and position
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Thu Feb 21 17:38:52 2013
@@ -97,6 +97,10 @@ public abstract class CalendarButtonSkin
break;
}
+
+ default: {
+ break;
+ }
}
return false;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Thu Feb 21 17:38:52 2013
@@ -727,6 +727,10 @@ public class CardPaneSkin extends Contai
}
break;
}
+
+ default: {
+ break;
+ }
}
if (selectionChangeTransition != null) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java Thu Feb 21 17:38:52 2013
@@ -104,6 +104,10 @@ public abstract class ColorChooserButton
break;
}
+
+ default: {
+ break;
+ }
}
return false;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java Thu Feb 21 17:38:52 2013
@@ -113,6 +113,10 @@ public abstract class ContainerSkin exte
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FillPaneSkin.java Thu Feb 21 17:38:52 2013
@@ -183,6 +183,10 @@ public class FillPaneSkin extends Contai
break;
}
+
+ default: {
+ break;
+ }
}
// Include padding
@@ -235,6 +239,10 @@ public class FillPaneSkin extends Contai
break;
}
+
+ default: {
+ break;
+ }
}
if (baseline != -1) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java Thu Feb 21 17:38:52 2013
@@ -305,6 +305,9 @@ public class FlowPaneSkin extends Contai
x = width - rowWidth - padding.right;
break;
}
+ default: {
+ break;
+ }
}
for (Component component : row) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Thu Feb 21 17:38:52 2013
@@ -217,6 +217,10 @@ public class LabelSkin extends Component
baseline = Math.round(height - (textHeightLocal + padding.bottom) + ascent);
break;
}
+
+ default: {
+ break;
+ }
}
return baseline;
@@ -340,6 +344,10 @@ public class LabelSkin extends Component
y = (height - textHeight) / 2;
break;
}
+
+ default: {
+ break;
+ }
}
for (int i = 0, n = glyphVectors.getLength(); i < n; i++) {
@@ -354,16 +362,17 @@ public class LabelSkin extends Component
x = padding.left;
break;
}
-
case RIGHT: {
x = width - (lineWidth + padding.right);
break;
}
-
case CENTER: {
x = (width - lineWidth) / 2;
break;
}
+ default: {
+ break;
+ }
}
if (graphics instanceof PrintGraphics) {
@@ -388,11 +397,13 @@ public class LabelSkin extends Component
offset = y + ascent + 2;
break;
}
-
case STRIKETHROUGH: {
offset = y + lineHeight / 2 + 1;
break;
}
+ default: {
+ break;
+ }
}
Line2D line = new Line2D.Float(x, offset, x + lineWidth, offset);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Thu Feb 21 17:38:52 2013
@@ -107,6 +107,10 @@ public abstract class ListButtonSkin ext
listViewPopup.close();
break;
}
+
+ default: {
+ break;
+ }
}
return false;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkin.java Thu Feb 21 17:38:52 2013
@@ -103,6 +103,10 @@ public class TextAreaSkin extends Compon
break;
}
+
+ default: {
+ break;
+ }
}
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinBulletedListView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinBulletedListView.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinBulletedListView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinBulletedListView.java Thu Feb 21 17:38:52 2013
@@ -55,6 +55,8 @@ class TextPaneSkinBulletedListView exten
case CIRCLE_OUTLINE:
listItemView.setIndexText("\u25e6 ");
break;
+ default:
+ break;
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinListItemView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinListItemView.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinListItemView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinListItemView.java Thu Feb 21 17:38:52 2013
@@ -49,9 +49,10 @@ class TextPaneSkinListItemView extends T
@Override
protected void childLayout(int breakWidth) {
- indexTextNodeView.layout(breakWidth);
+ int bw = breakWidth;
+ indexTextNodeView.layout(bw);
- breakWidth -= indexTextNodeView.getWidth();
+ bw -= indexTextNodeView.getWidth();
int itemsWidth = 0;
int itemsY = 0;
@@ -61,7 +62,7 @@ class TextPaneSkinListItemView extends T
for ( ; iterator.hasNext(); ) {
TextPaneSkinNodeView nodeView = iterator.next();
- nodeView.layout(breakWidth);
+ nodeView.layout(bw);
nodeView.setLocation(indexTextNodeView.getWidth(), itemsY);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNumberedListView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNumberedListView.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNumberedListView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinNumberedListView.java Thu Feb 21 17:38:52 2013
@@ -112,6 +112,8 @@ class TextPaneSkinNumberedListView exten
case UPPER_ROMAN:
listItemView.setIndexText(int2roman(index) + ". ");
break;
+ default:
+ break;
}
index++;
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinVerticalElementView.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinVerticalElementView.java?rev=1448740&r1=1448739&r2=1448740&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinVerticalElementView.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/skin/TextPaneSkinVerticalElementView.java Thu Feb 21 17:38:52 2013
@@ -150,7 +150,7 @@ abstract class TextPaneSkinVerticalEleme
}
}
- if (offset != -1) {
+ if (offset != -1 && nodeView != null) {
offset += nodeView.getOffset();
}
}