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/25 12:29:10 UTC
svn commit: r1449662 -
/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/
Author: smartini
Date: Mon Feb 25 11:29:09 2013
New Revision: 1449662
URL: http://svn.apache.org/r1449662
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/TerraCalendarSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.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/TerraMenuSkin.java
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.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/TerraTabPaneSkin.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
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -44,6 +44,7 @@ import org.apache.pivot.wtk.GraphicsUtil
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Orientation;
@@ -51,7 +52,6 @@ import org.apache.pivot.wtk.Spinner;
import org.apache.pivot.wtk.SpinnerSelectionListener;
import org.apache.pivot.wtk.TablePane;
import org.apache.pivot.wtk.Theme;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.content.ButtonDataRenderer;
import org.apache.pivot.wtk.content.NumericSpinnerData;
import org.apache.pivot.wtk.content.SpinnerItemRenderer;
@@ -352,9 +352,9 @@ public class TerraCalendarSkin extends C
CalendarDate date = new CalendarDate(2000, (Integer)item, 0);
SimpleDateFormat monthFormat = new SimpleDateFormat("MMMM", calendar.getLocale());
- item = monthFormat.format(date.toCalendar().getTime());
+ Object itemFromFormat = monthFormat.format(date.toCalendar().getTime());
- super.render(item, spinner);
+ super.render(itemFromFormat, spinner);
}
}
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=1449662&r1=1449661&r2=1449662&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Mon Feb 25 11:29:09 2013
@@ -335,6 +335,10 @@ public class TerraFileBrowserSheetSkin e
}
break;
}
+
+ default: {
+ break;
+ }
}
updatingSelection = false;
@@ -379,6 +383,10 @@ public class TerraFileBrowserSheetSkin e
fileBrowser.setMultiSelect(false);
break;
}
+
+ default: {
+ break;
+ }
}
updateDisabledFileFilter();
@@ -456,6 +464,10 @@ public class TerraFileBrowserSheetSkin e
okButton.setEnabled(selectedDirectoryCount > 0);
break;
}
+
+ default: {
+ break;
+ }
}
}
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -1149,7 +1149,7 @@ public class TerraListViewSkin extends C
List<?> listData = listView.getListData();
ListView.ItemRenderer itemRenderer = listView.getItemRenderer();
- character = Character.toUpperCase(character);
+ char characterUpper = Character.toUpperCase(character);
for (int i = listView.getLastSelectedIndex() + 1, n = listData.getLength(); i < n; i++) {
if (!listView.isItemDisabled(i)) {
@@ -1159,7 +1159,7 @@ public class TerraListViewSkin extends C
&& string.length() > 0) {
char first = Character.toUpperCase(string.charAt(0));
- if (first == character) {
+ if (first == characterUpper) {
listView.setSelectedIndex(i);
consumed = true;
break;
@@ -1178,7 +1178,7 @@ public class TerraListViewSkin extends C
&& string.length() > 0) {
char first = Character.toUpperCase(string.charAt(0));
- if (first == character) {
+ if (first == characterUpper) {
listView.setSelectedIndex(i);
consumed = true;
break;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java?rev=1449662&r1=1449661&r2=1449662&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuSkin.java Mon Feb 25 11:29:09 2013
@@ -27,13 +27,13 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Keyboard;
+import org.apache.pivot.wtk.Keyboard.KeyCode;
import org.apache.pivot.wtk.Menu;
+import org.apache.pivot.wtk.Menu.Item;
+import org.apache.pivot.wtk.Menu.Section;
import org.apache.pivot.wtk.MenuListener;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtk.Keyboard.KeyCode;
-import org.apache.pivot.wtk.Menu.Item;
-import org.apache.pivot.wtk.Menu.Section;
import org.apache.pivot.wtk.skin.ContainerSkin;
/**
@@ -570,7 +570,7 @@ public class TerraMenuSkin extends Conta
itemIndex = section.indexOf(activeItem) + 1;
}
- character = Character.toUpperCase(character);
+ char characterUpper = Character.toUpperCase(character);
while (sectionIndex < sectionCount) {
Section section = sections.get(sectionIndex);
@@ -586,7 +586,7 @@ public class TerraMenuSkin extends Conta
&& string.length() > 0) {
char first = Character.toUpperCase(string.charAt(0));
- if (first == character) {
+ if (first == characterUpper) {
item.setActive(true);
consumed = true;
break;
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java?rev=1449662&r1=1449661&r2=1449662&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSpinnerSkin.java Mon Feb 25 11:29:09 2013
@@ -314,7 +314,7 @@ public class TerraSpinnerSkin extends Co
List<?> spinnerData = spinner.getSpinnerData();
Spinner.ItemRenderer itemRenderer = spinner.getItemRenderer();
- character = Character.toUpperCase(character);
+ char characterUpper = Character.toUpperCase(character);
for (int i = spinner.getSelectedIndex() + 1, n = spinnerData.getLength(); i < n; i++) {
String string = itemRenderer.toString(spinnerData.get(i));
@@ -323,7 +323,7 @@ public class TerraSpinnerSkin extends Co
&& string.length() > 0) {
char first = Character.toUpperCase(string.charAt(0));
- if (first == character) {
+ if (first == characterUpper) {
spinner.setSelectedIndex(i);
consumed = true;
break;
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -606,9 +606,9 @@ public class TerraSplitPaneSkin extends
}
if (splitLocation < lower) {
- splitLocation = lower;
+ return lower;
} else if (splitLocation > upper) {
- splitLocation = upper;
+ return upper;
}
return splitLocation;
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -191,6 +191,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
Dimensions preferredSize = new Dimensions(preferredWidth, preferredHeight);
@@ -257,6 +261,10 @@ public class TerraTabPaneSkin extends Co
buttonCornerRadius, buttonCornerRadius));
break;
}
+
+ default: {
+ break;
+ }
}
// Draw the border
@@ -275,6 +283,10 @@ public class TerraTabPaneSkin extends Co
buttonCornerRadius, buttonCornerRadius));
break;
}
+
+ default: {
+ break;
+ }
}
if (!(tabButton.isSelected()
@@ -291,6 +303,10 @@ public class TerraTabPaneSkin extends Co
graphics.draw(new Line2D.Double(width - 0.5, 0.5, width - 0.5, height - 0.5));
break;
}
+
+ default: {
+ break;
+ }
}
}
@@ -334,6 +350,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
@@ -360,6 +380,10 @@ public class TerraTabPaneSkin extends Co
y = height - (buttonPadding.bottom + CLOSE_TRIGGER_SIZE + 1);
break;
}
+
+ default: {
+ break;
+ }
}
graphics.draw(new Line2D.Double(x, y, x + CLOSE_TRIGGER_SIZE - 1, y + CLOSE_TRIGGER_SIZE - 1));
@@ -426,6 +450,10 @@ public class TerraTabPaneSkin extends Co
CLOSE_TRIGGER_SIZE + 4, CLOSE_TRIGGER_SIZE + 4);
break;
}
+
+ default: {
+ break;
+ }
}
return bounds;
@@ -657,6 +685,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
return preferredWidth;
@@ -724,6 +756,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
return preferredHeight;
@@ -955,6 +991,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
// Lay out the tabs
@@ -975,6 +1015,10 @@ public class TerraTabPaneSkin extends Co
tab.setSize(getPreferredTabWidth(tabHeight), tabHeight);
break;
}
+
+ default: {
+ break;
+ }
}
} else {
tab.setSize(tabWidth, tabHeight);
@@ -1015,6 +1059,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
TabButton activeTabButton;
@@ -1070,6 +1118,10 @@ public class TerraTabPaneSkin extends Co
break;
}
+
+ default: {
+ break;
+ }
}
}
}
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -446,13 +446,13 @@ public class TerraTextInputSkin extends
offset = 0;
} else {
// Translate to glyph coordinates
- x -= (padding.left - scrollLeft + 1 + getAlignmentDeltaX());
+ int xt = x - (padding.left - scrollLeft + 1 + getAlignmentDeltaX());
Rectangle2D textBounds = glyphVector.getLogicalBounds();
- if (x < 0) {
+ if (xt < 0) {
offset = 0;
- } else if (x > textBounds.getWidth()) {
+ } else if (xt > textBounds.getWidth()) {
offset = glyphVector.getNumGlyphs();
} else {
int n = glyphVector.getNumGlyphs();
@@ -463,10 +463,10 @@ public class TerraTextInputSkin extends
float glyphX = (float)glyphBounds2D.getX();
float glyphWidth = (float)glyphBounds2D.getWidth();
- if (x >= glyphX
- && x < glyphX + glyphWidth) {
+ if (xt >= glyphX
+ && xt < glyphX + glyphWidth) {
- if (x - glyphX > glyphWidth / 2) {
+ if (xt - glyphX > glyphWidth / 2) {
// The user clicked on the right half of the character; select
// the next character
i++;
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=1449662&r1=1449661&r2=1449662&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 Mon Feb 25 11:29:09 2013
@@ -1451,17 +1451,19 @@ public class TerraTreeViewSkin extends C
*/
private void removeVisibleNodes(BranchInfo parentBranchInfo, int index, int count) {
parentBranchInfo.loadChildren();
+
+ int countUpdated = count;
- if (count == -1) {
+ if (countUpdated == -1) {
assert(index == 0) : "Non-zero index with 'remove all' count";
- count = parentBranchInfo.children.getLength();
+ countUpdated = parentBranchInfo.children.getLength();
}
- assert(index + count <= parentBranchInfo.children.getLength()) : "Value too big";
+ assert(index + countUpdated <= parentBranchInfo.children.getLength()) : "Value too big";
- if (count > 0) {
+ if (countUpdated > 0) {
NodeInfo first = parentBranchInfo.children.get(index);
- NodeInfo last = parentBranchInfo.children.get(index + count - 1);
+ NodeInfo last = parentBranchInfo.children.get(index + countUpdated - 1);
int rangeStart = visibleNodes.indexOf(first);