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/07/04 22:14:06 UTC
svn commit: r960388 [2/2] - in /pivot/trunk: ./
demos/src/org/apache/pivot/demos/clock/
demos/src/org/apache/pivot/demos/decorator/
demos/src/org/apache/pivot/demos/itunes/
demos/src/org/apache/pivot/demos/json/
demos/src/org/apache/pivot/demos/million...
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -93,12 +93,12 @@ public class MenuBars extends Frame impl
Action.getNamedActions().put("fileNew", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put("menuHandler", menuHandler);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put("menuHandler", menuHandler);
Component tab;
try {
- tab = new Border((Component)beanSerializer.readObject(this, "document.bxml"));
+ tab = new Border((Component)bxmlSerializer.readObject(this, "document.bxml"));
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -42,12 +42,12 @@ public class Scripting implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put("bar", "12345");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put("bar", "12345");
- window = (Window)beanSerializer.readObject(this, "scripting.bxml");
- foo = (String)beanSerializer.getNamespace().get("foo");
- listData = (List<?>)beanSerializer.getNamespace().get("listData");
+ window = (Window)bxmlSerializer.readObject(this, "scripting.bxml");
+ foo = (String)bxmlSerializer.getNamespace().get("foo");
+ listData = (List<?>)bxmlSerializer.getNamespace().get("listData");
System.out.println("foo = " + foo);
System.out.println("listData.getLength() = " + listData.getLength());
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -41,8 +41,8 @@ public class StockTracker implements App
}
Resources resources = new Resources(StockTrackerWindow.class.getName());
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
- window = (StockTrackerWindow)beanSerializer.readObject(this, "stock_tracker_window.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
+ window = (StockTrackerWindow)bxmlSerializer.readObject(this, "stock_tracker_window.bxml");
window.open(display);
}
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -69,8 +69,8 @@ public class Expenses implements Applica
secure = origin.getProtocol().equals("HTTPS");
}
- BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(ExpensesWindow.class.getName()));
- expensesWindow = (ExpensesWindow)beanSerializer.readObject(this, "expenses_window.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(new Resources(ExpensesWindow.class.getName()));
+ expensesWindow = (ExpensesWindow)bxmlSerializer.readObject(this, "expenses_window.bxml");
expensesWindow.open(display);
}
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -123,8 +123,8 @@ public class ExpensesWindow extends Wind
// Load the add/edit sheet
try {
- BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(ExpenseSheet.class.getName()));
- expenseSheet = (ExpenseSheet)beanSerializer.readObject(this, "expense_sheet.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(new Resources(ExpenseSheet.class.getName()));
+ expenseSheet = (ExpenseSheet)bxmlSerializer.readObject(this, "expense_sheet.bxml");
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -41,11 +41,11 @@ public class WebQueries implements Appli
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "web_queries.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "web_queries.bxml");
- listView = (ListView)beanSerializer.getNamespace().get("listView");
- loadingLabel = (Label)beanSerializer.getNamespace().get("loadingLabel");
+ listView = (ListView)bxmlSerializer.getNamespace().get("listView");
+ loadingLabel = (Label)bxmlSerializer.getNamespace().get("loadingLabel");
// Execute the query:
// http://pipes.yahoo.com/pipes/pipe.run?_id=43115761f2da5af5341ae2e56a93d646&_render=json
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -38,12 +38,12 @@ public class Windows implements Applicat
int y = 0;
for (int i = 0; i < 3; i++) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put("application", this);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put("application", this);
Frame frame;
try {
- frame = (Frame)beanSerializer.readObject(Windows.this, "frame.bxml");
+ frame = (Frame)bxmlSerializer.readObject(Windows.this, "frame.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
@@ -79,8 +79,8 @@ public class Windows implements Applicat
public Window load(String fileName)
throws SerializationException, IOException {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- return (Window)beanSerializer.readObject(this, fileName);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ return (Window)bxmlSerializer.readObject(this, fileName);
}
public static void main(String[] args) {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Sun Jul 4 20:14:04 2010
@@ -98,21 +98,21 @@ public class TerraAlertSkin extends Terr
alert.getAlertListeners().add(this);
// Load the alert content
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Component content;
try {
- content = (Component)beanSerializer.readObject(this, "terra_alert_skin.bxml");
+ content = (Component)bxmlSerializer.readObject(this, "terra_alert_skin.bxml");
} catch(Exception exception) {
throw new RuntimeException(exception);
}
alert.setContent(content);
- typeImageView = (ImageView)beanSerializer.getNamespace().get("typeImageView");
- messageLabel = (Label)beanSerializer.getNamespace().get("messageLabel");
- messageBoxPane = (BoxPane)beanSerializer.getNamespace().get("messageBoxPane");
- optionButtonBoxPane = (BoxPane)beanSerializer.getNamespace().get("optionButtonBoxPane");
+ typeImageView = (ImageView)bxmlSerializer.getNamespace().get("typeImageView");
+ messageLabel = (Label)bxmlSerializer.getNamespace().get("messageLabel");
+ messageBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("messageBoxPane");
+ optionButtonBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("optionButtonBoxPane");
for (Object option : alert.getOptions()) {
PushButton optionButton = new PushButton(option);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Sun Jul 4 20:14:04 2010
@@ -94,11 +94,11 @@ public class TerraFileBrowserSheetSkin e
throw new RuntimeException(exception);
}
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
Component content;
try {
- content = (Component)beanSerializer.readObject(this, "terra_file_browser_sheet_skin.bxml");
+ content = (Component)bxmlSerializer.readObject(this, "terra_file_browser_sheet_skin.bxml");
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
@@ -107,7 +107,7 @@ public class TerraFileBrowserSheetSkin e
fileBrowserSheet.setContent(content);
- beanSerializer.bind(this, TerraFileBrowserSheetSkin.class);
+ bxmlSerializer.bind(this, TerraFileBrowserSheetSkin.class);
saveAsTextInput.getTextInputTextListeners().add(new TextInputTextListener.Adapter() {
@Override
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Sun Jul 4 20:14:04 2010
@@ -582,9 +582,9 @@ public class TerraFileBrowserSkin extend
throw new RuntimeException(exception);
}
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
try {
- content = (Component)beanSerializer.readObject(this, "terra_file_browser_skin.bxml");
+ content = (Component)bxmlSerializer.readObject(this, "terra_file_browser_skin.bxml");
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
@@ -593,7 +593,7 @@ public class TerraFileBrowserSkin extend
fileBrowser.add(content);
- beanSerializer.bind(this, TerraFileBrowserSkin.class);
+ bxmlSerializer.bind(this, TerraFileBrowserSkin.class);
driveListButton.getListButtonSelectionListeners().add(new ListButtonSelectionListener() {
@Override
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Sun Jul 4 20:14:04 2010
@@ -91,21 +91,21 @@ public class TerraPromptSkin extends Ter
prompt.getPromptListeners().add(this);
// Load the prompt content
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Component content;
try {
- content = (Component)beanSerializer.readObject(this, "terra_prompt_skin.bxml");
+ content = (Component)bxmlSerializer.readObject(this, "terra_prompt_skin.bxml");
} catch(Exception exception) {
throw new RuntimeException(exception);
}
prompt.setContent(content);
- typeImageView = (ImageView)beanSerializer.getNamespace().get("typeImageView");
- messageLabel = (Label)beanSerializer.getNamespace().get("messageLabel");
- messageBoxPane = (BoxPane)beanSerializer.getNamespace().get("messageBoxPane");
- optionButtonBoxPane = (BoxPane)beanSerializer.getNamespace().get("optionButtonBoxPane");
+ typeImageView = (ImageView)bxmlSerializer.getNamespace().get("typeImageView");
+ messageLabel = (Label)bxmlSerializer.getNamespace().get("messageLabel");
+ messageBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("messageBoxPane");
+ optionButtonBoxPane = (BoxPane)bxmlSerializer.getNamespace().get("optionButtonBoxPane");
for (Object option : prompt.getOptions()) {
PushButton optionButton = new PushButton(option);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java Sun Jul 4 20:14:04 2010
@@ -45,7 +45,7 @@ public class ScriptApplication implement
resources = new Resources(properties.get(RESOURCES_KEY));
}
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
URL location = classLoader.getResource(src);
@@ -61,8 +61,8 @@ public class ScriptApplication implement
throw new IllegalArgumentException("Cannot find source file \"" + src + "\".");
}
- beanSerializer.getNamespace().put("location", location);
- window = (Window)beanSerializer.readObject(location);
+ bxmlSerializer.getNamespace().put("location", location);
+ window = (Window)bxmlSerializer.readObject(location);
window.open(display);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java Sun Jul 4 20:14:04 2010
@@ -27,9 +27,9 @@ import org.apache.pivot.wtk.text.Node;
import org.apache.pivot.wtk.text.Paragraph;
class TextAreaSkinParagraphView extends TextAreaSkinElementView {
-
+
private static final int PARAGRAPH_TERMINATOR_WIDTH = 4;
-
+
private final TextAreaSkin textAreaSkin;
private class Row {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinTextNodeView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinTextNodeView.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinTextNodeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinTextNodeView.java Sun Jul 4 20:14:04 2010
@@ -41,7 +41,7 @@ import org.apache.pivot.wtk.text.TextNod
* Text node view.
*/
class TextAreaSkinTextNodeView extends TextAreaSkinNodeView implements TextNodeListener {
-
+
private final TextAreaSkin textAreaSkin;
private int start;