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 [2/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...
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java Tue May 15 11:14:38 2012
@@ -42,9 +42,11 @@ import org.apache.pivot.wtk.content.Tree
import org.apache.pivot.wtk.skin.ContainerSkin;
class EventLoggerSkin extends ContainerSkin implements EventLogger.Skin, EventLoggerListener {
+
private static class TreeNodeComparator implements Comparator<TreeNode>, Serializable {
private static final long serialVersionUID = 1L;
+ @Override
public int compare(TreeNode treeNode1, TreeNode treeNode2) {
return treeNode1.getText().compareTo(treeNode2.getText());
}
@@ -112,7 +114,7 @@ class EventLoggerSkin extends ContainerS
}
});
- EventLogger eventLogger = (EventLogger)getComponent();
+ EventLogger eventLoggerLocal = (EventLogger)getComponent();
boolean checked = (checkState == TreeView.NodeCheckState.CHECKED);
@@ -137,9 +139,9 @@ class EventLoggerSkin extends ContainerS
Method event = eventNode.getEvent();
if (checked) {
- eventLogger.getIncludeEvents().add(event);
+ eventLoggerLocal.getIncludeEvents().add(event);
} else {
- eventLogger.getIncludeEvents().remove(event);
+ eventLoggerLocal.getIncludeEvents().remove(event);
}
}
}
@@ -171,12 +173,12 @@ class EventLoggerSkin extends ContainerS
treeView.setNodeChecked(parentPath, checked);
}
- eventLogger.getIncludeEvents().add(event);
+ eventLoggerLocal.getIncludeEvents().add(event);
} else {
// Propagate upward
treeView.setNodeChecked(parentPath, checked);
- eventLogger.getIncludeEvents().remove(event);
+ eventLoggerLocal.getIncludeEvents().remove(event);
}
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java Tue May 15 11:14:38 2012
@@ -44,15 +44,15 @@ public class TablePanes extends Window i
private int y = -1;
@Override
- public boolean configureContextMenu(Component component, Menu menu, int x, int y) {
- this.x = x;
- this.y = y;
+ public boolean configureContextMenu(Component component, Menu menu, int xArgument, int yArgument) {
+ this.x = xArgument;
+ this.y = yArgument;
// Set the enabled state of actions based on where the user clicked
Action.NamedActionDictionary namedActions = Action.getNamedActions();
- int rowIndex = tablePane.getRowAt(y);
- int columnIndex = tablePane.getColumnAt(x);
+ int rowIndex = tablePane.getRowAt(yArgument);
+ int columnIndex = tablePane.getColumnAt(xArgument);
namedActions.get("configureCell").setEnabled(rowIndex > 0 && columnIndex > 0);
namedActions.get("configureRow").setEnabled(rowIndex > 0);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java Tue May 15 11:14:38 2012
@@ -40,8 +40,8 @@ public class ListButtons extends Window
listButton.getListButtonSelectionListeners().add(new ListButtonSelectionListener.Adapter() {
@Override
- public void selectedItemChanged(ListButton listButton, Object previousSelectedItem) {
- Object selectedItem = listButton.getSelectedItem();
+ public void selectedItemChanged(ListButton listButtonArgument, Object previousSelectedItem) {
+ Object selectedItem = listButtonArgument.getSelectedItem();
if (selectedItem != null) {
// Get the image URL for the selected item
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java Tue May 15 11:14:38 2012
@@ -40,32 +40,32 @@ public class ListViews extends Window im
listView.getListViewSelectionListeners().add(new ListViewSelectionListener() {
@Override
- public void selectedRangeAdded(ListView listView, int rangeStart, int rangeEnd) {
- updateSelection(listView);
+ public void selectedRangeAdded(ListView listViewArgument, int rangeStart, int rangeEnd) {
+ updateSelection(listViewArgument);
}
@Override
- public void selectedRangeRemoved(ListView listView, int rangeStart, int rangeEnd) {
- updateSelection(listView);
+ public void selectedRangeRemoved(ListView listViewArgument, int rangeStart, int rangeEnd) {
+ updateSelection(listViewArgument);
}
@Override
- public void selectedRangesChanged(ListView listView, Sequence<Span> previousSelectedRanges) {
+ public void selectedRangesChanged(ListView listViewArgument, Sequence<Span> previousSelectedRanges) {
if (previousSelectedRanges != null
- && previousSelectedRanges != listView.getSelectedRanges()) {
- updateSelection(listView);
+ && previousSelectedRanges != listViewArgument.getSelectedRanges()) {
+ updateSelection(listViewArgument);
}
}
@Override
- public void selectedItemChanged(ListView listView, Object previousSelectedItem) {
+ public void selectedItemChanged(ListView listViewArgument, Object previousSelectedItem) {
// No-op
}
- private void updateSelection(ListView listView) {
+ private void updateSelection(ListView listViewArgument) {
String selectionText = "";
- Sequence<Span> selectedRanges = listView.getSelectedRanges();
+ Sequence<Span> selectedRanges = listViewArgument.getSelectedRanges();
for (int i = 0, n = selectedRanges.getLength(); i < n; i++) {
Span selectedRange = selectedRanges.get(i);
@@ -76,7 +76,7 @@ public class ListViews extends Window im
selectionText += ", ";
}
- Object item = listView.getListData().get(j);
+ Object item = listViewArgument.getListData().get(j);
String text;
if (item instanceof ListItem) { // item is a listItem (for example because it has an image)
text = ((ListItem) item).getText();
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java Tue May 15 11:14:38 2012
@@ -29,7 +29,7 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-public class Localization implements Application {
+public class Localization extends Application.Adapter {
private Window window = null;
public static final String LANGUAGE_KEY = "language";
@@ -70,15 +70,8 @@ public class Localization implements App
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public static void main(String[] args) {
DesktopApplicationContext.main(Localization.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java Tue May 15 11:14:38 2012
@@ -145,5 +145,6 @@ public class MenuBars extends Frame impl
@Override
public void initialize(Map<String, Object> namespace, URL location, Resources resources) {
+ // empty block
}
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java Tue May 15 11:14:38 2012
@@ -38,17 +38,17 @@ public class Accordions extends Window i
private int selectedIndex = -1;
@Override
- public Vote previewSelectedIndexChange(Accordion accordion, int selectedIndex) {
- this.selectedIndex = selectedIndex;
+ public Vote previewSelectedIndexChange(Accordion accordionArgument, int selectedIndexArgument) {
+ this.selectedIndex = selectedIndexArgument;
// Enable the next panel or disable the previous panel so the
// transition looks smoother
- if (selectedIndex != -1) {
- int previousSelectedIndex = accordion.getSelectedIndex();
- if (selectedIndex > previousSelectedIndex) {
- accordion.getPanels().get(selectedIndex).setEnabled(true);
+ if (selectedIndexArgument != -1) {
+ int previousSelectedIndex = accordionArgument.getSelectedIndex();
+ if (selectedIndexArgument > previousSelectedIndex) {
+ accordionArgument.getPanels().get(selectedIndexArgument).setEnabled(true);
} else {
- accordion.getPanels().get(previousSelectedIndex).setEnabled(false);
+ accordionArgument.getPanels().get(previousSelectedIndex).setEnabled(false);
}
}
@@ -57,16 +57,16 @@ public class Accordions extends Window i
}
@Override
- public void selectedIndexChangeVetoed(Accordion accordion, Vote reason) {
+ public void selectedIndexChangeVetoed(Accordion accordionArgument, Vote reason) {
if (reason == Vote.DENY
&& selectedIndex != -1) {
- Component panel = accordion.getPanels().get(selectedIndex);
+ Component panel = accordionArgument.getPanels().get(selectedIndex);
panel.setEnabled(!panel.isEnabled());
}
}
@Override
- public void selectedIndexChanged(Accordion accordion, int previousSelection) {
+ public void selectedIndexChanged(Accordion accordionArgument, int previousSelection) {
updateAccordion();
}
});
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java Tue May 15 11:14:38 2012
@@ -62,7 +62,7 @@ public class CardPanes extends Window im
cardPane.getCardPaneListeners().add(new CardPaneListener.Adapter() {
@Override
- public void selectedIndexChanged(CardPane cardPane, int previousSelectedIndex) {
+ public void selectedIndexChanged(CardPane cardPaneArgument, int previousSelectedIndex) {
updateLinkButtonState();
}
});
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Ruler.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Ruler.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Ruler.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/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/navigation/RulerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/RulerSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/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/navigation/TabPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java Tue May 15 11:14:38 2012
@@ -58,7 +58,7 @@ public class TabPanes extends Window imp
tabPane.getTabPaneListeners().add(new TabPaneListener.Adapter() {
@Override
- public Vote previewRemoveTabs(final TabPane tabPane, final int index, final int count) {
+ public Vote previewRemoveTabs(final TabPane tabPaneArgument, final int index, final int count) {
Vote vote;
if (confirmCloseTab) {
confirmCloseTabPrompt.open(TabPanes.this, new SheetCloseListener() {
@@ -68,14 +68,14 @@ public class TabPanes extends Window imp
&& confirmCloseTabPrompt.getSelectedOptionIndex() == 1) {
confirmCloseTab = false;
- int n = tabPane.getTabs().getLength();
+ int n = tabPaneArgument.getTabs().getLength();
if (index < n - 1) {
- tabPane.setSelectedIndex(index + 1);
+ tabPaneArgument.setSelectedIndex(index + 1);
} else {
- tabPane.setSelectedIndex(index - 1);
+ tabPaneArgument.setSelectedIndex(index - 1);
}
- tabPane.getTabs().remove(index, count);
+ tabPaneArgument.getTabs().remove(index, count);
confirmCloseTab = true;
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java Tue May 15 11:14:38 2012
@@ -26,7 +26,7 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-public class Scripting implements Application {
+public class Scripting extends Application.Adapter {
public static class MyButtonPressListener implements ButtonPressListener {
@Override
public void buttonPressed(Button button) {
@@ -64,15 +64,8 @@ public class Scripting implements Applic
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public static void main(String[] args) {
DesktopApplicationContext.main(Scripting.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java Tue May 15 11:14:38 2012
@@ -28,7 +28,7 @@ import org.apache.pivot.wtk.Display;
/**
* Stock Tracker application.
*/
-public class StockTracker implements Application {
+public class StockTracker extends Application.Adapter {
private StockTrackerWindow window = null;
public static final String LANGUAGE_KEY = "language";
@@ -54,15 +54,8 @@ public class StockTracker implements App
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public static void main(String[] args) {
DesktopApplicationContext.main(StockTracker.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/DateBindMapping.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/DateBindMapping.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/DateBindMapping.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/DateBindMapping.java Tue May 15 11:14:38 2012
@@ -25,11 +25,13 @@ import org.apache.pivot.wtk.content.Cale
* Maps string values to calendar dates and vice versa.
*/
public class DateBindMapping implements Spinner.ItemBindMapping {
+ @Override
public int indexOf(List<?> spinnerData, Object value) {
CalendarDateSpinnerData calendarDateSpinnerData = (CalendarDateSpinnerData)spinnerData;
return calendarDateSpinnerData.indexOf(CalendarDate.decode((String)value));
}
+ @Override
public Object get(List<?> spinnerData, int index) {
return spinnerData.get(index).toString();
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java Tue May 15 11:14:38 2012
@@ -28,7 +28,7 @@ import org.apache.pivot.wtk.Display;
/**
* Query servlet tutorial client application.
*/
-public class Expenses implements Application {
+public class Expenses extends Application.Adapter {
private String hostname = null;
private int port = 0;
private boolean secure = false;
@@ -88,14 +88,6 @@ public class Expenses implements Applica
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public String getHostname() {
return hostname;
}
@@ -111,4 +103,5 @@ public class Expenses implements Applica
public static void main(String[] args) {
DesktopApplicationContext.main(Expenses.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java Tue May 15 11:14:38 2012
@@ -169,10 +169,10 @@ public class ExpensesWindow extends Wind
}
private void refreshExpenseList() {
- Expenses expensesApplication = getExpensesApplication();
- GetQuery expenseListQuery = new GetQuery(expensesApplication.getHostname(),
- expensesApplication.getPort(), "/pivot-tutorials/expenses",
- expensesApplication.isSecure()
+ Expenses expensesApplicationLocal = getExpensesApplication();
+ GetQuery expenseListQuery = new GetQuery(expensesApplicationLocal.getHostname(),
+ expensesApplicationLocal.getPort(), "/pivot-tutorials/expenses",
+ expensesApplicationLocal.isSecure()
);
activityIndicatorBoxPane.setVisible(true);
@@ -210,10 +210,10 @@ public class ExpensesWindow extends Wind
expenseSheet.store(expense);
// POST expense to server and then add to table
- Expenses expensesApplication = getExpensesApplication();
- PostQuery addExpenseQuery = new PostQuery(expensesApplication.getHostname(),
- expensesApplication.getPort(), "/pivot-tutorials/expenses",
- expensesApplication.isSecure()
+ Expenses expensesApplicationLocal = getExpensesApplication();
+ PostQuery addExpenseQuery = new PostQuery(expensesApplicationLocal.getHostname(),
+ expensesApplicationLocal.getPort(), "/pivot-tutorials/expenses",
+ expensesApplicationLocal.isSecure()
);
addExpenseQuery.setValue(expense);
@@ -259,16 +259,16 @@ public class ExpensesWindow extends Wind
public void sheetClosed(Sheet sheet) {
if (sheet.getResult()) {
// Get the expense data from the sheet
- final HashMap<String, Object> expense = new HashMap<String, Object>();
- expenseSheet.store(expense);
+ final HashMap<String, Object> expenseLocal = new HashMap<String, Object>();
+ expenseSheet.store(expenseLocal);
// PUT expense to server and then update table
- Expenses expensesApplication = getExpensesApplication();
- PutQuery updateExpenseQuery = new PutQuery(expensesApplication.getHostname(),
- expensesApplication.getPort(), "/pivot-tutorials/expenses/" + JSON.get(expense, "id"),
- expensesApplication.isSecure()
+ Expenses expensesApplicationLocal = getExpensesApplication();
+ PutQuery updateExpenseQuery = new PutQuery(expensesApplicationLocal.getHostname(),
+ expensesApplicationLocal.getPort(), "/pivot-tutorials/expenses/" + JSON.get(expenseLocal, "id"),
+ expensesApplicationLocal.isSecure()
);
- updateExpenseQuery.setValue(expense);
+ updateExpenseQuery.setValue(expenseLocal);
activityIndicatorBoxPane.setVisible(true);
activityIndicator.setActive(true);
@@ -283,7 +283,7 @@ public class ExpensesWindow extends Wind
List<Object> expenses = (List<Object>)expenseTableView.getTableData();
for (int i = 0, n = expenses.getLength(); i < n; i++) {
if (JSON.get(expenses.get(i), "id").equals(id)) {
- expenses.update(i, expense);
+ expenses.update(i, expenseLocal);
break;
}
}
@@ -313,10 +313,10 @@ public class ExpensesWindow extends Wind
if (sheet.getResult()
&& ((Prompt)sheet).getSelectedOptionIndex() == 1) {
// DELETE expense from server and then remove from table
- Expenses expensesApplication = getExpensesApplication();
- DeleteQuery deleteExpenseQuery = new DeleteQuery(expensesApplication.getHostname(),
- expensesApplication.getPort(), "/pivot-tutorials/expenses/" + id,
- expensesApplication.isSecure()
+ Expenses expensesApplicationLocal = getExpensesApplication();
+ DeleteQuery deleteExpenseQuery = new DeleteQuery(expensesApplicationLocal.getHostname(),
+ expensesApplicationLocal.getPort(), "/pivot-tutorials/expenses/" + id,
+ expensesApplicationLocal.isSecure()
);
activityIndicatorBoxPane.setVisible(true);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java Tue May 15 11:14:38 2012
@@ -34,7 +34,7 @@ import org.apache.pivot.wtk.Window;
/**
* Web query tutorial application.
*/
-public class WebQueries implements Application {
+public class WebQueries extends Application.Adapter {
private Window window = null;
private ListView listView = null;
@@ -84,15 +84,8 @@ public class WebQueries implements Appli
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public static void main(String[] args) {
DesktopApplicationContext.main(WebQueries.class, args);
}
+
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java?rev=1338649&r1=1338648&r2=1338649&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java Tue May 15 11:14:38 2012
@@ -27,12 +27,12 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtk.Window;
-public class Windows implements Application {
+public class Windows extends Application.Adapter {
private Display display = null;
@Override
- public void startup(Display display, Map<String, String> properties) throws Exception {
- this.display = display;
+ public void startup(Display displayArgument, Map<String, String> properties) throws Exception {
+ this.display = displayArgument;
int x = 0;
int y = 0;
@@ -55,7 +55,7 @@ public class Windows implements Applicat
x += 20;
y += 20;
- frame.open(display);
+ frame.open(displayArgument);
}
}
@@ -69,14 +69,6 @@ public class Windows implements Applicat
return false;
}
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
public Window load(String fileName)
throws SerializationException, IOException {
BXMLSerializer bxmlSerializer = new BXMLSerializer();
@@ -86,4 +78,5 @@ public class Windows implements Applicat
public static void main(String[] args) {
DesktopApplicationContext.main(Windows.class, args);
}
+
}