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 2009/05/07 23:25:01 UTC
svn commit: r772779 - in /incubator/pivot/trunk:
tutorials/src/pivot/tutorials/ tutorials/src/pivot/tutorials/stocktracker/
wtk/src/pivot/wtkx/
Author: gbrown
Date: Thu May 7 21:25:01 2009
New Revision: 772779
URL: http://svn.apache.org/viewvc?rev=772779&view=rev
Log:
Rename @Bind "id" property to "name" for consistency with getObjectByName() method.
Modified:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java?rev=772779&r1=772778&r2=772779&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java Thu May 7 21:25:01 2009
@@ -261,7 +261,7 @@
@Load(name="menus.wtkx") private Component component;
@Bind(property="component") private ImageView menuImageView;
- @Bind(property="component", id="menubar.helpAboutMenuItem")
+ @Bind(property="component", name="menubar.helpAboutMenuItem")
private Menu.Item helpAboutMenuItem;
@Load(name="menu_popup.wtkx") private MenuPopup menuPopup;
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java?rev=772779&r1=772778&r2=772779&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java Thu May 7 21:25:01 2009
@@ -65,10 +65,10 @@
@Bind(property="window") private Label lastUpdateLabel;
@Bind(property="window") private Button yahooFinanceButton;
- @Bind(property="window", id="detail.rootPane")
+ @Bind(property="window", name="detail.rootPane")
private Container detailRootPane;
- @Bind(property="window", id="detail.changeLabel")
+ @Bind(property="window", name="detail.changeLabel")
private Label detailChangeLabel;
private GetQuery getQuery = null;
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java?rev=772779&r1=772778&r2=772779&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java Thu May 7 21:25:01 2009
@@ -147,7 +147,7 @@
Element bindElement = bindField.sym;
Bindable.Bind bindAnnotation = bindElement.getAnnotation(Bindable.Bind.class);
- String bindID = bindAnnotation.id();
+ String bindID = bindAnnotation.name();
if ("\0".equals(bindID)) {
// The bind ID defaults to the field name
bindID = bindFieldName;
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java?rev=772779&r1=772778&r2=772779&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java Thu May 7 21:25:01 2009
@@ -60,7 +60,7 @@
@Target(ElementType.FIELD)
protected static @interface Bind {
public String property();
- public String id() default "\0";
+ public String name() default "\0";
}
/**
@@ -194,7 +194,7 @@
throw new BindException("Property \"" + property + "\" has not been loaded.");
}
- String id = bindAnnotation.id();
+ String id = bindAnnotation.name();
if (id.equals("\0")) {
id = field.getName();
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java?rev=772779&r1=772778&r2=772779&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java Thu May 7 21:25:01 2009
@@ -102,8 +102,6 @@
private Object scriptEngineManager;
private Class<?> scriptEngineManagerClass;
- private static int tmpVariableCounter = 0;
-
public static final char URL_PREFIX = '@';
public static final char RESOURCE_KEY_PREFIX = '%';
public static final char OBJECT_REFERENCE_PREFIX = '$';
@@ -662,7 +660,6 @@
"new pivot.collections.HashMap<String, Object>();\n");
// Parse the XML stream
- Element element = null;
try {
XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(inputStream);