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/12/01 19:30:26 UTC
svn commit: r1041118 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/content/
Author: gbrown
Date: Wed Dec 1 18:30:25 2010
New Revision: 1041118
URL: http://svn.apache.org/viewvc?rev=1041118&view=rev
Log:
Revert editor interfaces to simpler edit() method.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Wed Dec 1 18:30:25 2010
@@ -940,11 +940,7 @@ public class TerraListViewSkin extends C
ListView.ItemEditor itemEditor = listView.getItemEditor();
if (itemEditor != null) {
- if (itemEditor.isEditing()) {
- itemEditor.endEdit(true);
- }
-
- itemEditor.beginEdit(listView, selectIndex);
+ itemEditor.edit(listView, selectIndex);
}
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Wed Dec 1 18:30:25 2010
@@ -1269,11 +1269,7 @@ public class TerraTableViewSkin extends
TableView.RowEditor rowEditor = tableView.getRowEditor();
if (rowEditor != null) {
- if (rowEditor.isEditing()) {
- rowEditor.endEdit(true);
- }
-
- rowEditor.beginEdit(tableView, selectIndex, getColumnAt(x));
+ rowEditor.edit(tableView, selectIndex, getColumnAt(x));
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed Dec 1 18:30:25 2010
@@ -1725,11 +1725,7 @@ public class TerraTreeViewSkin extends C
TreeView.NodeEditor nodeEditor = treeView.getNodeEditor();
if (nodeEditor != null) {
- if (nodeEditor.isEditing()) {
- nodeEditor.endEdit(true);
- }
-
- nodeEditor.beginEdit(treeView, selectPath);
+ nodeEditor.edit(treeView, selectPath);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Wed Dec 1 18:30:25 2010
@@ -119,19 +119,7 @@ public class ListView extends Component
* @param listView
* @param itemIndex
*/
- public void beginEdit(ListView listView, int itemIndex);
-
- /**
- * Called to terminate an edit operation.
- *
- * @param result
- */
- public void endEdit(boolean result);
-
- /**
- * Tests the current edit state.
- */
- public boolean isEditing();
+ public void edit(ListView listView, int itemIndex);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Wed Dec 1 18:30:25 2010
@@ -594,19 +594,7 @@ public class TableView extends Component
* @param rowIndex
* @param columnIndex
*/
- public void beginEdit(TableView tableView, int rowIndex, int columnIndex);
-
- /**
- * Called to terminate an edit operation.
- *
- * @param result
- */
- public void endEdit(boolean result);
-
- /**
- * Tests the current edit state.
- */
- public boolean isEditing();
+ public void edit(TableView tableView, int rowIndex, int columnIndex);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Wed Dec 1 18:30:25 2010
@@ -152,19 +152,7 @@ public class TreeView extends Component
* @param treeView
* @param path
*/
- public void beginEdit(TreeView treeView, Path path);
-
- /**
- * Called to terminate an edit operation.
- *
- * @param result
- */
- public void endEdit(boolean result);
-
- /**
- * Tests the current edit state.
- */
- public boolean isEditing();
+ public void edit(TreeView treeView, Path path);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ListViewItemEditor.java Wed Dec 1 18:30:25 2010
@@ -80,7 +80,7 @@ public class ListViewItemEditor extends
}
@Override
- public void beginEdit(ListView listView, int itemIndex) {
+ public void edit(ListView listView, int itemIndex) {
this.listView = listView;
this.itemIndex = itemIndex;
@@ -88,16 +88,6 @@ public class ListViewItemEditor extends
}
@Override
- public void endEdit(boolean result) {
- close(result);
- }
-
- @Override
- public boolean isEditing() {
- return isOpen();
- }
-
- @Override
public void open(Display display, Window owner) {
if (owner == null) {
throw new IllegalArgumentException();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TableViewRowEditor.java Wed Dec 1 18:30:25 2010
@@ -171,7 +171,7 @@ public class TableViewRowEditor extends
}
@Override
- public void beginEdit(TableView tableView, int rowIndex, int columnIndex) {
+ public void edit(TableView tableView, int rowIndex, int columnIndex) {
this.tableView = tableView;
this.rowIndex = rowIndex;
this.columnIndex = columnIndex;
@@ -182,16 +182,6 @@ public class TableViewRowEditor extends
open(tableView.getWindow());
}
- @Override
- public void endEdit(boolean result) {
- close(result);
- }
-
- @Override
- public boolean isEditing() {
- return isOpen();
- }
-
/**
* Gets the effect that this editor uses when changing from a read-only
* row to an editable row. By default, this editor uses no effect.
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java?rev=1041118&r1=1041117&r2=1041118&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/TreeViewNodeEditor.java Wed Dec 1 18:30:25 2010
@@ -82,7 +82,7 @@ public class TreeViewNodeEditor extends
}
@Override
- public void beginEdit(TreeView treeView, Path path) {
+ public void edit(TreeView treeView, Path path) {
this.treeView = treeView;
this.path = path;
@@ -90,16 +90,6 @@ public class TreeViewNodeEditor extends
}
@Override
- public void endEdit(boolean result) {
- close(result);
- }
-
- @Override
- public boolean isEditing() {
- return isOpen();
- }
-
- @Override
public void open(Display display, Window owner) {
if (owner == null) {
throw new IllegalArgumentException();