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/09/05 20:30:49 UTC
svn commit: r992853 - in /pivot/trunk: charts/src/org/apache/pivot/charts/
core/src/org/apache/pivot/json/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/ wtk/src/org/apache/pivot/wtk/
Author: gbrown
Date: Sun Sep 5 18:30:47 2010
New Revision: 992853
URL: http://svn.apache.org/viewvc?rev=992853&view=rev
Log:
Rename Component#installThemeSkin() to installSkin(); update ChartView to simply override this method rather than defining its own installChartSkin() method; update JSON to look for bean properties first, then Sequence/Dictionary properties.
Modified:
pivot/trunk/charts/src/org/apache/pivot/charts/AreaChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/BarChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/HighLowChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/LineChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/PieChartView.java
pivot/trunk/charts/src/org/apache/pivot/charts/Provider.java
pivot/trunk/core/src/org/apache/pivot/json/JSON.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Checkbox.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Expander.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Frame.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/LinkButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Palette.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Panel.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Panorama.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Separator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/StackPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea2.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Tooltip.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/AreaChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/AreaChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/AreaChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/AreaChartView.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.charts;
*/
public class AreaChartView extends ChartView {
public AreaChartView() {
- installChartSkin(AreaChartView.class);
+ installSkin(AreaChartView.class);
}
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/BarChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/BarChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/BarChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/BarChartView.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.charts;
*/
public class BarChartView extends ChartView {
public BarChartView() {
- installChartSkin(BarChartView.class);
+ installSkin(BarChartView.class);
}
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/ChartView.java Sun Sep 5 18:30:47 2010
@@ -400,7 +400,7 @@ public abstract class ChartView extends
private ChartViewSeriesListenerList chartViewSeriesListeners = new ChartViewSeriesListenerList();
public static final String DEFAULT_SERIES_NAME_KEY = "name";
- public static final String PROVIDER_NAME = "org.apache.pivot.charts.Provider";
+ public static final String PROVIDER_NAME = Provider.class.getName();
private static Provider provider = null;
@@ -423,8 +423,11 @@ public abstract class ChartView extends
setShowLegend(showLegend);
}
- protected final void installChartSkin(Class<? extends ChartView> chartViewClass) {
- Class<? extends org.apache.pivot.wtk.Skin> skinClass = provider.getSkinClass(chartViewClass);
+ @Override
+ @SuppressWarnings("unchecked")
+ protected void installSkin(Class<? extends Component> componentClass) {
+ Class<? extends org.apache.pivot.wtk.Skin> skinClass =
+ provider.getSkinClass((Class<? extends ChartView>)componentClass);
try {
setSkin(skinClass.newInstance());
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/HighLowChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/HighLowChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/HighLowChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/HighLowChartView.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.charts;
*/
public class HighLowChartView extends ChartView {
public HighLowChartView() {
- installChartSkin(HighLowChartView.class);
+ installSkin(HighLowChartView.class);
}
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/LineChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/LineChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/LineChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/LineChartView.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.charts;
*/
public class LineChartView extends ChartView {
public LineChartView() {
- installChartSkin(LineChartView.class);
+ installSkin(LineChartView.class);
}
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/PieChartView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/PieChartView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/PieChartView.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/PieChartView.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.charts;
*/
public class PieChartView extends ChartView {
public PieChartView() {
- installChartSkin(PieChartView.class);
+ installSkin(PieChartView.class);
}
}
Modified: pivot/trunk/charts/src/org/apache/pivot/charts/Provider.java
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/src/org/apache/pivot/charts/Provider.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/charts/src/org/apache/pivot/charts/Provider.java (original)
+++ pivot/trunk/charts/src/org/apache/pivot/charts/Provider.java Sun Sep 5 18:30:47 2010
@@ -19,8 +19,8 @@ package org.apache.pivot.charts;
import org.apache.pivot.wtk.Skin;
/**
- * Provides a mapping from concrete chart component classes to chart skins.
+ * Provides a mapping from a concrete component class to a skin class.
*/
public interface Provider {
- public abstract Class<? extends Skin> getSkinClass(Class<? extends ChartView> chartViewClass);
+ public abstract Class<? extends Skin> getSkinClass(Class<? extends ChartView> componentClass);
}
Modified: pivot/trunk/core/src/org/apache/pivot/json/JSON.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/json/JSON.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/json/JSON.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/json/JSON.java Sun Sep 5 18:30:47 2010
@@ -26,7 +26,7 @@ import org.apache.pivot.collections.Sequ
*/
public class JSON {
/**
- * Returns the value at the given path.
+ * Returns the value at a given path.
*
* @param root
* The root object.
@@ -41,55 +41,47 @@ public class JSON {
*/
@SuppressWarnings("unchecked")
public static <T> T get(Object root, String path) {
- if (root == null) {
- throw new IllegalArgumentException("root is null.");
- }
-
- if (path == null) {
- throw new IllegalArgumentException("path is null.");
- }
-
return (T)get(root, parse(path));
}
/**
- * Returns the value at a given index along a path.
+ * Returns the value at a given path.
*
* @param root
- * The root object; must be an instance of {@link org.apache.pivot.collections.Map}
- * or {@link org.apache.pivot.collections.List} or a Java bean object.
+ * The root object.
*
* @param keys
- * The path to the value, as a set of keys.
+ * The path to the value as a sequence of keys.
*
* @return
* The value at the given path.
*/
@SuppressWarnings("unchecked")
public static <T> T get(Object root, Sequence<String> keys) {
+ if (root == null) {
+ throw new IllegalArgumentException("root is null.");
+ }
+
+ if (keys == null) {
+ throw new IllegalArgumentException("keys is null.");
+ }
+
Object value = root;
for (int i = 0, n = keys.getLength(); i < n; i++) {
String key = keys.get(i);
- if (value instanceof Sequence<?>) {
+ BeanAdapter beanAdapter = new BeanAdapter(value);
+ if (beanAdapter.containsKey(key)) {
+ value = beanAdapter.get(key);
+ } else if (value instanceof Sequence<?>) {
Sequence<Object> sequence = (Sequence<Object>)value;
value = sequence.get(Integer.parseInt(key));
+ } else if (value instanceof Dictionary<?, ?>) {
+ Dictionary<String, Object> dictionary = (Dictionary<String, Object>)value;
+ value = dictionary.get(key);
} else {
- Dictionary<String, Object> dictionary;
- if (value instanceof Dictionary<?, ?>) {
- dictionary = (Dictionary<String, Object>)value;
- value = dictionary.get(key);
- } else {
- dictionary = new BeanAdapter(value);
- }
-
- if (dictionary.containsKey(key)) {
- value = dictionary.get(key);
- } else {
- value = null;
- break;
- }
+ throw new IllegalArgumentException("Property \"" + key + "\" not found.");
}
}
@@ -112,32 +104,26 @@ public class JSON {
throw new IllegalArgumentException("root is null.");
}
- if (path == null) {
- throw new IllegalArgumentException("path is null.");
- }
-
- Object previousValue;
-
Sequence<String> keys = parse(path);
if (keys.getLength() == 0) {
- throw new IllegalArgumentException("Bad path.");
+ throw new IllegalArgumentException("Path is empty.");
}
String key = keys.remove(keys.getLength() - 1, 1).get(0);
-
Object parent = get(root, keys);
- if (parent instanceof Sequence<?>) {
+ BeanAdapter beanAdapter = new BeanAdapter(parent);
+
+ Object previousValue;
+ if (beanAdapter.containsKey(key)) {
+ previousValue = beanAdapter.put(key, value);
+ } else if (parent instanceof Sequence<?>) {
Sequence<Object> sequence = (Sequence<Object>)parent;
previousValue = sequence.update(Integer.parseInt(key), value);
- } else {
- Dictionary<String, Object> dictionary;
- if (parent instanceof Dictionary<?, ?>) {
- dictionary = (Dictionary<String, Object>)parent;
- } else {
- dictionary = new BeanAdapter(parent);
- }
-
+ } else if (parent instanceof Dictionary<?, ?>) {
+ Dictionary<String, Object> dictionary = (Dictionary<String, Object>)parent;
previousValue = dictionary.put(key, value);
+ } else {
+ throw new IllegalArgumentException("Property \"" + key + "\" not found.");
}
return (T)previousValue;
@@ -158,32 +144,23 @@ public class JSON {
throw new IllegalArgumentException("root is null.");
}
- if (path == null) {
- throw new IllegalArgumentException("path is null.");
- }
-
- Object previousValue;
-
Sequence<String> keys = parse(path);
if (keys.getLength() == 0) {
- throw new IllegalArgumentException("Bad path.");
+ throw new IllegalArgumentException("Path is empty.");
}
String key = keys.remove(keys.getLength() - 1, 1).get(0);
-
Object parent = get(root, keys);
+
+ Object previousValue;
if (parent instanceof Sequence<?>) {
Sequence<Object> sequence = (Sequence<Object>)parent;
previousValue = sequence.remove(Integer.parseInt(key), 1).get(0);
- } else {
- Dictionary<String, Object> dictionary;
- if (parent instanceof Dictionary<?, ?>) {
- dictionary = (Dictionary<String, Object>)parent;
- } else {
- dictionary = new BeanAdapter(parent);
- }
-
+ } else if (parent instanceof Dictionary<?, ?>) {
+ Dictionary<String, Object> dictionary = (Dictionary<String, Object>)parent;
previousValue = dictionary.remove(key);
+ } else {
+ throw new IllegalArgumentException("Property \"" + key + "\" not found.");
}
return (T)previousValue;
@@ -204,32 +181,26 @@ public class JSON {
throw new IllegalArgumentException("root is null.");
}
- if (path == null) {
- throw new IllegalArgumentException("path is null.");
- }
-
- boolean containsKey;
-
Sequence<String> keys = parse(path);
if (keys.getLength() == 0) {
- throw new IllegalArgumentException("Bad path.");
+ throw new IllegalArgumentException("Path is empty.");
}
String key = keys.remove(keys.getLength() - 1, 1).get(0);
-
Object parent = get(root, keys);
- if (parent instanceof Sequence<?>) {
- Sequence<Object> sequence = (Sequence<Object>)parent;
- containsKey = (sequence.getLength() > Integer.parseInt(key));
- } else {
- Dictionary<String, Object> dictionary;
- if (parent instanceof Dictionary<?, ?>) {
- dictionary = (Dictionary<String, Object>)parent;
+ BeanAdapter beanAdapter = new BeanAdapter(parent);
+
+ boolean containsKey = beanAdapter.containsKey(key);
+ if (!containsKey) {
+ if (parent instanceof Sequence<?>) {
+ Sequence<Object> sequence = (Sequence<Object>)parent;
+ containsKey = (sequence.getLength() > Integer.parseInt(key));
+ } else if (parent instanceof Dictionary<?, ?>) {
+ Dictionary<String, Object> dictionary = (Dictionary<String, Object>)parent;
+ containsKey = dictionary.containsKey(key);
} else {
- dictionary = new BeanAdapter(parent);
+ throw new IllegalArgumentException("Property \"" + key + "\" not found.");
}
-
- containsKey = dictionary.containsKey(key);
}
return containsKey;
@@ -241,6 +212,10 @@ public class JSON {
* @param path
*/
public static Sequence<String> parse(String path) {
+ if (path == null) {
+ throw new IllegalArgumentException("path is null.");
+ }
+
ArrayList<String> keys = new ArrayList<String>();
int i = 0;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Sun Sep 5 18:30:47 2010
@@ -64,7 +64,7 @@ public class TerraFrameSkin extends Wind
public static class FrameButton extends PushButton {
public FrameButton(Object buttonData) {
super(buttonData);
- installThemeSkin(FrameButton.class);
+ installSkin(FrameButton.class);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java Sun Sep 5 18:30:47 2010
@@ -228,7 +228,7 @@ public class Accordion extends Container
private static final Button.DataRenderer DEFAULT_HEADER_DATA_RENDERER = new AccordionHeaderDataRenderer();
public Accordion() {
- installThemeSkin(Accordion.class);
+ installSkin(Accordion.class);
}
public PanelSequence getPanels() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java Sun Sep 5 18:30:47 2010
@@ -37,7 +37,7 @@ public class ActivityIndicator extends C
private ActivityIndicatorListenerList activityIndicatorListeners = new ActivityIndicatorListenerList();
public ActivityIndicator() {
- installThemeSkin(ActivityIndicator.class);
+ installSkin(ActivityIndicator.class);
}
public boolean isActive() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java Sun Sep 5 18:30:47 2010
@@ -213,7 +213,7 @@ public class Alert extends Dialog {
setOptions(options);
setTitle((String)resources.get("defaultTitle"));
- installThemeSkin(Alert.class);
+ installSkin(Alert.class);
}
public MessageType getMessageType() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java Sun Sep 5 18:30:47 2010
@@ -51,7 +51,7 @@ public class Border extends Container {
}
public Border(Component content) {
- installThemeSkin(Border.class);
+ installSkin(Border.class);
setContent(content);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java Sun Sep 5 18:30:47 2010
@@ -45,7 +45,7 @@ public class BoxPane extends Container {
public BoxPane(Orientation orientation) {
setOrientation(orientation);
- installThemeSkin(BoxPane.class);
+ installSkin(BoxPane.class);
}
public Orientation getOrientation() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java Sun Sep 5 18:30:47 2010
@@ -149,7 +149,7 @@ public class Calendar extends Container
this.year = year;
this.month = month;
- installThemeSkin(Calendar.class);
+ installSkin(Calendar.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Sun Sep 5 18:30:47 2010
@@ -150,7 +150,7 @@ public class CalendarButton extends Butt
this.month = month;
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(CalendarButton.class);
+ installSkin(CalendarButton.class);
setSelectedDate(new CalendarDate());
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java Sun Sep 5 18:30:47 2010
@@ -58,7 +58,7 @@ public class CardPane extends Container
private CardPaneListenerList cardPaneListeners = new CardPaneListenerList();
public CardPane() {
- installThemeSkin(CardPane.class);
+ installSkin(CardPane.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Checkbox.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Checkbox.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Checkbox.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Checkbox.java Sun Sep 5 18:30:47 2010
@@ -40,7 +40,7 @@ public class Checkbox extends Button {
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(Checkbox.class);
+ installSkin(Checkbox.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java Sun Sep 5 18:30:47 2010
@@ -105,7 +105,7 @@ public class ColorChooser extends Contai
new ColorChooserBindingListenerList();
public ColorChooser() {
- installThemeSkin(ColorChooser.class);
+ installSkin(ColorChooser.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Sun Sep 5 18:30:47 2010
@@ -108,7 +108,7 @@ public class ColorChooserButton extends
super(buttonData);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(ColorChooserButton.class);
+ installSkin(ColorChooserButton.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Sun Sep 5 18:30:47 2010
@@ -766,7 +766,7 @@ public abstract class Component implemen
* @param componentClass
*/
@SuppressWarnings("unchecked")
- protected final void installThemeSkin(Class<? extends Component> componentClass) {
+ protected void installSkin(Class<? extends Component> componentClass) {
// Walk up component hierarchy from this type; if we find a match
// and the super class equals the given component class, install
// the skin. Otherwise, ignore - it will be installed later by a
@@ -774,7 +774,8 @@ public abstract class Component implemen
Class<?> type = getClass();
Theme theme = Theme.getTheme();
- Class<? extends org.apache.pivot.wtk.Skin> skinClass = theme.getSkinClass((Class<? extends Component>)type);
+ Class<? extends org.apache.pivot.wtk.Skin> skinClass =
+ theme.getSkinClass((Class<? extends Component>)type);
while (skinClass == null
&& type != componentClass
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Sun Sep 5 18:30:47 2010
@@ -24,11 +24,9 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
-import java.io.File;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Locale;
import java.util.prefs.BackingStoreException;
@@ -362,6 +360,12 @@ public final class DesktopApplicationCon
public static final String MAXIMIZED_ARGUMENT = "maximized";
public static final String UNDECORATED_ARGUMENT = "undecorated";
public static final String FULL_SCREEN_ARGUMENT = "fullScreen";
+ public static final String ORIGIN_ARGUMENT = "origin";
+
+ private static final String INVALID_PROPERTY_FORMAT_MESSAGE = "\"%s\" is not a valid startup "
+ + "property (expected format is \"--name=value\").";
+ private static final String INVALID_PROPERTY_VALUE_MESSAGE = "\"%s\" is not a valid value for "
+ + "startup property \"%s\".";
public static boolean isActive() {
return (application != null);
@@ -468,9 +472,6 @@ public final class DesktopApplicationCon
System.err.println("Unable to retrieve startup preferences: " + exception);
}
- final String STARTUP_PROPERTY_WARNING = "\"%s\" is not a valid startup property (expected"
- + " format is \"--name=value\").";
-
for (int i = 1, n = args.length; i < n; i++) {
String arg = args[i];
@@ -501,48 +502,19 @@ public final class DesktopApplicationCon
undecorated = Boolean.parseBoolean(value);
} else if (key.equals(FULL_SCREEN_ARGUMENT)) {
fullScreen = Boolean.parseBoolean(value);
+ } else if (key.equals(ORIGIN_ARGUMENT)) {
+ origin = new URL(value);
} else {
properties.put(key, value);
}
- } catch (NumberFormatException exception) {
- System.err.println("\"" + value + "\" is not a valid value for startup"
- + " property \"" + key + "\".");
+ } catch (Exception exception) {
+ System.err.println(String.format(INVALID_PROPERTY_VALUE_MESSAGE, value, key));
}
} else {
- System.err.println(String.format(STARTUP_PROPERTY_WARNING, arg));
+ System.err.println(String.format(INVALID_PROPERTY_FORMAT_MESSAGE, arg));
}
} else {
- System.err.println(String.format(STARTUP_PROPERTY_WARNING, arg));
- }
- }
-
- // Set the origin
- try {
- // Load the JNLP classes dynamically because they are only available
- // when run via javaws
- Class<?> serviceManagerClass = Class.forName("javax.jnlp.ServiceManager");
- Method lookupMethod = serviceManagerClass.getMethod("lookup", String.class);
- Object basicService = lookupMethod.invoke(null, "javax.jnlp.BasicService");
-
- Class<?> basicServiceClass = Class.forName("javax.jnlp.BasicService");
- Method getCodeBaseMethod = basicServiceClass.getMethod("getCodeBase");
- URL codeBase = (URL)getCodeBaseMethod.invoke(basicService);
-
- if (codeBase != null) {
- origin = new URL(codeBase.getProtocol(), codeBase.getHost(), codeBase.getPort(), "");
- }
- } catch (Exception exception) {
- // No-op
- }
-
- if (origin == null) {
- // Could not obtain origin from JNLP; use user's home directory
- File userHome = new File(System.getProperty("user.home"));
-
- try {
- origin = userHome.toURI().toURL();
- } catch(MalformedURLException exception) {
- // No-op
+ System.err.println(String.format(INVALID_PROPERTY_FORMAT_MESSAGE, arg));
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java Sun Sep 5 18:30:47 2010
@@ -104,7 +104,7 @@ public class Dialog extends Frame {
super(title, content);
this.modal = modal;
- installThemeSkin(Dialog.class);
+ installSkin(Dialog.class);
}
public boolean isModal() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Expander.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Expander.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Expander.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Expander.java Sun Sep 5 18:30:47 2010
@@ -84,7 +84,7 @@ public class Expander extends Container
private ExpanderListenerList expanderListeners = new ExpanderListenerList();
public Expander() {
- installThemeSkin(Expander.class);
+ installSkin(Expander.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowser.java Sun Sep 5 18:30:47 2010
@@ -94,7 +94,7 @@ public class FileBrowser extends Contain
String userHome = System.getProperty("user.home");
rootDirectory = new File(userHome);
- installThemeSkin(FileBrowser.class);
+ installSkin(FileBrowser.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FileBrowserSheet.java Sun Sep 5 18:30:47 2010
@@ -94,7 +94,7 @@ public class FileBrowserSheet extends Sh
String userHome = System.getProperty("user.home");
rootDirectory = new File(userHome);
- installThemeSkin(FileBrowserSheet.class);
+ installSkin(FileBrowserSheet.class);
}
public Mode getMode() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java Sun Sep 5 18:30:47 2010
@@ -22,6 +22,6 @@ package org.apache.pivot.wtk;
*/
public class FlowPane extends Container {
public FlowPane() {
- installThemeSkin(FlowPane.class);
+ installSkin(FlowPane.class);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java Sun Sep 5 18:30:47 2010
@@ -445,7 +445,7 @@ public class Form extends Container {
public Form() {
super();
- installThemeSkin(Form.class);
+ installSkin(Form.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Frame.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Frame.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Frame.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Frame.java Sun Sep 5 18:30:47 2010
@@ -54,7 +54,7 @@ public class Frame extends Window {
super(content);
setTitle(title);
- installThemeSkin(Frame.class);
+ installSkin(Frame.class);
}
public MenuBar getMenuBar() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/GridPane.java Sun Sep 5 18:30:47 2010
@@ -259,7 +259,7 @@ public class GridPane extends Container
*/
public static class Filler extends Component {
public Filler() {
- installThemeSkin(Filler.class);
+ installSkin(Filler.class);
}
}
@@ -337,7 +337,7 @@ public class GridPane extends Container
setColumnCount(columnCount);
- installThemeSkin(GridPane.class);
+ installSkin(GridPane.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java Sun Sep 5 18:30:47 2010
@@ -159,7 +159,7 @@ public class ImageView extends Component
public ImageView(Image image) {
setImage(image);
- installThemeSkin(ImageView.class);
+ installSkin(ImageView.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java Sun Sep 5 18:30:47 2010
@@ -96,7 +96,7 @@ public class Label extends Component {
public Label(String text) {
this.text = text;
- installThemeSkin(Label.class);
+ installSkin(Label.class);
}
public String getText() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/LinkButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/LinkButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/LinkButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/LinkButton.java Sun Sep 5 18:30:47 2010
@@ -34,7 +34,7 @@ public class LinkButton extends Button {
super(buttonData);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(LinkButton.class);
+ installSkin(LinkButton.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Sun Sep 5 18:30:47 2010
@@ -316,7 +316,7 @@ public class ListButton extends Button {
setItemRenderer(DEFAULT_ITEM_RENDERER);
setListData(listData);
- installThemeSkin(ListButton.class);
+ installSkin(ListButton.class);
}
@Override
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=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Sun Sep 5 18:30:47 2010
@@ -815,7 +815,7 @@ public class ListView extends Component
setItemRenderer(DEFAULT_ITEM_RENDERER);
setListData(listData);
- installThemeSkin(ListView.class);
+ installSkin(ListView.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java Sun Sep 5 18:30:47 2010
@@ -69,7 +69,7 @@ public class Menu extends Container {
super(buttonData);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(Item.class);
+ installSkin(Item.class);
}
@Override
@@ -519,7 +519,7 @@ public class Menu extends Container {
private MenuItemSelectionListenerList menuItemSelectionListeners = new MenuItemSelectionListenerList();
public Menu() {
- installThemeSkin(Menu.class);
+ installSkin(Menu.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java Sun Sep 5 18:30:47 2010
@@ -67,7 +67,7 @@ public class MenuBar extends Container {
super(buttonData);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(Item.class);
+ installSkin(Item.class);
}
@Override
@@ -290,7 +290,7 @@ public class MenuBar extends Container {
private MenuBarListenerList menuBarListeners = new MenuBarListenerList();
public MenuBar() {
- installThemeSkin(MenuBar.class);
+ installSkin(MenuBar.class);
}
public ItemSequence getItems() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java Sun Sep 5 18:30:47 2010
@@ -68,7 +68,7 @@ public class MenuButton extends Button {
public MenuButton() {
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(MenuButton.class);
+ installSkin(MenuButton.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java Sun Sep 5 18:30:47 2010
@@ -77,7 +77,7 @@ public class MenuPopup extends Window {
public MenuPopup(Menu menu) {
setMenu(menu);
- installThemeSkin(MenuPopup.class);
+ installSkin(MenuPopup.class);
}
public Menu getMenu() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java Sun Sep 5 18:30:47 2010
@@ -59,7 +59,7 @@ public class Meter extends Component {
public Meter(Orientation orientation) {
this.orientation = orientation;
- installThemeSkin(Meter.class);
+ installSkin(Meter.class);
}
public double getPercentage() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java Sun Sep 5 18:30:47 2010
@@ -56,7 +56,7 @@ public class MovieView extends Component
public MovieView(Movie movie) {
setMovie(movie);
- installThemeSkin(MovieView.class);
+ installSkin(MovieView.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Palette.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Palette.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Palette.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Palette.java Sun Sep 5 18:30:47 2010
@@ -37,7 +37,7 @@ public class Palette extends Window {
super(content);
setTitle(title);
- installThemeSkin(Palette.class);
+ installSkin(Palette.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Panel.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Panel.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Panel.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Panel.java Sun Sep 5 18:30:47 2010
@@ -21,6 +21,6 @@ package org.apache.pivot.wtk;
*/
public class Panel extends Container {
public Panel() {
- installThemeSkin(Panel.class);
+ installSkin(Panel.class);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Panorama.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Panorama.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Panorama.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Panorama.java Sun Sep 5 18:30:47 2010
@@ -25,7 +25,7 @@ public class Panorama extends Viewport {
}
public Panorama(Component view) {
- installThemeSkin(Panorama.class);
+ installSkin(Panorama.class);
setView(view);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java Sun Sep 5 18:30:47 2010
@@ -203,7 +203,7 @@ public class Prompt extends Sheet {
setOptions(options);
setTitle((String)resources.get("defaultTitle"));
- installThemeSkin(Prompt.class);
+ installSkin(Prompt.class);
}
public MessageType getMessageType() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/PushButton.java Sun Sep 5 18:30:47 2010
@@ -44,7 +44,7 @@ public class PushButton extends Button {
setToggleButton(toggleButton);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(PushButton.class);
+ installSkin(PushButton.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/RadioButton.java Sun Sep 5 18:30:47 2010
@@ -49,7 +49,7 @@ public class RadioButton extends Button
setButtonGroup(buttonGroup);
setDataRenderer(DEFAULT_DATA_RENDERER);
- installThemeSkin(RadioButton.class);
+ installSkin(RadioButton.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java Sun Sep 5 18:30:47 2010
@@ -105,7 +105,7 @@ public class Rollup extends Container {
public Rollup(boolean expanded, Component content) {
this.expanded = expanded;
- installThemeSkin(Rollup.class);
+ installSkin(Rollup.class);
if (content != null) {
setContent(content);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java Sun Sep 5 18:30:47 2010
@@ -155,7 +155,7 @@ public class ScrollBar extends Container
this.orientation = orientation;
- installThemeSkin(ScrollBar.class);
+ installSkin(ScrollBar.class);
}
public Orientation getOrientation() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java Sun Sep 5 18:30:47 2010
@@ -107,7 +107,7 @@ public class ScrollPane extends Viewport
this.placement = placement;
- installThemeSkin(Corner.class);
+ installSkin(Corner.class);
}
public Placement getPlacement() {
@@ -141,7 +141,7 @@ public class ScrollPane extends Viewport
this.horizontalScrollBarPolicy = horizontalScrollBarPolicy;
this.verticalScrollBarPolicy = verticalScrollBarPolicy;
- installThemeSkin(ScrollPane.class);
+ installSkin(ScrollPane.class);
}
public ScrollBarPolicy getHorizontalScrollBarPolicy() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Separator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Separator.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Separator.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Separator.java Sun Sep 5 18:30:47 2010
@@ -42,7 +42,7 @@ public class Separator extends Component
public Separator(String heading) {
setHeading(heading);
- installThemeSkin(Separator.class);
+ installSkin(Separator.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java Sun Sep 5 18:30:47 2010
@@ -75,7 +75,7 @@ public class Sheet extends Window {
public Sheet(Component content) {
super(content);
- installThemeSkin(Sheet.class);
+ installSkin(Sheet.class);
}
public final void open(Window owner, SheetCloseListener sheetCloseListener) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java Sun Sep 5 18:30:47 2010
@@ -71,7 +71,7 @@ public class Slider extends Container {
public Slider(Orientation orientation) {
this.orientation = orientation;
- installThemeSkin(Slider.class);
+ installSkin(Slider.class);
}
public int getStart() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Spinner.java Sun Sep 5 18:30:47 2010
@@ -368,7 +368,7 @@ public class Spinner extends Container {
setItemRenderer(new SpinnerItemRenderer());
setSpinnerData(spinnerData);
- installThemeSkin(Spinner.class);
+ installSkin(Spinner.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java Sun Sep 5 18:30:47 2010
@@ -132,7 +132,7 @@ public class SplitPane extends Container
public SplitPane(Orientation orientation, Component topLeft, Component bottomRight) {
this.orientation = orientation;
- installThemeSkin(SplitPane.class);
+ installSkin(SplitPane.class);
setTopLeft(topLeft);
setBottomRight(bottomRight);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/StackPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/StackPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/StackPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/StackPane.java Sun Sep 5 18:30:47 2010
@@ -22,6 +22,6 @@ package org.apache.pivot.wtk;
*/
public class StackPane extends Container {
public StackPane() {
- installThemeSkin(StackPane.class);
+ installSkin(StackPane.class);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java Sun Sep 5 18:30:47 2010
@@ -235,7 +235,7 @@ public class SuggestionPopup extends Win
setSuggestionRenderer(DEFAULT_SUGGESTION_RENDERER);
setSuggestionData(suggestions);
- installThemeSkin(SuggestionPopup.class);
+ installSkin(SuggestionPopup.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java Sun Sep 5 18:30:47 2010
@@ -279,7 +279,7 @@ public class TabPane extends Container {
public TabPane() {
super();
- installThemeSkin(TabPane.class);
+ installSkin(TabPane.class);
}
public TabSequence getTabs() {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java Sun Sep 5 18:30:47 2010
@@ -621,7 +621,7 @@ public class TablePane extends Container
*/
public static final class Filler extends Component {
public Filler() {
- installThemeSkin(Filler.class);
+ installSkin(Filler.class);
}
}
@@ -767,7 +767,7 @@ public class TablePane extends Container
this.rows = new ArrayList<Row>();
this.columns = new ArrayList<Column>(columns);
- installThemeSkin(TablePane.class);
+ installSkin(TablePane.class);
}
@Override
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=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Sun Sep 5 18:30:47 2010
@@ -1469,7 +1469,7 @@ public class TableView extends Component
*/
public TableView(List<?> tableData) {
setTableData(tableData);
- installThemeSkin(TableView.class);
+ installSkin(TableView.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java Sun Sep 5 18:30:47 2010
@@ -81,7 +81,7 @@ public class TableViewHeader extends Com
}
public TableViewHeader(TableView tableView) {
- installThemeSkin(TableViewHeader.class);
+ installSkin(TableViewHeader.class);
setTableView(tableView);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Sun Sep 5 18:30:47 2010
@@ -284,7 +284,7 @@ public class TextArea extends Container
private TextAreaBindingListenerList textAreaBindingListeners = new TextAreaBindingListenerList();
public TextArea() {
- installThemeSkin(TextArea.class);
+ installSkin(TextArea.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea2.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea2.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea2.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea2.java Sun Sep 5 18:30:47 2010
@@ -55,7 +55,8 @@ public class TextArea2 extends Component
public void insertText(CharSequence text, int index) {
characters.insert(index, text);
- // TODO Perform offset bookkeeping
+ // TODO Perform offset bookkeeping (need to get index of this
+ // paragraph so we can update subsequent paragraphs)
// TODO Fire event
// TODO Update selection state
@@ -64,7 +65,8 @@ public class TextArea2 extends Component
public void removeText(int index, int count) {
characters.delete(index, index + count);
- // TODO Perform offset bookkeeping
+ // TODO Perform offset bookkeeping (need to get index of this
+ // paragraph so we can update subsequent paragraphs)
// TODO Fire event
// TODO Update selection state
@@ -343,7 +345,7 @@ public class TextArea2 extends Component
private static final int INITIAL_PARAGRAPH_CAPACITY = 256;
public TextArea2() {
- installThemeSkin(TextArea2.class);
+ installSkin(TextArea2.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Sun Sep 5 18:30:47 2010
@@ -244,7 +244,7 @@ public class TextInput extends Component
public static final int DEFAULT_TEXT_SIZE = 16;
public TextInput() {
- installThemeSkin(TextInput.class);
+ installSkin(TextInput.class);
}
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Tooltip.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Tooltip.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Tooltip.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Tooltip.java Sun Sep 5 18:30:47 2010
@@ -29,6 +29,6 @@ public class Tooltip extends Window {
public Tooltip(Component content) {
super(content);
- installThemeSkin(Tooltip.class);
+ installSkin(Tooltip.class);
}
}
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=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Sun Sep 5 18:30:47 2010
@@ -1083,7 +1083,7 @@ public class TreeView extends Component
*/
public TreeView(List<?> treeData) {
setTreeData(treeData);
- installThemeSkin(TreeView.class);
+ installSkin(TreeView.class);
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java?rev=992853&r1=992852&r2=992853&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java Sun Sep 5 18:30:47 2010
@@ -441,7 +441,7 @@ public class Window extends Container {
public Window(Component content) {
setContent(content);
- installThemeSkin(Window.class);
+ installSkin(Window.class);
}
@Override