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/15 20:36:46 UTC
svn commit: r964526 - in /pivot/trunk: core/src/org/apache/pivot/util/
core/test/org/apache/pivot/util/test/ demos/src/org/apache/pivot/demos/dnd/
demos/src/org/apache/pivot/demos/roweditor/ tutorials/.settings/
tutorials/src/org/apache/pivot/tutorials...
Author: gbrown
Date: Thu Jul 15 18:36:45 2010
New Revision: 964526
URL: http://svn.apache.org/viewvc?rev=964526&view=rev
Log:
Resolve PIVOT-574 and PIVOT-575.
Added:
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.resources
- copied unchanged from r964505, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.json
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.resources
- copied unchanged from r964505, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.json
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.resources
- copied unchanged from r964505, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.json
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop_demo.bxml
- copied unchanged from r964505, pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources
- copied, changed from r964505, pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources
- copied, changed from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources
- copied, changed from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.resources
- copied unchanged from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.resources
- copied unchanged from r964505, pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.resources
- copied unchanged from r964505, pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/command_button.styles
- copied unchanged from r964505, pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/command_button_styles.json
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.resources
- copied unchanged from r964505, pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.json
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.resources
- copied unchanged from r964505, pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.json
Removed:
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.json
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.json
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.json
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.json
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/command_button_styles.json
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.json
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.json
Modified:
pivot/trunk/core/src/org/apache/pivot/util/Resources.java
pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/expense_sheet.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.bxml
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
Modified: pivot/trunk/core/src/org/apache/pivot/util/Resources.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Resources.java?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Resources.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Resources.java Thu Jul 15 18:36:45 2010
@@ -40,6 +40,7 @@ public class Resources implements Dictio
private Map<String, Object> resourceMap = null;
public static final String DEFAULT_CHARSET_NAME = "UTF-8";
+ public static final String RESOURCES_EXTENSION = "resources";
public Resources(String baseName) throws IOException, SerializationException {
this(null, baseName, Locale.getDefault(), Charset.forName(DEFAULT_CHARSET_NAME));
@@ -118,11 +119,11 @@ public class Resources implements Dictio
this.charset = charset;
String resourceName = baseName.replace('.', '/');
- resourceMap = readJSONResource(resourceName + ".json");
+ resourceMap = readJSONResource(resourceName + "." + RESOURCES_EXTENSION);
// Try to find resource for the language (e.g. resourceName_en)
Map<String, Object> overrideMap = readJSONResource(resourceName + "_"
- + locale.getLanguage() + ".json");
+ + locale.getLanguage() + "." + RESOURCES_EXTENSION);
if (overrideMap != null) {
if (resourceMap == null) {
resourceMap = overrideMap;
@@ -132,7 +133,7 @@ public class Resources implements Dictio
}
// Try to find resource for the entire locale (e.g. resourceName_en_GB)
- overrideMap = readJSONResource(resourceName + "_" + locale.toString() + ".json");
+ overrideMap = readJSONResource(resourceName + "_" + locale.toString() + "." + RESOURCES_EXTENSION);
if (overrideMap != null) {
if (resourceMap == null) {
resourceMap = overrideMap;
Copied: pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources (from r964505, pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json)
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources?p2=pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources&p1=pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json&r1=964505&r2=964526&rev=964526&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources Thu Jul 15 18:36:45 2010
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-{
- title: "Row Editor Demo",
+{ title: "Row Editor Demo",
headers: {
date: "Date",
@@ -23,7 +22,7 @@
amount: "Amount",
description: "Description"
},
-
+
formats: {
currency: "$#,##0.00"
}
Modified: pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs (original)
+++ pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs Thu Jul 15 18:36:45 2010
@@ -1,5 +1,5 @@
-#Fri May 21 12:12:24 EDT 2010
+#Thu Jul 15 14:18:04 EDT 2010
eclipse.preferences.version=1
-encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.json=UTF-8
-encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.json=UTF-8
+encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.resources=UTF-8
+encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.resources=UTF-8
encoding/<project>=UTF-8
Copied: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources (from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json)
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources?p2=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources&p1=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json&r1=964505&r2=964526&rev=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources Thu Jul 15 18:36:45 2010
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-{
- title: "Apache Pivot Component Explorer",
-
+{ title: "Apache Pivot Component Explorer",
+
explorerPane: {
label: "Component Explorer",
-
branches: {
basic: "Labels & Image Views",
buttons: "Buttons",
Copied: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources (from r964505, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json)
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources?p2=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources&p1=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json&r1=964505&r2=964526&rev=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources Thu Jul 15 18:36:45 2010
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-{
- interface: "Declaring Class",
+{ interface: "Declaring Class",
method: "Event",
arguments: "Arguments"
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_cell.bxml Thu Jul 15 18:36:45 2010
@@ -99,7 +99,7 @@ limitations under the License.
<TablePane.Row height="24">
<BoxPane styles="{spacing:6,horizontalAlignment:'right'}">
<PushButton buttonData="OK"
- styles="/org/apache/pivot/wtk/skin/terra/command_button_styles.json"
+ styles="/org/apache/pivot/wtk/skin/terra/command_button.styles"
ButtonPressListener.buttonPressed="sheet.close(true)"/>
</BoxPane>
</TablePane.Row>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.bxml Thu Jul 15 18:36:45 2010
@@ -126,7 +126,7 @@ limitations under the License.
<TablePane.Row height="24">
<BoxPane styles="{spacing:6,horizontalAlignment:'right'}">
<PushButton bxml:id="okButton" buttonData="OK"
- styles="/org/apache/pivot/wtk/skin/terra/command_button_styles.json"
+ styles="/org/apache/pivot/wtk/skin/terra/command_button.styles"
ButtonPressListener.buttonPressed="sheet.close(true)"/>
</BoxPane>
</TablePane.Row>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_row.bxml Thu Jul 15 18:36:45 2010
@@ -120,7 +120,7 @@ limitations under the License.
<TablePane.Row height="24">
<BoxPane styles="{spacing:6,horizontalAlignment:'right'}">
<PushButton bxml:id="okButton" buttonData="OK"
- styles="/org/apache/pivot/wtk/skin/terra/command_button_styles.json"
+ styles="/org/apache/pivot/wtk/skin/terra/command_button.styles"
ButtonPressListener.buttonPressed="sheet.close(true)"/>
</BoxPane>
</TablePane.Row>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/expense_sheet.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/expense_sheet.bxml?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/expense_sheet.bxml (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/expense_sheet.bxml Thu Jul 15 18:36:45 2010
@@ -75,9 +75,9 @@ limitations under the License.
<TablePane.Row height="-1">
<BoxPane styles="{fill:true, horizontalAlignment:'right'}">
<PushButton bxml:id="cancelButton" buttonData="%cancel"
- styles="/org/apache/pivot/wtk/skin/terra/command_button_styles.json"/>
+ styles="/org/apache/pivot/wtk/skin/terra/command_button.styles"/>
<PushButton bxml:id="okButton" buttonData="%ok"
- styles="/org/apache/pivot/wtk/skin/terra/command_button_styles.json"/>
+ styles="/org/apache/pivot/wtk/skin/terra/command_button.styles"/>
</BoxPane>
</TablePane.Row>
</TablePane>
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=964526&r1=964525&r2=964526&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 Thu Jul 15 18:36:45 2010
@@ -65,7 +65,7 @@ public class TerraAlertSkin extends Terr
private static Map<String, ?> commandButtonStyles;
static {
- URL location = TerraAlertSkin.class.getResource("command_button_styles.json");
+ URL location = TerraAlertSkin.class.getResource("command_button.styles");
try {
InputStream inputStream = location.openStream();
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=964526&r1=964525&r2=964526&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 Thu Jul 15 18:36:45 2010
@@ -65,7 +65,7 @@ public class TerraPromptSkin extends Ter
private static Map<String, ?> commandButtonStyles;
static {
- URL location = TerraPromptSkin.class.getResource("command_button_styles.json");
+ URL location = TerraPromptSkin.class.getResource("command_button.styles");
try {
InputStream inputStream = location.openStream();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.bxml?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.bxml (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.bxml Thu Jul 15 18:36:45 2010
@@ -42,9 +42,9 @@ limitations under the License.
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'right', verticalAlignment:'center'}">
<PushButton bxml:id="okButton" buttonData="%ok"
- styles="@command_button_styles.json"/>
+ styles="@command_button.styles"/>
<PushButton bxml:id="cancelButton" buttonData="%cancel"
- styles="@command_button_styles.json"/>
+ styles="@command_button.styles"/>
</BoxPane>
</TablePane.Row>
</TablePane>
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=964526&r1=964525&r2=964526&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Thu Jul 15 18:36:45 2010
@@ -50,9 +50,11 @@ import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.HashMap;
+import org.apache.pivot.json.JSONSerializer;
import org.apache.pivot.util.Version;
import org.apache.pivot.wtk.Component.DecoratorSequence;
import org.apache.pivot.wtk.effects.Decorator;
@@ -1449,6 +1451,8 @@ public abstract class ApplicationContext
static {
jvmVersion = Version.decode(System.getProperty("java.vm.version"));
+
+ BXMLSerializer.getFileExtensions().put(Component.STYLES_EXTENSION, JSONSerializer.MIME_TYPE);
}
/**