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/18 19:45:22 UTC
svn commit: r965266 - in /pivot/trunk: core/src/org/apache/pivot/util/
core/test/org/apache/pivot/util/test/
demos/src/org/apache/pivot/demos/roweditor/ tutorials/.settings/
tutorials/src/org/apache/pivot/tutorials/explorer/
tutorials/src/org/apache/pi...
Author: gbrown
Date: Sun Jul 18 17:45:20 2010
New Revision: 965266
URL: http://svn.apache.org/viewvc?rev=965266&view=rev
Log:
Revert .resources files back to .json (there is no longer any naming conflict between resource files and style class files).
Added:
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.json
- copied unchanged from r964526, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.resources
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.json
- copied unchanged from r964526, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.resources
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.json
- copied unchanged from r964526, pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.resources
pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json
- copied, changed from r964526, pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json
- copied, changed from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.json
- copied unchanged from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.resources
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.json
- copied unchanged from r964526, pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.resources
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.json
- copied unchanged from r964526, pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.resources
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.json
- copied unchanged from r964526, pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.resources
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.json
- copied unchanged from r964526, pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.resources
Removed:
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest.resources
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTestParent.resources
pivot/trunk/core/test/org/apache/pivot/util/test/ParentResourcesTest_en.resources
pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_cn.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_de.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_it.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization_ph.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_it.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.resources
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.resources
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.resources
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.resources
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.resources
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.resources
Modified:
pivot/trunk/core/src/org/apache/pivot/util/Resources.java
pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs
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=965266&r1=965265&r2=965266&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Resources.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Resources.java Sun Jul 18 17:45:20 2010
@@ -40,7 +40,6 @@ 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));
@@ -119,11 +118,11 @@ public class Resources implements Dictio
this.charset = charset;
String resourceName = baseName.replace('.', '/');
- resourceMap = readJSONResource(resourceName + "." + RESOURCES_EXTENSION);
+ resourceMap = readJSONResource(resourceName + "." + JSONSerializer.JSON_EXTENSION);
// Try to find resource for the language (e.g. resourceName_en)
Map<String, Object> overrideMap = readJSONResource(resourceName + "_"
- + locale.getLanguage() + "." + RESOURCES_EXTENSION);
+ + locale.getLanguage() + "." + JSONSerializer.JSON_EXTENSION);
if (overrideMap != null) {
if (resourceMap == null) {
resourceMap = overrideMap;
@@ -133,7 +132,7 @@ public class Resources implements Dictio
}
// Try to find resource for the entire locale (e.g. resourceName_en_GB)
- overrideMap = readJSONResource(resourceName + "_" + locale.toString() + "." + RESOURCES_EXTENSION);
+ overrideMap = readJSONResource(resourceName + "_" + locale.toString() + "." + JSONSerializer.JSON_EXTENSION);
if (overrideMap != null) {
if (resourceMap == null) {
resourceMap = overrideMap;
Copied: pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json (from r964526, pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources)
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json?p2=pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json&p1=pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources&r1=964526&r2=965266&rev=965266&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.resources (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.json Sun Jul 18 17:45:20 2010
@@ -22,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=965266&r1=965265&r2=965266&view=diff
==============================================================================
--- pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs (original)
+++ pivot/trunk/tutorials/.settings/org.eclipse.core.resources.prefs Sun Jul 18 17:45:20 2010
@@ -1,5 +1,5 @@
-#Thu Jul 15 14:18:04 EDT 2010
+#Sun Jul 18 13:37:22 EDT 2010
eclipse.preferences.version=1
-encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.resources=UTF-8
-encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.resources=UTF-8
+encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.json=UTF-8
+encoding//src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow_fr.json=UTF-8
encoding/<project>=UTF-8
Copied: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json (from r964526, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources)
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json?p2=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json&p1=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources&r1=964526&r2=965266&rev=965266&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.resources (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.json Sun Jul 18 17:45:20 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
{ title: "Apache Pivot Component Explorer",
-
+
explorerPane: {
label: "Component Explorer",
branches: {