You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/05/14 17:32:54 UTC
svn commit: r774824 [2/2] - in /incubator/pivot/trunk:
demos/src/pivot/demos/clock/ demos/src/pivot/demos/decorator/
demos/src/pivot/demos/dnd/ demos/src/pivot/demos/dom/
demos/src/pivot/demos/million/ demos/src/pivot/demos/roweditor/
demos/src/pivot/d...
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/test/TextInputValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/test/TextInputValidatorTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/test/TextInputValidatorTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/test/TextInputValidatorTest.java Thu May 14 15:32:51 2009
@@ -45,10 +45,10 @@
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = new Window((Component)wtkxSerializer.readObject(
getClass().getResource("textInputValidator_test.wtkx")));
- textinputFloatRange = (TextInput)wtkxSerializer.getObjectByName("textinputFloatRange");
- textinputIntRange = (TextInput)wtkxSerializer.getObjectByName("textinputIntRange");
- textinputDateRegex = (TextInput)wtkxSerializer.getObjectByName("textinputDateRegex");
- textinputCustomBoolean = (TextInput)wtkxSerializer.getObjectByName("textinputCustomBoolean");
+ textinputFloatRange = (TextInput)wtkxSerializer.getObjectByID("textinputFloatRange");
+ textinputIntRange = (TextInput)wtkxSerializer.getObjectByID("textinputIntRange");
+ textinputDateRegex = (TextInput)wtkxSerializer.getObjectByID("textinputDateRegex");
+ textinputCustomBoolean = (TextInput)wtkxSerializer.getObjectByID("textinputCustomBoolean");
// standard float range model
textinputFloatRange.setText("0.5");
@@ -82,7 +82,7 @@
}
});
- invalidLabel = (Label)wtkxSerializer.getObjectByName("invalidLabel");
+ invalidLabel = (Label)wtkxSerializer.getObjectByID("invalidLabel");
// standard int range model
textinputIntRange.setText("0");
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/TextAreaTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/TextAreaTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/TextAreaTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/TextAreaTest.java Thu May 14 15:32:51 2009
@@ -73,7 +73,7 @@
frame.setPreferredSize(640, 480);
frame.open(display);
- textArea = (TextArea)wtkxSerializer.getObjectByName("textArea");
+ textArea = (TextArea)wtkxSerializer.getObjectByID("textArea");
textArea.getTextAreaSelectionListeners().add(new TextAreaSelectionListener() {
public void selectionChanged(TextArea textArea,
int previousSelectionStart, int previousSelectionLength) {
@@ -82,10 +82,10 @@
}
});
- selectionStartLabel = (Label)wtkxSerializer.getObjectByName("selectionStartLabel");
- selectionLengthLabel = (Label)wtkxSerializer.getObjectByName("selectionLengthLabel");
+ selectionStartLabel = (Label)wtkxSerializer.getObjectByID("selectionStartLabel");
+ selectionLengthLabel = (Label)wtkxSerializer.getObjectByID("selectionLengthLabel");
- treeView = (TreeView)wtkxSerializer.getObjectByName("treeView");
+ treeView = (TreeView)wtkxSerializer.getObjectByID("treeView");
treeView.getTreeViewSelectionListeners().add(new TreeViewSelectionListener() {
public void selectedPathAdded(TreeView treeView, Path path) {
// No-op
@@ -118,8 +118,8 @@
}
});
- offsetLabel = (Label)wtkxSerializer.getObjectByName("offsetLabel");
- charactersLabel = (Label)wtkxSerializer.getObjectByName("charactersLabel");
+ offsetLabel = (Label)wtkxSerializer.getObjectByID("offsetLabel");
+ charactersLabel = (Label)wtkxSerializer.getObjectByID("charactersLabel");
documentAdapter = new DocumentAdapter(textArea.getDocument());
treeView.setTreeData(documentAdapter);
Modified: incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestA.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestA.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestA.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestA.java Thu May 14 15:32:51 2009
@@ -4,6 +4,6 @@
import pivot.wtkx.Bindable;
public class BindTestA extends Bindable {
- @Load(name="bind_test.wtkx")
+ @Load(resourceName="bind_test.wtkx")
protected Window window;
}
Modified: incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestB.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestB.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestB.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestB.java Thu May 14 15:32:51 2009
@@ -3,7 +3,7 @@
import pivot.wtk.PushButton;
public class BindTestB extends BindTestA {
- @Bind(property="window")
+ @Bind(fieldName="window")
private static PushButton pushButton;
public static void main(String[] args) throws Exception{