You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/09/11 00:13:28 UTC
svn commit: r996004 - in /pivot/branches/1.5.x:
tests/src/org/apache/pivot/tests/ tutorials/src/org/apache/pivot/tutorials/
tutorials/src/org/apache/pivot/tutorials/layout/
tutorials/src/org/apache/pivot/tutorials/menus/
tutorials/src/org/apache/pivot/...
Author: gbrown
Date: Fri Sep 10 22:13:27 2010
New Revision: 996004
URL: http://svn.apache.org/viewvc?rev=996004&view=rev
Log:
Resolve PIVOT-632.
Modified:
pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/ActionMappingTest.java
pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java
pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Action.java
pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Button.java
pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Window.java
Modified: pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/ActionMappingTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/ActionMappingTest.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/ActionMappingTest.java (original)
+++ pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/ActionMappingTest.java Fri Sep 10 22:13:27 2010
@@ -20,6 +20,7 @@ import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
+import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
@@ -34,14 +35,14 @@ public class ActionMappingTest implement
public void startup(Display display, Map<String, String> properties) throws Exception {
Action.getNamedActions().put("action1", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
Alert.alert(MessageType.INFO, "Action 1 performed.", window);
}
});
Action.getNamedActions().put("action2", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
Alert.alert(MessageType.INFO, "Action 2 performed.", window);
}
});
Modified: pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java (original)
+++ pivot/branches/1.5.x/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java Fri Sep 10 22:13:27 2010
@@ -40,7 +40,7 @@ public class SpinnerFocusTest implements
}
@Override
- public void perform() {
+ public void perform(Component source) {
Alert.alert("Foo", frame);
}
};
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Fri Sep 10 22:13:27 2010
@@ -302,7 +302,7 @@ public class KitchenSink implements Appl
}
@Override
- public void perform() {
+ public void perform(Component source) {
Button selectedItem = imageMenuGroup.getSelection();
String imageName = (String)selectedItem.getUserData().get("image");
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java Fri Sep 10 22:13:27 2010
@@ -93,7 +93,7 @@ public class TablePanes implements Appli
namedActions.put("configureCell", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Sheet sheet;
@@ -117,7 +117,7 @@ public class TablePanes implements Appli
namedActions.put("configureRow", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Sheet sheet;
@@ -140,7 +140,7 @@ public class TablePanes implements Appli
namedActions.put("insertRow", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Sheet sheet;
@@ -174,7 +174,7 @@ public class TablePanes implements Appli
namedActions.put("removeRow", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
ArrayList<String> options = new ArrayList<String>("OK", "Cancel");
String message = "Remove Row?";
Label body = new Label("Are you sure you want to remove the row?");
@@ -197,7 +197,7 @@ public class TablePanes implements Appli
namedActions.put("configureColumn", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Sheet sheet;
@@ -220,7 +220,7 @@ public class TablePanes implements Appli
namedActions.put("insertColumn", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Sheet sheet;
@@ -255,7 +255,7 @@ public class TablePanes implements Appli
namedActions.put("removeColumn", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
ArrayList<String> options = new ArrayList<String>("OK", "Cancel");
String message = "Remove Column?";
Label body = new Label("Are you sure you want to remove the column?");
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java Fri Sep 10 22:13:27 2010
@@ -41,7 +41,7 @@ public class ContextMenus implements App
Menu.Item whatIsThisMenuItem = new Menu.Item("What is this?");
whatIsThisMenuItem.setAction(new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
String description = (String)descendant.getUserData().get("description");
String message = "This is a " + description + ".";
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java Fri Sep 10 22:13:27 2010
@@ -93,7 +93,7 @@ public class MenuBars implements Applica
public MenuBars() {
Action.getNamedActions().put("fileNew", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Component tab;
try {
@@ -121,14 +121,14 @@ public class MenuBars implements Applica
Action.getNamedActions().put("fileOpen", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
fileBrowserSheet.open(window);
}
});
Action.getNamedActions().put("cut", new Action(false) {
@Override
- public void perform() {
+ public void perform(Component source) {
TextInput textInput = (TextInput)window.getFocusDescendant();
textInput.cut();
}
@@ -136,7 +136,7 @@ public class MenuBars implements Applica
Action.getNamedActions().put("copy", new Action(false) {
@Override
- public void perform() {
+ public void perform(Component source) {
TextInput textInput = (TextInput)window.getFocusDescendant();
textInput.copy();
}
@@ -144,7 +144,7 @@ public class MenuBars implements Applica
Action.getNamedActions().put("paste", new Action(false) {
@Override
- public void perform() {
+ public void perform(Component source) {
TextInput textInput = (TextInput)window.getFocusDescendant();
textInput.paste();
}
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java Fri Sep 10 22:13:27 2010
@@ -23,6 +23,7 @@ import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Bounds;
+import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.ImageView;
@@ -50,7 +51,7 @@ public class MenuButtons implements Appl
public MenuButtons() {
Action.getNamedActions().put("newCircle", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
Ellipse ellipse = new Ellipse();
ellipse.setSize(50, 50);
@@ -64,7 +65,7 @@ public class MenuButtons implements Appl
Action.getNamedActions().put("newSquare", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
Rectangle rectangle = new Rectangle();
rectangle.setSize(50, 50);
@@ -78,7 +79,7 @@ public class MenuButtons implements Appl
Action.getNamedActions().put("newText", new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
Text text = new Text();
text.setText("ABC");
text.setFont("Arial BOLD 24");
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java Fri Sep 10 22:13:27 2010
@@ -79,7 +79,7 @@ public class StockTrackerWindow extends
private Action addSymbolAction = new Action(false) {
@Override
@SuppressWarnings("unchecked")
- public void perform() {
+ public void perform(Component source) {
String symbol = symbolTextInput.getText().toUpperCase();
if (symbols.indexOf(symbol) == -1) {
symbols.add(symbol);
@@ -100,7 +100,7 @@ public class StockTrackerWindow extends
// Action invoke to remove selected symbols
private Action removeSymbolsAction = new Action(false) {
@Override
- public void perform() {
+ public void perform(Component source) {
int selectedIndex = stocksTableView.getFirstSelectedIndex();
int selectionLength = stocksTableView.getLastSelectedIndex() - selectedIndex + 1;
stocksTableView.getTableData().remove(selectedIndex, selectionLength);
@@ -122,7 +122,7 @@ public class StockTrackerWindow extends
// Action invoked to refresh the symbol table view
private Action refreshTableAction = new Action() {
@Override
- public void perform() {
+ public void perform(Component source) {
refreshTable();
}
};
@@ -197,7 +197,7 @@ public class StockTrackerWindow extends
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
if (keyCode == Keyboard.KeyCode.DELETE
|| keyCode == Keyboard.KeyCode.BACKSPACE) {
- removeSymbolsAction.perform();
+ removeSymbolsAction.perform(component);
} else if (keyCode == Keyboard.KeyCode.A
&& Keyboard.isPressed(Platform.getCommandModifier())) {
stocksTableView.selectAll();
@@ -220,7 +220,7 @@ public class StockTrackerWindow extends
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
if (keyCode == Keyboard.KeyCode.ENTER) {
if (addSymbolAction.isEnabled()) {
- addSymbolAction.perform();
+ addSymbolAction.perform(component);
}
}
Modified: pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java (original)
+++ pivot/branches/1.5.x/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java Fri Sep 10 22:13:27 2010
@@ -35,6 +35,7 @@ import org.apache.pivot.web.PutQuery;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.ActivityIndicator;
import org.apache.pivot.wtk.BoxPane;
+import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.Prompt;
@@ -55,14 +56,14 @@ import org.apache.pivot.wtkx.WTKXSeriali
public class ExpensesWindow extends Window implements Bindable {
private class RefreshExpenseListAction extends Action {
@Override
- public void perform() {
+ public void perform(Component source) {
refreshExpenseList();
}
}
private class AddExpenseAction extends Action {
@Override
- public void perform() {
+ public void perform(Component source) {
addExpense();
}
}
@@ -73,7 +74,7 @@ public class ExpensesWindow extends Wind
}
@Override
- public void perform() {
+ public void perform(Component source) {
updateSelectedExpense();
}
}
@@ -84,7 +85,7 @@ public class ExpensesWindow extends Wind
}
@Override
- public void perform() {
+ public void perform(Component source) {
deleteSelectedExpense();
}
}
Modified: pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Action.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Action.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Action.java (original)
+++ pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Action.java Fri Sep 10 22:13:27 2010
@@ -146,8 +146,9 @@ public abstract class Action {
/**
* Performs the action.
+ * @param source TODO
*/
- public abstract void perform();
+ public abstract void perform(Component source);
public boolean isEnabled() {
return enabled;
Modified: pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Button.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Button.java Fri Sep 10 22:13:27 2010
@@ -364,7 +364,7 @@ public abstract class Button extends Com
buttonPressListeners.buttonPressed(this);
if (action != null) {
- action.perform();
+ action.perform(this);
}
}
Modified: pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Window.java?rev=996004&r1=996003&r2=996004&view=diff
==============================================================================
--- pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/branches/1.5.x/wtk/src/org/apache/pivot/wtk/Window.java Fri Sep 10 22:13:27 2010
@@ -1097,7 +1097,7 @@ public class Window extends Container {
Action action = actionMap.get(keyStroke);
if (action != null
&& action.isEnabled()) {
- action.perform();
+ action.perform(this);
}
return consumed;