[vassalengine-svn] SF.net SVN: vassalengine: [1890] VASSAL-src/branches/swampwallaby-merge/ VASSAL
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn] SF.net SVN: vassalengine: [1890] VASSAL-src/branches/swampwallaby-merge/ VASSAL
|
From: <swa...@us...> - 2007-03-21 20:44:20
|
Revision: 1890
http://svn.sourceforge.net/vassalengine/?rev=1890&view=rev
Author: swampwallaby
Date: 2007-03-21 13:43:33 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
Merged up to trunk@1888
Modified Paths:
--------------
VASSAL-src/branches/swampwallaby-merge/VASSAL/build/module/gamepieceimage/Symbol.java
VASSAL-src/branches/swampwallaby-merge/VASSAL/configure/CreateInstallerAction.java
VASSAL-src/branches/swampwallaby-merge/VASSAL/counters/Deck.java
VASSAL-src/branches/swampwallaby-merge/VASSAL/i18n/VASSAL.properties
VASSAL-src/branches/swampwallaby-merge/VASSAL/launch/install/ChooseHeapSizeScreen.java
Modified: VASSAL-src/branches/swampwallaby-merge/VASSAL/build/module/gamepieceimage/Symbol.java
===================================================================
--- VASSAL-src/branches/swampwallaby-merge/VASSAL/build/module/gamepieceimage/Symbol.java 2007-03-21 18:44:13 UTC (rev 1889)
+++ VASSAL-src/branches/swampwallaby-merge/VASSAL/build/module/gamepieceimage/Symbol.java 2007-03-21 20:43:33 UTC (rev 1890)
@@ -369,7 +369,7 @@
}
else if (name.equals(MOUNTAIN)) {
- int x_off = (int) (bounds.width / 6);
+ int x_off = bounds.width / 6;
GeneralPath p = new GeneralPath();
p.moveTo(x_center, y_center);
p.lineTo(x_center+x_off, y_bottom);
@@ -411,9 +411,9 @@
int count = option.getCount();
int sym_w;
- int sym_h = (int) (bounds.height / 3);
+ int sym_h = bounds.height / 3;
if (count <= 4) {
- sym_w = (int) (bounds.width / 5);
+ sym_w = bounds.width / 5;
}
else {
sym_w = bounds.width / 7;
Modified: VASSAL-src/branches/swampwallaby-merge/VASSAL/configure/CreateInstallerAction.java
===================================================================
--- VASSAL-src/branches/swampwallaby-merge/VASSAL/configure/CreateInstallerAction.java 2007-03-21 18:44:13 UTC (rev 1889)
+++ VASSAL-src/branches/swampwallaby-merge/VASSAL/configure/CreateInstallerAction.java 2007-03-21 20:43:33 UTC (rev 1890)
@@ -63,36 +63,38 @@
* @author rkinney
*/
public class CreateInstallerAction extends AbstractAction {
+ private static final long serialVersionUID = 1L;
+
private static final Class[] installerClasses = {HttpRequestWrapper.class, ChooseDirScreen.class, ChooseDirScreen.DirectoryFilter.class,
ChooseHeapSizeScreen.class, ChooseVersionScreen.class, Constants.class, FailureScreen.class,
InstallJnlpScreen.class, InstallProgressScreen.class, InstallModuleScreen.class, InstallWizard.class,
Screen.class, SuccessScreen.class, WizardDialog.class, Resources.class,
Resources.VassalPropertyClassLoader.class};
private Frame parent;
- public static final String I18N_PROPERTIES = "VASSAL/i18n/VASSAL.properties";
- private static final String[] HEAP_SIZES = new String[]{"256M", "512M", "1000M", "1500M", "2000M"};
- private static final String[] HEAP_SIZES_PLAIN_TEXT = new String[]{"256 MB", "512 MB", "1 GB", "1.5 GB", "2 GB"};
+ public static final String I18N_PROPERTIES = "VASSAL/i18n/VASSAL.properties"; //$NON-NLS-1$
+ private static final String[] HEAP_SIZES = new String[]{"256M", "512M", "758M", "1024M", "1536M"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ private static final String[] HEAP_SIZES_PLAIN_TEXT = new String[]{Resources.getString("Install.256_mb"), Resources.getString("Install.512_mb"), Resources.getString("Install.768_mb"), Resources.getString("Install.1_gb"), Resources.getString("Install.1.5_gb")}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
private static Map heapSizes = new HashMap();
static {
for (int i = 0; i < HEAP_SIZES_PLAIN_TEXT.length; i++) {
heapSizes.put(HEAP_SIZES_PLAIN_TEXT[i], HEAP_SIZES[i]);
}
}
- private String heapSize = "256M";
+ private String heapSize = "256M"; //$NON-NLS-1$
public CreateInstallerAction(Frame parent) {
- super("Create Installer");
+ super(Resources.getString("Install.create_installer")); //$NON-NLS-1$
this.parent = parent;
}
public void actionPerformed(ActionEvent e) {
- final JDialog d = new JDialog(parent, "Create Installer", true);
+ final JDialog d = new JDialog(parent, Resources.getString("Install.create_installer"), true); //$NON-NLS-1$
d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS));
- final StringEnumConfigurer heapSizeConfigurer = new StringEnumConfigurer(null, "Memory Allocation", HEAP_SIZES_PLAIN_TEXT);
+ final StringEnumConfigurer heapSizeConfigurer = new StringEnumConfigurer(null, "Memory Allocation", HEAP_SIZES_PLAIN_TEXT); //$NON-NLS-1$
heapSizeConfigurer.setValue(HEAP_SIZES_PLAIN_TEXT[0]);
d.getContentPane().add(heapSizeConfigurer.getControls());
- final JButton ok = new JButton("Create");
- JButton cancel = new JButton("Cancel");
+ final JButton ok = new JButton(Resources.getString("General.create")); //$NON-NLS-1$
+ JButton cancel = new JButton(Resources.getString("General.cancel")); //$NON-NLS-1$
Box b = Box.createHorizontalBox();
b.add(ok);
b.add(cancel);
@@ -110,13 +112,13 @@
FileChooser c = FileChooser.createFileChooser(parent);
if (c.showSaveDialog() == FileChooser.APPROVE_OPTION) {
File destFile = c.getSelectedFile();
- if (!destFile.getName().endsWith(".jar")) {
- JOptionPane.showMessageDialog(parent, "File name must end in '.jar'");
+ if (!destFile.getName().endsWith(".jar")) { //$NON-NLS-1$
+ JOptionPane.showMessageDialog(parent, Resources.getString("Install.require_jar_extension")); //$NON-NLS-1$
}
else {
File tempFile;
try {
- tempFile = File.createTempFile("installer", ".zip");
+ tempFile = File.createTempFile("installer", ".zip"); //$NON-NLS-1$ //$NON-NLS-2$
ZipOutputStream output = new ZipOutputStream(new FileOutputStream(tempFile));
writeInstallerClasses(output);
writeInstallerProperties(output);
@@ -124,11 +126,11 @@
writeResources(output);
output.close();
if (!tempFile.renameTo(destFile)) {
- throw new IOException("Cannot create " + destFile);
+ throw new IOException(Resources.getString("BasicLogger.unable_to_write", destFile.getPath())); //$NON-NLS-1$
}
}
catch (IOException e1) {
- JOptionPane.showMessageDialog(parent, "Error saving file: " + e1.getMessage());
+ JOptionPane.showMessageDialog(parent, Resources.getString("Install.error_saving_file") + e1.getMessage()); //$NON-NLS-1$
}
finally {
d.dispose();
@@ -143,7 +145,7 @@
private void writeResources(ZipOutputStream output) throws IOException {
ZipEntry e = new ZipEntry(I18N_PROPERTIES);
output.putNextEntry(e);
- InputStream input = getClass().getResourceAsStream("/" + I18N_PROPERTIES);
+ InputStream input = getClass().getResourceAsStream("/" + I18N_PROPERTIES); //$NON-NLS-1$
writeEntry(output, input);
File module = new File(GameModule.getGameModule().getDataArchive().getName());
e = new ZipEntry(module.getName());
@@ -160,28 +162,28 @@
}
private void writeManifest(ZipOutputStream output) throws IOException {
- ZipEntry manifestEntry = new ZipEntry("META-INF/MANIFEST.MF");
+ ZipEntry manifestEntry = new ZipEntry("META-INF/MANIFEST.MF"); //$NON-NLS-1$
manifestEntry.setMethod(ZipEntry.DEFLATED);
StringBuffer buffer = new StringBuffer();
- buffer.append("Manifest-Version: 1.0\n").append("Main-Class: " + InstallWizard.class.getName() + "\n");
+ buffer.append("Manifest-Version: 1.0\n").append("Main-Class: " + InstallWizard.class.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
output.putNextEntry(manifestEntry);
output.write(buffer.toString().getBytes());
}
private void writeInstallerProperties(ZipOutputStream output) throws IOException {
Properties p = new Properties();
- p.put(Constants.TITLE, "Install " + GameModule.getGameModule().getGameName());
+ p.put(Constants.TITLE, "Install " + GameModule.getGameModule().getGameName()); //$NON-NLS-1$
p.put(Constants.INITIAL_SCREEN, ChooseDirScreen.class.getName());
p.put(ChooseDirScreen.NEXT_SCREEN, InstallModuleScreen.class.getName());
p.put(Constants.HEAP_SIZE, heapSize);
- String jnlpURL = "http://www.vassalengine.org/ws/vassal-";
- StringTokenizer st = new StringTokenizer(Info.getVersion(), ".b");
- jnlpURL += st.nextToken() + "." + st.nextToken() + ".jnlp";
+ String jnlpURL = "http://www.vassalengine.org/ws/vassal-"; //$NON-NLS-1$
+ StringTokenizer st = new StringTokenizer(Info.getVersion(), ".b"); //$NON-NLS-1$
+ jnlpURL += st.nextToken() + "." + st.nextToken() + ".jnlp"; //$NON-NLS-1$ //$NON-NLS-2$
p.put(Constants.JNLP_URL, jnlpURL);
File f = new File(GameModule.getGameModule().getDataArchive().getArchive().getName());
p.put(Constants.MODULE_FILE, f.getName());
p.put(Constants.JNLP_TITLE, GameModule.getGameModule().getGameName());
- p.put(Constants.INTERNAL_RESOURCES, I18N_PROPERTIES + "," + f.getName());
+ p.put(Constants.INTERNAL_RESOURCES, I18N_PROPERTIES + "," + f.getName()); //$NON-NLS-1$
ZipEntry e = new ZipEntry(InstallWizard.INSTALL_PROPERTIES);
output.putNextEntry(e);
p.store(output, null);
@@ -189,18 +191,18 @@
private void writeInstallerClasses(ZipOutputStream output) throws IOException {
for (int i = 0; i < installerClasses.length; i++) {
- String className = installerClasses[i].getName().replace('.', '/') + ".class";
+ String className = installerClasses[i].getName().replace('.', '/') + ".class"; //$NON-NLS-1$
ZipEntry classEntry = new ZipEntry(className);
classEntry.setMethod(ZipEntry.DEFLATED);
output.putNextEntry(classEntry);
- InputStream input = getClass().getResourceAsStream("/" + className);
+ InputStream input = getClass().getResourceAsStream("/" + className); //$NON-NLS-1$
writeEntry(output, input);
}
}
public static void main(String[] args) throws Exception {
- Resources.init(new File(System.getProperty("user.dir")));
- Prefs globalPrefs = new Prefs(new PrefsEditor(new ArchiveWriter("pref")), "VASSAL"); //$NON-NLS-1$
+ Resources.init(new File(System.getProperty("user.dir"))); //$NON-NLS-1$
+ Prefs globalPrefs = new Prefs(new PrefsEditor(new ArchiveWriter("pref")), "VASSAL"); //$NON-NLS-1$ //$NON-NLS-2$
GameModule.init(new BasicModule(new ArchiveWriter(args[0]), globalPrefs));
new CreateInstallerAction(null).actionPerformed(null);
System.exit(0);
Modified: VASSAL-src/branches/swampwallaby-merge/VASSAL/counters/Deck.java
===================================================================
--- VASSAL-src/branches/swampwallaby-merge/VASSAL/counters/Deck.java 2007-03-21 18:44:13 UTC (rev 1889)
+++ VASSAL-src/branches/swampwallaby-merge/VASSAL/counters/Deck.java 2007-03-21 20:43:33 UTC (rev 1890)
@@ -415,7 +415,8 @@
goodExpressionCount++;
}
}
- //this.countExpressions = (CountExpression[]) java.util.Arrays.copyOf(c, goodExpressionCount);
+ this.countExpressions = new CountExpression[goodExpressionCount];
+ System.arraycopy(c, 0, countExpressions, 0, goodExpressionCount);
}
public void setExpressionCounting(boolean expressionCounting) {
Modified: VASSAL-src/branches/swampwallaby-merge/VASSAL/i18n/VASSAL.properties
===================================================================
--- VASSAL-src/branches/swampwallaby-merge/VASSAL/i18n/VASSAL.properties 2007-03-21 18:44:13 UTC (rev 1889)
+++ VASSAL-src/branches/swampwallaby-merge/VASSAL/i18n/VASSAL.properties 2007-03-21 20:43:33 UTC (rev 1890)
@@ -193,6 +193,7 @@
General.add=Add
General.save=Save
General.cancel=Cancel
+General.create=Create
General.edit=Edit
General.file=File
General.help=Help
@@ -240,9 +241,12 @@
Install.install_successful=Installation successful.
Install.to_get_started=To get started, double-click on {0}
Install.error_not_a_directory={0} is not a directory
+Install.require_jar_extension=
Install.install_vassal=Install VASSAL
Install.error_no_version=No version specified
+Install.create_installer=
Install.error_install_dir=Installation directory not specified
+Install.error_saving_file=
Install.error_unable_to_create=Unable to create {0}
Install.module_not_specified=Module file not specified
Modified: VASSAL-src/branches/swampwallaby-merge/VASSAL/launch/install/ChooseHeapSizeScreen.java
===================================================================
--- VASSAL-src/branches/swampwallaby-merge/VASSAL/launch/install/ChooseHeapSizeScreen.java 2007-03-21 18:44:13 UTC (rev 1889)
+++ VASSAL-src/branches/swampwallaby-merge/VASSAL/launch/install/ChooseHeapSizeScreen.java 2007-03-21 20:43:33 UTC (rev 1890)
@@ -35,6 +35,7 @@
private JRadioButton b128M = new JRadioButton(Resources.getString("Install.128_mb")); //$NON-NLS-1$
private JRadioButton b256M = new JRadioButton(Resources.getString("Install.256_mb")); //$NON-NLS-1$
private JRadioButton b512M = new JRadioButton(Resources.getString("Install.512_mb")); //$NON-NLS-1$
+ private JRadioButton b768M = new JRadioButton(Resources.getString("Install.768_mb")); //$NON-NLS-1$
private JRadioButton b1000M = new JRadioButton(Resources.getString("Install.1_gb")); //$NON-NLS-1$
private JRadioButton b1500M = new JRadioButton(Resources.getString("Install.1.5_gb")); //$NON-NLS-1$
private ButtonGroup group = new ButtonGroup();
@@ -50,10 +51,13 @@
b512M.putClientProperty(HEAP_SIZE, "512m"); //$NON-NLS-1$
group.add(b512M);
controls.add(b512M);
- b1000M.putClientProperty(HEAP_SIZE, "1000M"); //$NON-NLS-1$
+ b768M.putClientProperty(HEAP_SIZE, "768m"); //$NON-NLS-1$
+ group.add(b768M);
+ controls.add(b768M);
+ b1000M.putClientProperty(HEAP_SIZE, "1024M"); //$NON-NLS-1$
group.add(b1000M);
controls.add(b1000M);
- b1500M.putClientProperty(HEAP_SIZE, "1500M"); //$NON-NLS-1$
+ b1500M.putClientProperty(HEAP_SIZE, "1536M"); //$NON-NLS-1$
group.add(b1500M);
b256M.setSelected(true);
controls.add(b1500M);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|