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:35:49 UTC
svn commit: r1448738 - in /pivot/branches/2.0.x:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/validation/
Author: smartini
Date: Thu Feb 21 17:35:48 2013
New Revision: 1448738
URL: http://svn.apache.org/r1448738
Log:
fix many eclipse (4.2.x) warnings, enforcing best practice coding
Modified:
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Thu Feb 21 17:35:48 2013
@@ -853,6 +853,10 @@ public class TerraAccordionSkin extends
selectedIndex = 8;
break;
}
+
+ default: {
+ break;
+ }
}
if (selectedIndex >= 0
@@ -883,6 +887,10 @@ public class TerraAccordionSkin extends
break;
}
+
+ default: {
+ break;
+ }
}
if (selectedIndex >= 0
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Thu Feb 21 17:35:48 2013
@@ -309,6 +309,10 @@ public class TerraCalendarSkin extends C
nextButton.requestFocus();
break;
}
+
+ default: {
+ break;
+ }
}
consumed = true;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Thu Feb 21 17:35:48 2013
@@ -154,6 +154,10 @@ public class TerraFormSkin extends Conta
messageBackgroundColor = infoMessageBackgroundColor;
break;
}
+
+ default: {
+ break;
+ }
}
// Draw the label
@@ -283,6 +287,10 @@ public class TerraFormSkin extends Conta
backgroundColor = infoMessageBackgroundColor;
break;
}
+
+ default: {
+ break;
+ }
}
flagMessageLabel.getStyles().put("color", color);
@@ -894,6 +902,10 @@ public class TerraFormSkin extends Conta
highlightColor = infoHighlightColor;
break;
}
+
+ default: {
+ break;
+ }
}
Bounds fieldBounds = field.getBounds();
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Thu Feb 21 17:35:48 2013
@@ -1084,6 +1084,10 @@ public class TerraListViewSkin extends C
break;
}
+
+ default: {
+ break;
+ }
}
// Clear the highlight
@@ -1124,6 +1128,10 @@ public class TerraListViewSkin extends C
break;
}
+
+ default: {
+ break;
+ }
}
return consumed;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java Thu Feb 21 17:35:48 2013
@@ -518,12 +518,17 @@ public class TerraSplitPaneSkin extends
switch (splitPane.getOrientation()) {
case HORIZONTAL: {
switch (splitPane.getPrimaryRegion()) {
- case TOP_LEFT:
+ case TOP_LEFT: {
cursor = Cursor.RESIZE_EAST;
break;
- case BOTTOM_RIGHT:
+ }
+ case BOTTOM_RIGHT: {
cursor = Cursor.RESIZE_WEST;
break;
+ }
+ default: {
+ break;
+ }
}
break;
@@ -531,16 +536,25 @@ public class TerraSplitPaneSkin extends
case VERTICAL: {
switch (splitPane.getPrimaryRegion()) {
- case TOP_LEFT:
+ case TOP_LEFT: {
cursor = Cursor.RESIZE_SOUTH;
break;
- case BOTTOM_RIGHT:
+ }
+ case BOTTOM_RIGHT: {
cursor = Cursor.RESIZE_NORTH;
break;
+ }
+ default: {
+ break;
+ }
}
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Thu Feb 21 17:35:48 2013
@@ -171,6 +171,10 @@ public class TerraSuggestionPopupSkin ex
break;
}
+
+ default: {
+ break;
+ }
}
return false;
@@ -312,6 +316,10 @@ public class TerraSuggestionPopupSkin ex
suggestionPopup.close(false);
break;
}
+
+ default: {
+ break;
+ }
}
return false;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Thu Feb 21 17:35:48 2013
@@ -1372,11 +1372,13 @@ public class TerraTabPaneSkin extends Co
tabButtonBoxPane.getStyles().put("horizontalAlignment", HorizontalAlignment.LEFT);
break;
}
-
case VERTICAL: {
tabButtonBoxPane.getStyles().put("verticalAlignment", VerticalAlignment.TOP);
break;
}
+ default: {
+ break;
+ }
}
}
@@ -1471,6 +1473,10 @@ public class TerraTabPaneSkin extends Co
selectedIndex = 8;
break;
}
+
+ default: {
+ break;
+ }
}
if (selectedIndex >= 0
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Thu Feb 21 17:35:48 2013
@@ -88,6 +88,10 @@ public class TerraTableViewHeaderSkin ex
shape.lineTo(6, 0);
break;
}
+
+ default: {
+ break;
+ }
}
shape.closePath();
@@ -321,6 +325,10 @@ public class TerraTableViewHeaderSkin ex
sortImage = sortDescendingImage;
break;
}
+
+ default: {
+ break;
+ }
}
}
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Thu Feb 21 17:35:48 2013
@@ -1398,6 +1398,10 @@ public class TerraTableViewSkin extends
break;
}
+
+ default: {
+ break;
+ }
}
// Clear the highlight
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Thu Feb 21 17:35:48 2013
@@ -293,6 +293,9 @@ public class TerraTextInputSkin extends
alignmentDeltaX = (int)(availWidth - txtWidth);
break;
}
+ default: {
+ break;
+ }
}
return alignmentDeltaX;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Thu Feb 21 17:35:48 2013
@@ -360,6 +360,8 @@ public class TerraTreeViewSkin extends C
break;
case UNCHECKED:
break;
+ default:
+ break;
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/ComparableValidator.java Thu Feb 21 17:35:48 2013
@@ -50,7 +50,7 @@ public class ComparableValidator<T exten
}
protected final Comparable<?> textToComparable(String text) {
- return (Comparable<?>) textToBigDecimal(text);
+ return textToBigDecimal(text);
}
}
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java Thu Feb 21 17:35:48 2013
@@ -42,11 +42,12 @@ public class DecimalValidator extends Fo
}
/** helper method that wraps the ParseException in a RuntimeException. */
- protected final Number parseNumber(String text) {
+ protected final Number parseNumber(final String text) {
+ String textToParse;
try {
// We have to upper case because of the exponent symbol
- text = text.toUpperCase(locale);
- return format.parse(text);
+ textToParse = text.toUpperCase(locale);
+ return format.parse(textToParse);
} catch (ParseException ex) {
// this should never happen
throw new RuntimeException(ex);
@@ -56,7 +57,7 @@ public class DecimalValidator extends Fo
/** helper method that returns the widest number real instance,
* and extract later values depending on the precision needed.
*/
- protected final BigDecimal textToBigDecimal(String text) {
+ protected final BigDecimal textToBigDecimal(final String text) {
BigDecimal bd;
try {
if (!autoTrim) {
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java?rev=1448738&r1=1448737&r2=1448738&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java Thu Feb 21 17:35:48 2013
@@ -49,13 +49,14 @@ public class FormattedValidator<F extend
}
@Override
- public boolean isValid(String text) {
+ public boolean isValid(final String text) {
+ String textToParse = text;
final ParsePosition pos = new ParsePosition(0);
if (format instanceof NumberFormat) {
// We have to upper case because of the exponent symbol
- text = text.toUpperCase(locale);
+ textToParse = textToParse.toUpperCase(locale);
}
- Object obj = format.parseObject(text, pos);
+ Object obj = format.parseObject(textToParse, pos);
// The text is only valid if we successfully parsed ALL of it. Don't want trailing bits of
// not-valid text.