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 2012/05/15 13:14:39 UTC
svn commit: r1338649 [1/2] - in
/pivot/trunk/tutorials/src/org/apache/pivot/tutorials: boundedrange/
bxmlexplorer/ bxmlexplorer/tools/ effects/ explorer/ explorer/tools/
layout/ lists/ localization/ menus/ navigation/ scripting/ stocktracker/
webquerie...
Author: smartini
Date: Tue May 15 11:14:38 2012
New Revision: 1338649
URL: http://svn.apache.org/viewvc?rev=1338649&view=rev
Log:
fix some eclipse warnings
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowListener.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/Ruler.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerListener.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Ruler.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/DateBindMapping.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java Tue May 15 11:14:38 2012
@@ -37,7 +37,7 @@ public class Sliders extends Window impl
slider.getSliderValueListeners().add(new SliderValueListener() {
@Override
- public void valueChanged(Slider slider, int previousValue) {
+ public void valueChanged(Slider sliderArgument, int previousValue) {
updateLabel();
}
});
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/BXMLExplorerDocument.java Tue May 15 11:14:38 2012
@@ -96,8 +96,8 @@ public class BXMLExplorerDocument extend
private Component previousSelectedComponent = null;
@Override
- public void selectedNodeChanged(TreeView treeView, Object previousSelectedNode) {
- TreeNode node = (TreeNode) treeView.getSelectedNode();
+ public void selectedNodeChanged(TreeView treeViewArgument, Object previousSelectedNode) {
+ TreeNode node = (TreeNode) treeViewArgument.getSelectedNode();
if (previousSelectedComponent != null
&& previousSelectedComponent.getDecorators().indexOf(focusDecorator) > -1) {
previousSelectedComponent.getDecorators().remove(focusDecorator);
@@ -125,9 +125,9 @@ public class BXMLExplorerDocument extend
}
@Override
- public void selectedPathsChanged(TreeView treeView, Sequence<Path> previousSelectedPaths) {
+ public void selectedPathsChanged(TreeView treeViewArgument, Sequence<Path> previousSelectedPaths) {
// if the selection becomes empty, remove the decorator
- if (treeView.getSelectedNode() == null && previousSelectedComponent != null
+ if (treeViewArgument.getSelectedNode() == null && previousSelectedComponent != null
&& previousSelectedComponent.getDecorators().indexOf(focusDecorator) > -1) {
previousSelectedComponent.getDecorators().remove(focusDecorator);
}
@@ -281,10 +281,9 @@ public class BXMLExplorerDocument extend
TreeNode node = new TreeNode(branch.getText());
setComponentIconOnTreeNode(container, node);
return node;
- } else {
- setComponentIconOnTreeNode(container, branch);
- return branch;
}
+ setComponentIconOnTreeNode(container, branch);
+ return branch;
}
if (container instanceof Sequence<?>) {
@@ -348,9 +347,8 @@ public class BXMLExplorerDocument extend
String bxmlID = widgetToID.get(obj);
if (bxmlID == null) {
return obj.getClass().getSimpleName();
- } else {
- return obj.getClass().getSimpleName() + " " + bxmlID;
}
+ return obj.getClass().getSimpleName() + " " + bxmlID;
}
private static class MyTreeViewNodeRenderer extends TreeViewNodeRenderer {
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/CreateHighlightedXML.java Tue May 15 11:14:38 2012
@@ -132,11 +132,8 @@ public class CreateHighlightedXML {
return buf.toString();
}
- public static void main(String[] args) {
- DesktopApplicationContext.main(TestApplication.class, args);
- }
- public static final class TestApplication implements Application {
+ public static final class TestApplication extends Application.Adapter {
private Window window = null;
@Override
@@ -164,13 +161,10 @@ public class CreateHighlightedXML {
return false;
}
- @Override
- public void resume() throws Exception {
- }
+ }
- @Override
- public void suspend() throws Exception {
- }
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(TestApplication.class, args);
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java Tue May 15 11:14:38 2012
@@ -82,45 +82,47 @@ public class FakeWindow extends Containe
public final Window window;
public FakeWindow(Window _window) {
- Component content = _window.getContent();
+ Component contentLocal = _window.getContent();
_window.setContent(null);
this.window = _window;
window.getWindowListeners().add(new WindowListener() {
@Override
- public void titleChanged(Window window, String previousTitle) {
+ public void titleChanged(Window windowArgument, String previousTitle) {
windowListeners.titleChanged(FakeWindow.this, previousTitle);
}
@Override
- public void iconAdded(Window window, Image addedIcon) {
+ public void iconAdded(Window windowArgument, Image addedIcon) {
windowListeners.iconAdded(FakeWindow.this, addedIcon);
}
@Override
- public void iconInserted(Window window, Image addedIcon, int index) {
+ public void iconInserted(Window windowArgument, Image addedIcon, int index) {
windowListeners.iconInserted(FakeWindow.this, addedIcon, index);
}
@Override
- public void iconsRemoved(Window window, int index, Sequence<Image> removed) {
+ public void iconsRemoved(Window windowArgument, int index, Sequence<Image> removed) {
windowListeners.iconsRemoved(FakeWindow.this, index, removed);
}
@Override
- public void contentChanged(Window window, Component previousContent) {
+ public void contentChanged(Window windowArgument, Component previousContent) {
windowListeners.contentChanged(FakeWindow.this, previousContent);
}
@Override
- public void activeChanged(Window window, Window obverseWindow) {
+ public void activeChanged(Window windowArgument, Window obverseWindow) {
+ // empty block
}
@Override
- public void maximizedChanged(Window window) {
+ public void maximizedChanged(Window windowArgument) {
+ // empty block
}
});
- setContent(content);
+ setContent(contentLocal);
setSkin(new FakeWindowSkin());
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowListener.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowListener.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowListener.java Tue May 15 11:14:38 2012
@@ -27,22 +27,27 @@ public interface FakeWindowListener {
public static class Adapter implements FakeWindowListener {
@Override
public void titleChanged(FakeWindow window, String previousTitle) {
+ // empty block
}
@Override
public void iconAdded(FakeWindow window, Image addedIcon) {
+ // empty block
}
@Override
public void iconInserted(FakeWindow window, Image addedIcon, int index) {
+ // empty block
}
@Override
public void iconsRemoved(FakeWindow window, int index, Sequence<Image> removed) {
+ // empty block
}
@Override
public void contentChanged(FakeWindow window, Component previousContent) {
+ // empty block
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindowSkin.java Tue May 15 11:14:38 2012
@@ -385,16 +385,16 @@ public class FakeWindowSkin extends Cont
int titleBarHeight = titleBarTablePane.getHeight();
// Draw the title area
- Color titleBarBackgroundColor = this.titleBarBackgroundColor;
- Color titleBarBorderColor = this.titleBarBorderColor;
- Color titleBarBevelColor = this.titleBarBevelColor;
+ Color titleBarBackgroundColorLocal = this.titleBarBackgroundColor;
+ Color titleBarBorderColorLocal = this.titleBarBorderColor;
+ Color titleBarBevelColorLocal = this.titleBarBevelColor;
- graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColor, width / 2f,
- titleBarHeight + 1, titleBarBackgroundColor));
+ graphics.setPaint(new GradientPaint(width / 2f, 0, titleBarBevelColorLocal, width / 2f,
+ titleBarHeight + 1, titleBarBackgroundColorLocal));
graphics.fillRect(0, 0, width, titleBarHeight + 1);
// Draw the border
- graphics.setPaint(titleBarBorderColor);
+ graphics.setPaint(titleBarBorderColorLocal);
GraphicsUtilities.drawRect(graphics, 0, 0, width, titleBarHeight + 2);
// Draw the content area
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentInspectorSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentInspectorSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentInspectorSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/tools/ComponentInspectorSkin.java Tue May 15 11:14:38 2012
@@ -274,14 +274,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Integer.parseInt(textInput.getText()));
+ dictionary.put(key, Integer.parseInt(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- int value = (Integer)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ int valueLocal = (Integer)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -314,14 +314,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Float.parseFloat(textInput.getText()));
+ dictionary.put(key, Float.parseFloat(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- float value = (Float)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ float valueLocal = (Float)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -354,14 +354,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Double.parseDouble(textInput.getText()));
+ dictionary.put(key, Double.parseDouble(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- double value = (Double)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ double valueLocal = (Double)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -392,14 +392,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, textInput.getText());
+ dictionary.put(key, textInputLocal.getText());
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- String value = (String)dictionary.get(key);
- textInput.setText(value == null ? "" : value);
+ String valueLocal = (String)dictionary.get(key);
+ textInputLocal.setText(valueLocal == null ? "" : valueLocal);
}
}
}
@@ -439,14 +439,14 @@ abstract class ComponentInspectorSkin ex
private boolean updating = false;
@Override
- public void selectedIndexChanged(ListButton listButton, int previousSelectedIndex) {
+ public void selectedIndexChanged(ListButton listButtonArgument, int previousSelectedIndex) {
if (!updating) {
updating = true;
try {
- dictionary.put(key, listButton.getSelectedItem());
+ dictionary.put(key, listButtonArgument.getSelectedItem());
} catch (Exception exception) {
- displayErrorMessage(exception, listButton.getWindow());
- listButton.setSelectedIndex(previousSelectedIndex);
+ displayErrorMessage(exception, listButtonArgument.getWindow());
+ listButtonArgument.setSelectedIndex(previousSelectedIndex);
} finally {
updating = false;
}
@@ -490,15 +490,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Point point = (Point)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Point pointLocal = (Point)dictionary.get(key);
try {
- int x = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Point(x, point.y));
+ int x = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Point(x, pointLocal.y));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(point.x));
+ textInputLocal.setText(String.valueOf(pointLocal.x));
}
}
}
@@ -524,15 +524,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Point point = (Point)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Point pointLocal = (Point)dictionary.get(key);
try {
- int y = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Point(point.x, y));
+ int y = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Point(pointLocal.x, y));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(point.y));
+ textInputLocal.setText(String.valueOf(pointLocal.y));
}
}
}
@@ -583,15 +583,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Dimensions dimensions = (Dimensions)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Dimensions dimensionsLocal = (Dimensions)dictionary.get(key);
try {
- int width = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Dimensions(width, dimensions.height));
+ int width = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Dimensions(width, dimensionsLocal.height));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(dimensions.width));
+ textInputLocal.setText(String.valueOf(dimensionsLocal.width));
}
}
}
@@ -617,15 +617,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Dimensions dimensions = (Dimensions)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Dimensions dimensionsLocal = (Dimensions)dictionary.get(key);
try {
- int height = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Dimensions(dimensions.width, height));
+ int height = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Dimensions(dimensionsLocal.width, height));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(dimensions.height));
+ textInputLocal.setText(String.valueOf(dimensionsLocal.height));
}
}
}
@@ -676,15 +676,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Limits limits = (Limits)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Limits limitsLocal = (Limits)dictionary.get(key);
try {
- int min = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Limits(min, limits.maximum));
+ int min = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Limits(min, limitsLocal.maximum));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(limits.minimum));
+ textInputLocal.setText(String.valueOf(limitsLocal.minimum));
}
}
}
@@ -710,15 +710,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Limits limits = (Limits)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Limits limitsLocal = (Limits)dictionary.get(key);
try {
- int max = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Limits(limits.minimum, max));
+ int max = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Limits(limitsLocal.minimum, max));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(limits.maximum));
+ textInputLocal.setText(String.valueOf(limitsLocal.maximum));
}
}
}
@@ -769,16 +769,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int top = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(top, insets.left, insets.bottom,
- insets.right));
+ int top = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(top, insetsLocal.left, insetsLocal.bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.top));
+ textInputLocal.setText(String.valueOf(insetsLocal.top));
}
}
}
@@ -804,16 +804,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int left = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, left, insets.bottom,
- insets.right));
+ int left = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, left, insetsLocal.bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.left));
+ textInputLocal.setText(String.valueOf(insetsLocal.left));
}
}
}
@@ -839,16 +839,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int bottom = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, insets.left, bottom,
- insets.right));
+ int bottom = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, insetsLocal.left, bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.bottom));
+ textInputLocal.setText(String.valueOf(insetsLocal.bottom));
}
}
}
@@ -874,16 +874,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int right = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, insets.left, insets.bottom,
+ int right = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, insetsLocal.left, insetsLocal.bottom,
right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.right));
+ textInputLocal.setText(String.valueOf(insetsLocal.right));
}
}
}
@@ -920,15 +920,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Span span = (Span)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Span spanLocal = (Span)dictionary.get(key);
try {
- int start = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Span(start, span == null ? start : span.end));
+ int start = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Span(start, spanLocal == null ? start : spanLocal.end));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(span == null ? "" : String.valueOf(span.start));
+ textInputLocal.setText(spanLocal == null ? "" : String.valueOf(spanLocal.start));
}
}
}
@@ -954,15 +954,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Span span = (Span)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Span spanLocal = (Span)dictionary.get(key);
try {
- int end = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Span(span == null ? end : span.start, end));
+ int end = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Span(spanLocal == null ? end : spanLocal.start, end));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(span == null ? "" : String.valueOf(span.end));
+ textInputLocal.setText(spanLocal == null ? "" : String.valueOf(spanLocal.end));
}
}
}
@@ -1013,16 +1013,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int topLeft = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(topLeft, cornerRadii.topRight,
- cornerRadii.bottomLeft, cornerRadii.bottomRight));
+ int topLeft = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(topLeft, cornerRadiiLocal.topRight,
+ cornerRadiiLocal.bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.topLeft));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.topLeft));
}
}
}
@@ -1048,16 +1048,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int topRight = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft, topRight,
- cornerRadii.bottomLeft, cornerRadii.bottomRight));
+ int topRight = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft, topRight,
+ cornerRadiiLocal.bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.topRight));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.topRight));
}
}
}
@@ -1083,16 +1083,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int bottomLeft = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft,
- cornerRadii.topRight, bottomLeft, cornerRadii.bottomRight));
+ int bottomLeft = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft,
+ cornerRadiiLocal.topRight, bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.bottomLeft));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.bottomLeft));
}
}
}
@@ -1118,16 +1118,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int bottomRight = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft,
- cornerRadii.topRight, cornerRadii.bottomLeft, bottomRight));
+ int bottomRight = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft,
+ cornerRadiiLocal.topRight, cornerRadiiLocal.bottomLeft, bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.bottomRight));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.bottomRight));
}
}
}
@@ -1164,16 +1164,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int start = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(start, scope == null ? start : scope.end,
- scope == null ? start : scope.extent));
+ int start = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(start, scopeLocal == null ? start : scopeLocal.end,
+ scopeLocal == null ? start : scopeLocal.extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.start));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.start));
}
}
}
@@ -1199,16 +1199,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int end = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(scope == null ? end : scope.start, end,
- scope == null ? end : scope.extent));
+ int end = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(scopeLocal == null ? end : scopeLocal.start, end,
+ scopeLocal == null ? end : scopeLocal.extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.end));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.end));
}
}
}
@@ -1234,16 +1234,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int extent = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(scope == null ? extent : scope.start,
- scope == null ? extent : scope.end, extent));
+ int extent = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(scopeLocal == null ? extent : scopeLocal.start,
+ scopeLocal == null ? extent : scopeLocal.end, extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.extent));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.extent));
}
}
}
@@ -1284,12 +1284,12 @@ abstract class ComponentInspectorSkin ex
colorChooserButton.getColorChooserButtonSelectionListeners().add
(new ColorChooserButtonSelectionListener() {
@Override
- public void selectedColorChanged(ColorChooserButton colorChooserButton,
+ public void selectedColorChanged(ColorChooserButton colorChooserButtonArgument,
Color previousSelectedColor) {
try {
- dictionary.put(key, colorChooserButton.getSelectedColor());
+ dictionary.put(key, colorChooserButtonArgument.getSelectedColor());
} catch (Exception exception) {
- displayErrorMessage(exception, colorChooserButton.getWindow());
+ displayErrorMessage(exception, colorChooserButtonArgument.getWindow());
dictionary.put(key, previousSelectedColor);
}
}
@@ -1320,12 +1320,12 @@ abstract class ComponentInspectorSkin ex
calendarButton.getCalendarButtonSelectionListeners().add
(new CalendarButtonSelectionListener() {
@Override
- public void selectedDateChanged(CalendarButton calendarButton,
+ public void selectedDateChanged(CalendarButton calendarButtonArgument,
CalendarDate previousSelectedDate) {
try {
- dictionary.put(key, calendarButton.getSelectedDate());
+ dictionary.put(key, calendarButtonArgument.getSelectedDate());
} catch (Exception exception) {
- displayErrorMessage(exception, calendarButton.getWindow());
+ displayErrorMessage(exception, calendarButtonArgument.getWindow());
dictionary.put(key, previousSelectedDate);
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java Tue May 15 11:14:38 2012
@@ -56,10 +56,10 @@ public class Transitions extends Window
TransitionListener transitionListener = new TransitionListener() {
@Override
public void transitionCompleted(Transition transition) {
- CollapseTransition collapseTransition = (CollapseTransition)transition;
+ CollapseTransition collapseTransitionLocal = (CollapseTransition)transition;
if (!transition.isReversed()) {
- Component component = collapseTransition.getComponent();
+ Component component = collapseTransitionLocal.getComponent();
component.getParent().remove(component);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java Tue May 15 11:14:38 2012
@@ -22,7 +22,7 @@ import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
-public class ComponentExplorer implements Application {
+public class ComponentExplorer extends Application.Adapter {
private ComponentExplorerWindow window = null;
public static final String CLASS_PROPERTY = "class";
@@ -45,16 +45,9 @@ public class ComponentExplorer implement
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public static void main(String[] args) {
DesktopApplicationContext.main(ComponentExplorer.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java Tue May 15 11:14:38 2012
@@ -100,11 +100,11 @@ public class ComponentExplorerWindow ext
treeView.getTreeViewSelectionListeners().add(new TreeViewSelectionListener.Adapter() {
@Override
- public void selectedPathsChanged(TreeView treeView,
+ public void selectedPathsChanged(TreeView treeViewArgument,
Sequence<Path> previousSelectedPaths) {
Component component = null;
- Object node = treeView.getSelectedNode();
+ Object node = treeViewArgument.getSelectedNode();
if (node instanceof ComponentNode) {
ComponentNode componentNode = (ComponentNode)node;
URL url = componentNode.getSrc();
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/Ruler.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/Ruler.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/Ruler.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/Ruler.java Tue May 15 11:14:38 2012
@@ -21,8 +21,10 @@ import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Orientation;
public class Ruler extends Component {
+
private static class RulerListenerList extends ListenerList<RulerListener>
implements RulerListener {
+ @Override
public void orientationChanged(Ruler ruler) {
for (RulerListener listener : this) {
listener.orientationChanged(ruler);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/RulerSkin.java Tue May 15 11:14:38 2012
@@ -98,7 +98,9 @@ class RulerSkin extends ComponentSkin im
}
}
+ @Override
public void orientationChanged(Ruler ruler) {
invalidateComponent();
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/ComponentInspectorSkin.java Tue May 15 11:14:38 2012
@@ -274,14 +274,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Integer.parseInt(textInput.getText()));
+ dictionary.put(key, Integer.parseInt(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- int value = (Integer)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ int valueLocal = (Integer)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -314,14 +314,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Float.parseFloat(textInput.getText()));
+ dictionary.put(key, Float.parseFloat(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- float value = (Float)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ float valueLocal = (Float)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -354,14 +354,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, Double.parseDouble(textInput.getText()));
+ dictionary.put(key, Double.parseDouble(textInputLocal.getText()));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- double value = (Double)dictionary.get(key);
- textInput.setText(String.valueOf(value));
+ double valueLocal = (Double)dictionary.get(key);
+ textInputLocal.setText(String.valueOf(valueLocal));
}
}
}
@@ -392,14 +392,14 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
+ TextInput textInputLocal = (TextInput)component;
try {
- dictionary.put(key, textInput.getText());
+ dictionary.put(key, textInputLocal.getText());
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- String value = (String)dictionary.get(key);
- textInput.setText(value == null ? "" : value);
+ String valueLocal = (String)dictionary.get(key);
+ textInputLocal.setText(valueLocal == null ? "" : valueLocal);
}
}
}
@@ -439,14 +439,14 @@ abstract class ComponentInspectorSkin ex
private boolean updating = false;
@Override
- public void selectedIndexChanged(ListButton listButton, int previousSelectedIndex) {
+ public void selectedIndexChanged(ListButton listButtonArgument, int previousSelectedIndex) {
if (!updating) {
updating = true;
try {
- dictionary.put(key, listButton.getSelectedItem());
+ dictionary.put(key, listButtonArgument.getSelectedItem());
} catch (Exception exception) {
- displayErrorMessage(exception, listButton.getWindow());
- listButton.setSelectedIndex(previousSelectedIndex);
+ displayErrorMessage(exception, listButtonArgument.getWindow());
+ listButtonArgument.setSelectedIndex(previousSelectedIndex);
} finally {
updating = false;
}
@@ -490,15 +490,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Point point = (Point)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Point pointLocal = (Point)dictionary.get(key);
try {
- int x = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Point(x, point.y));
+ int x = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Point(x, pointLocal.y));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(point.x));
+ textInputLocal.setText(String.valueOf(pointLocal.x));
}
}
}
@@ -524,15 +524,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Point point = (Point)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Point pointLocal = (Point)dictionary.get(key);
try {
- int y = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Point(point.x, y));
+ int y = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Point(pointLocal.x, y));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(point.y));
+ textInputLocal.setText(String.valueOf(pointLocal.y));
}
}
}
@@ -583,15 +583,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Dimensions dimensions = (Dimensions)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Dimensions dimensionsLocal = (Dimensions)dictionary.get(key);
try {
- int width = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Dimensions(width, dimensions.height));
+ int width = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Dimensions(width, dimensionsLocal.height));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(dimensions.width));
+ textInputLocal.setText(String.valueOf(dimensionsLocal.width));
}
}
}
@@ -617,15 +617,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Dimensions dimensions = (Dimensions)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Dimensions dimensionsLocal = (Dimensions)dictionary.get(key);
try {
- int height = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Dimensions(dimensions.width, height));
+ int height = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Dimensions(dimensionsLocal.width, height));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(dimensions.height));
+ textInputLocal.setText(String.valueOf(dimensionsLocal.height));
}
}
}
@@ -676,15 +676,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Limits limits = (Limits)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Limits limitsLocal = (Limits)dictionary.get(key);
try {
- int min = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Limits(min, limits.maximum));
+ int min = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Limits(min, limitsLocal.maximum));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(limits.minimum));
+ textInputLocal.setText(String.valueOf(limitsLocal.minimum));
}
}
}
@@ -710,15 +710,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Limits limits = (Limits)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Limits limitsLocal = (Limits)dictionary.get(key);
try {
- int max = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Limits(limits.minimum, max));
+ int max = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Limits(limitsLocal.minimum, max));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(limits.maximum));
+ textInputLocal.setText(String.valueOf(limitsLocal.maximum));
}
}
}
@@ -769,16 +769,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int top = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(top, insets.left, insets.bottom,
- insets.right));
+ int top = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(top, insetsLocal.left, insetsLocal.bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.top));
+ textInputLocal.setText(String.valueOf(insetsLocal.top));
}
}
}
@@ -804,16 +804,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int left = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, left, insets.bottom,
- insets.right));
+ int left = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, left, insetsLocal.bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.left));
+ textInputLocal.setText(String.valueOf(insetsLocal.left));
}
}
}
@@ -839,16 +839,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int bottom = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, insets.left, bottom,
- insets.right));
+ int bottom = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, insetsLocal.left, bottom,
+ insetsLocal.right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.bottom));
+ textInputLocal.setText(String.valueOf(insetsLocal.bottom));
}
}
}
@@ -874,16 +874,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Insets insets = (Insets)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Insets insetsLocal = (Insets)dictionary.get(key);
try {
- int right = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Insets(insets.top, insets.left, insets.bottom,
+ int right = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Insets(insetsLocal.top, insetsLocal.left, insetsLocal.bottom,
right));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(insets.right));
+ textInputLocal.setText(String.valueOf(insetsLocal.right));
}
}
}
@@ -920,15 +920,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Span span = (Span)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Span spanLocal = (Span)dictionary.get(key);
try {
- int start = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Span(start, span == null ? start : span.end));
+ int start = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Span(start, spanLocal == null ? start : spanLocal.end));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(span == null ? "" : String.valueOf(span.start));
+ textInputLocal.setText(spanLocal == null ? "" : String.valueOf(spanLocal.start));
}
}
}
@@ -954,15 +954,15 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Span span = (Span)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Span spanLocal = (Span)dictionary.get(key);
try {
- int end = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Span(span == null ? end : span.start, end));
+ int end = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Span(spanLocal == null ? end : spanLocal.start, end));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(span == null ? "" : String.valueOf(span.end));
+ textInputLocal.setText(spanLocal == null ? "" : String.valueOf(spanLocal.end));
}
}
}
@@ -1013,16 +1013,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int topLeft = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(topLeft, cornerRadii.topRight,
- cornerRadii.bottomLeft, cornerRadii.bottomRight));
+ int topLeft = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(topLeft, cornerRadiiLocal.topRight,
+ cornerRadiiLocal.bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.topLeft));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.topLeft));
}
}
}
@@ -1048,16 +1048,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int topRight = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft, topRight,
- cornerRadii.bottomLeft, cornerRadii.bottomRight));
+ int topRight = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft, topRight,
+ cornerRadiiLocal.bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.topRight));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.topRight));
}
}
}
@@ -1083,16 +1083,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int bottomLeft = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft,
- cornerRadii.topRight, bottomLeft, cornerRadii.bottomRight));
+ int bottomLeft = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft,
+ cornerRadiiLocal.topRight, bottomLeft, cornerRadiiLocal.bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.bottomLeft));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.bottomLeft));
}
}
}
@@ -1118,16 +1118,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- CornerRadii cornerRadii = (CornerRadii)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ CornerRadii cornerRadiiLocal = (CornerRadii)dictionary.get(key);
try {
- int bottomRight = Integer.parseInt(textInput.getText());
- dictionary.put(key, new CornerRadii(cornerRadii.topLeft,
- cornerRadii.topRight, cornerRadii.bottomLeft, bottomRight));
+ int bottomRight = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new CornerRadii(cornerRadiiLocal.topLeft,
+ cornerRadiiLocal.topRight, cornerRadiiLocal.bottomLeft, bottomRight));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(String.valueOf(cornerRadii.bottomRight));
+ textInputLocal.setText(String.valueOf(cornerRadiiLocal.bottomRight));
}
}
}
@@ -1164,16 +1164,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int start = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(start, scope == null ? start : scope.end,
- scope == null ? start : scope.extent));
+ int start = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(start, scopeLocal == null ? start : scopeLocal.end,
+ scopeLocal == null ? start : scopeLocal.extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.start));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.start));
}
}
}
@@ -1199,16 +1199,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int end = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(scope == null ? end : scope.start, end,
- scope == null ? end : scope.extent));
+ int end = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(scopeLocal == null ? end : scopeLocal.start, end,
+ scopeLocal == null ? end : scopeLocal.extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.end));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.end));
}
}
}
@@ -1234,16 +1234,16 @@ abstract class ComponentInspectorSkin ex
@Override
public void focusedChanged(Component component, Component obverseComponent) {
if (!component.isFocused()) {
- TextInput textInput = (TextInput)component;
- Scope scope = (Scope)dictionary.get(key);
+ TextInput textInputLocal = (TextInput)component;
+ Scope scopeLocal = (Scope)dictionary.get(key);
try {
- int extent = Integer.parseInt(textInput.getText());
- dictionary.put(key, new Scope(scope == null ? extent : scope.start,
- scope == null ? extent : scope.end, extent));
+ int extent = Integer.parseInt(textInputLocal.getText());
+ dictionary.put(key, new Scope(scopeLocal == null ? extent : scopeLocal.start,
+ scopeLocal == null ? extent : scopeLocal.end, extent));
} catch (Exception exception) {
displayErrorMessage(exception, component.getWindow());
- textInput.setText(scope == null ? "" : String.valueOf(scope.extent));
+ textInputLocal.setText(scopeLocal == null ? "" : String.valueOf(scopeLocal.extent));
}
}
}
@@ -1284,12 +1284,12 @@ abstract class ComponentInspectorSkin ex
colorChooserButton.getColorChooserButtonSelectionListeners().add
(new ColorChooserButtonSelectionListener() {
@Override
- public void selectedColorChanged(ColorChooserButton colorChooserButton,
+ public void selectedColorChanged(ColorChooserButton colorChooserButtonArgument,
Color previousSelectedColor) {
try {
- dictionary.put(key, colorChooserButton.getSelectedColor());
+ dictionary.put(key, colorChooserButtonArgument.getSelectedColor());
} catch (Exception exception) {
- displayErrorMessage(exception, colorChooserButton.getWindow());
+ displayErrorMessage(exception, colorChooserButtonArgument.getWindow());
dictionary.put(key, previousSelectedColor);
}
}
@@ -1320,12 +1320,12 @@ abstract class ComponentInspectorSkin ex
calendarButton.getCalendarButtonSelectionListeners().add
(new CalendarButtonSelectionListener() {
@Override
- public void selectedDateChanged(CalendarButton calendarButton,
+ public void selectedDateChanged(CalendarButton calendarButtonArgument,
CalendarDate previousSelectedDate) {
try {
- dictionary.put(key, calendarButton.getSelectedDate());
+ dictionary.put(key, calendarButtonArgument.getSelectedDate());
} catch (Exception exception) {
- displayErrorMessage(exception, calendarButton.getWindow());
+ displayErrorMessage(exception, calendarButtonArgument.getWindow());
dictionary.put(key, previousSelectedDate);
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLogger.java Tue May 15 11:14:38 2012
@@ -297,12 +297,12 @@ public class EventLogger extends Contain
*/
public void selectAllEvents(boolean select) {
// Include or exclude each possible method from the group of monitored events
- IncludeEventGroup includeEvents = getIncludeEvents();
+ IncludeEventGroup includeEventsLocal = getIncludeEvents();
for (Method event : declaredEvents) {
if (select) {
- includeEvents.add(event);
+ includeEventsLocal.add(event);
} else {
- includeEvents.remove(event);
+ includeEventsLocal.remove(event);
}
}
// Update the skin (Checkboxes)
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerListener.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerListener.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerListener.java Tue May 15 11:14:38 2012
@@ -30,18 +30,22 @@ public interface EventLoggerListener {
public static class Adapter implements EventLoggerListener {
@Override
public void sourceChanged(EventLogger eventLogger, Component previousSource) {
+ // empty block
}
@Override
public void eventIncluded(EventLogger eventLogger, Method method) {
+ // empty block
}
@Override
public void eventExcluded(EventLogger eventLogger, Method method) {
+ // empty block
}
@Override
public void eventFired(EventLogger eventLogger, Method event, Object[] arguments) {
+ // empty block
}
}