[vassalengine-svn] SF.net SVN: vassalengine: [2120] VASSAL-src/trunk/VASSAL
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn] SF.net SVN: vassalengine: [2120] VASSAL-src/trunk/VASSAL
|
From: <rod...@us...> - 2007-05-30 05:29:24
|
Revision: 2120
http://svn.sourceforge.net/vassalengine/?rev=2120&view=rev
Author: rodneykinney
Date: 2007-05-29 22:29:26 -0700 (Tue, 29 May 2007)
Log Message:
-----------
Fix key prefix for counter i18n
Modified Paths:
--------------
VASSAL-src/trunk/VASSAL/build/module/WizardSupport.java
VASSAL-src/trunk/VASSAL/counters/BasicPiece.java
VASSAL-src/trunk/VASSAL/counters/Decorator.java
VASSAL-src/trunk/VASSAL/counters/KeyCommand.java
VASSAL-src/trunk/VASSAL/i18n/ComponentI18nData.java
VASSAL-src/trunk/VASSAL/i18n/PieceI18nData.java
VASSAL-src/trunk/VASSAL/i18n/TranslatablePiece.java
Modified: VASSAL-src/trunk/VASSAL/build/module/WizardSupport.java
===================================================================
--- VASSAL-src/trunk/VASSAL/build/module/WizardSupport.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/build/module/WizardSupport.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -405,7 +405,17 @@
else {
GameModule.getGameModule().getPrefs().getOption(GameModule.REAL_NAME).setValue(nameConfig.getValueString());
GameModule.getGameModule().getPrefs().getOption(GameModule.SECRET_NAME).setValue(pwd.getValueString());
- controller.setProblem(null);
+ try {
+ GameModule.getGameModule().getPrefs().write();
+ controller.setProblem(null);
+ }
+ catch (IOException e) {
+ String msg = e.getMessage();
+ if (msg == null) {
+ msg = Resources.getString("Prefs.unable_to_save");
+ }
+ controller.setProblem(msg);
+ }
}
}
};
Modified: VASSAL-src/trunk/VASSAL/counters/BasicPiece.java
===================================================================
--- VASSAL-src/trunk/VASSAL/counters/BasicPiece.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/counters/BasicPiece.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -410,7 +410,7 @@
}
public String getLocalizedName() {
- String key = TranslatablePiece.PREFIX + "." + getName();
+ String key = TranslatablePiece.PREFIX + getName();
return Language.translate(key, getName());
}
Modified: VASSAL-src/trunk/VASSAL/counters/Decorator.java
===================================================================
--- VASSAL-src/trunk/VASSAL/counters/Decorator.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/counters/Decorator.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -349,7 +349,7 @@
}
protected String getTranslation(String key) {
- String fullKey = TranslatablePiece.PREFIX + "." + key;
+ String fullKey = TranslatablePiece.PREFIX + key;
return Language.translate(fullKey, key);
}
}
Modified: VASSAL-src/trunk/VASSAL/counters/KeyCommand.java
===================================================================
--- VASSAL-src/trunk/VASSAL/counters/KeyCommand.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/counters/KeyCommand.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -114,10 +114,9 @@
untranslatedName = name;
PieceI18nData data = piece.getI18nData();
String key = "";
- String[] values = data.getValues();
- for (int i = 0; i < values.length; i++) {
- if (values[i].equals(name)) {
- key = TranslatablePiece.PREFIX + "." + values[i];
+ for (PieceI18nData.Property p : data.getProperties()) {
+ if (p.getValue().equals(name)) {
+ key = TranslatablePiece.PREFIX + p.getValue();
}
}
Modified: VASSAL-src/trunk/VASSAL/i18n/ComponentI18nData.java
===================================================================
--- VASSAL-src/trunk/VASSAL/i18n/ComponentI18nData.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/i18n/ComponentI18nData.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -135,11 +135,9 @@
for (GamePiece p = piece; p != null; ) {
if (p instanceof TranslatablePiece) {
PieceI18nData pieceData = ((TranslatablePiece) p).getI18nData();
- String[] val = pieceData.getValues();
- String[] desc = pieceData.getDescriptions();
- for (int i = 0; i < val.length; i++) {
- values.add(val[i]);
- descriptions.add(desc[i]);
+ for (PieceI18nData.Property prop : pieceData.getProperties()) {
+ values.add(prop.getValue());
+ descriptions.add(prop.getDescription());
}
}
if (p instanceof PlaceMarker) {
Modified: VASSAL-src/trunk/VASSAL/i18n/PieceI18nData.java
===================================================================
--- VASSAL-src/trunk/VASSAL/i18n/PieceI18nData.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/i18n/PieceI18nData.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -19,36 +19,49 @@
package VASSAL.i18n;
import java.util.ArrayList;
-
+import java.util.Collections;
+import java.util.List;
import VASSAL.counters.GamePiece;
/**
* Object encapsulating the internationalization information for a GamePiece.
+ *
* @author Brent Easton
- *
+ *
*/
public class PieceI18nData {
+ protected GamePiece piece;
+ protected ArrayList<Property> properties = new ArrayList<Property>();
- protected GamePiece piece;
- protected ArrayList<String> values = new ArrayList<String>();
- protected ArrayList<String> descriptions = new ArrayList<String>();
-
public PieceI18nData(GamePiece piece) {
this.piece = piece;
}
-
- public String[] getValues() {
- return values.toArray(new String[values.size()]);
+
+ public List<Property> getProperties() {
+ return Collections.unmodifiableList(properties);
}
- public String[] getDescriptions() {
- return descriptions.toArray(new String[descriptions.size()]);
- }
-
public void add(String value, String description) {
if (value != null && value.length() > 0) {
- values.add(value);
- descriptions.add(description);
+ properties.add(new Property(value, description));
}
}
+ public static class Property {
+ private String value;
+ private String description;
+
+ public Property(String value, String description) {
+ super();
+ this.value = value;
+ this.description = description;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ }
}
\ No newline at end of file
Modified: VASSAL-src/trunk/VASSAL/i18n/TranslatablePiece.java
===================================================================
--- VASSAL-src/trunk/VASSAL/i18n/TranslatablePiece.java 2007-05-29 19:04:15 UTC (rev 2119)
+++ VASSAL-src/trunk/VASSAL/i18n/TranslatablePiece.java 2007-05-30 05:29:26 UTC (rev 2120)
@@ -29,7 +29,7 @@
*/
public interface TranslatablePiece extends EditablePiece {
- public static final String PREFIX = "Piece";
+ public static final String PREFIX = "Piece.";
/**
* Return a PieceI18nData object returning the I18n data about this GamePiece.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|