[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2379] VASSAL-src/trunk/VASSA
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2007-08-29 04:56:42
|
Revision: 2379 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2379&view=rev Author: rodneykinney Date: 2007-08-28 21:56:40 -0700 (Tue, 28 Aug 2007) Log Message: ----------- Main: template methods for initializing DataArchive/GameModule version bump: v3.0.4 Modified Paths: -------------- VASSAL-src/trunk/VASSAL/Info.java VASSAL-src/trunk/VASSAL/launch/Main.java Modified: VASSAL-src/trunk/VASSAL/Info.java =================================================================== --- VASSAL-src/trunk/VASSAL/Info.java 2007-08-28 05:39:11 UTC (rev 2378) +++ VASSAL-src/trunk/VASSAL/Info.java 2007-08-29 04:56:40 UTC (rev 2379) @@ -30,7 +30,7 @@ * Class for storing release-related information */ public final class Info { - private static final String VERSION = "3.0.3"; //$NON-NLS-1$ + private static final String VERSION = "3.0.4"; //$NON-NLS-1$ private static File homeDir; private static Boolean is2dEnabled; private static Boolean isDndEnabled; Modified: VASSAL-src/trunk/VASSAL/launch/Main.java =================================================================== --- VASSAL-src/trunk/VASSAL/launch/Main.java 2007-08-28 05:39:11 UTC (rev 2378) +++ VASSAL-src/trunk/VASSAL/launch/Main.java 2007-08-29 04:56:40 UTC (rev 2379) @@ -40,13 +40,13 @@ import VASSAL.tools.JarArchive; public class Main { - private boolean isFirstTime; - private boolean builtInModule; - private File moduleFile; - private boolean editMode; - private File savedGame; - private List<String> extractTargets = new ArrayList<String>(); - private List<String> autoExtensions = new ArrayList<String>(); + protected boolean isFirstTime; + protected boolean builtInModule; + protected File moduleFile; + protected boolean editMode; + protected File savedGame; + protected List<String> extractTargets = new ArrayList<String>(); + protected List<String> autoExtensions = new ArrayList<String>(); public Main(final String[] args) { initSystemProperties(); @@ -96,7 +96,7 @@ } } - private void reportError(Exception e) { + protected void reportError(Exception e) { e.printStackTrace(); String msg = e.getMessage(); if (msg == null) { @@ -132,9 +132,9 @@ protected void launch() throws IOException { if (builtInModule) { - GameModule.init(new BasicModule(new JarArchive())); + GameModule.init(createModule(createDataArchive())); for (String ext : autoExtensions) { - new ModuleExtension(new JarArchive(ext)).build(); + createExtension(ext).build(); } GameModule.getGameModule().getWizardSupport().showWelcomeWizard(); } @@ -147,7 +147,7 @@ new EditModuleAction(null).loadModule(moduleFile); } else { - GameModule.init(new BasicModule(new DataArchive(moduleFile.getPath()))); + GameModule.init(createModule(createDataArchive())); new ExtensionsLoader().addTo(GameModule.getGameModule()); Localization.getInstance().translate(); if (savedGame != null) { @@ -159,6 +159,23 @@ } } } + + protected ModuleExtension createExtension(String name) { + return new ModuleExtension(new JarArchive(name)); + } + + protected DataArchive createDataArchive() throws IOException { + if (builtInModule) { + return new JarArchive(); + } + else { + return new DataArchive(moduleFile.getPath()); + } + } + + protected GameModule createModule(DataArchive archive) { + return new BasicModule(archive); + } protected String getVersion() { return VASSAL.Info.getVersion(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |