Revision 43328 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/Launcher.java
Launcher.java | ||
---|---|---|
113 | 113 |
import org.gvsig.andami.config.generate.Andami; |
114 | 114 |
import org.gvsig.andami.config.generate.AndamiConfig; |
115 | 115 |
import org.gvsig.andami.config.generate.Plugin; |
116 |
import org.gvsig.andami.impl.DefaultArguments; |
|
116 | 117 |
import org.gvsig.andami.impl.UnsavedDataException; |
117 | 118 |
import org.gvsig.andami.messages.Messages; |
118 | 119 |
import org.gvsig.andami.messages.NotificationManager; |
... | ... | |
202 | 203 |
*/ |
203 | 204 |
public class Launcher { |
204 | 205 |
|
206 |
private static Arguments arguments; |
|
207 |
|
|
205 | 208 |
public static abstract class MapWithAlias<Item> extends HashMap<String, Item> { |
206 | 209 |
|
207 | 210 |
private HashMap<String, String> aliases = new HashMap<String, String>(); |
... | ... | |
447 | 450 |
} |
448 | 451 |
return deprecatedPluginNames; |
449 | 452 |
} |
450 |
|
|
453 |
|
|
454 |
public static Arguments getArguments() { |
|
455 |
return arguments; |
|
456 |
} |
|
457 |
|
|
451 | 458 |
public void doMain(String[] args) throws Exception { |
452 | 459 |
|
453 | 460 |
if (args.length < 1) { |
454 |
System.err.println("Usage: Launcher appName plugins-directory [language=locale]"); |
|
461 |
System.err.println("Usage: Launcher appName plugins-directory [--language=locale]");
|
|
455 | 462 |
System.err.println("No arguments specified."); |
456 | 463 |
System.err.println("Use default arguments 'gvSIG gvSIG/extensiones'"); |
457 | 464 |
args = new String[]{"gvSIG", "gvSIG/extensiones"}; |
458 | 465 |
} |
466 |
arguments = new DefaultArguments(args); |
|
459 | 467 |
|
460 | 468 |
initializeApp(args, null); |
461 | 469 |
|
... | ... | |
797 | 805 |
} else { |
798 | 806 |
appName = args[0]; |
799 | 807 |
} |
808 |
// Hacemos visibles los argumentos como una propiedad est�tica |
|
809 |
// de plugin services para quien lo quiera usar (por ejemplo, para |
|
810 |
// cargar un proyecto por l�nea de comandos) |
|
811 |
PluginServices.setArguments(args); |
|
812 |
|
|
800 | 813 |
getOrCreateConfigFolder(); |
801 | 814 |
configureLogging(appName, applicationClasifier); |
802 | 815 |
if (!validJVM()) { |
... | ... | |
814 | 827 |
loadAndamiConfig(args[1]); |
815 | 828 |
} |
816 | 829 |
|
817 |
// Hacemos visibles los argumentos como una propiedad est�tica |
|
818 |
// de plugin services para quien lo quiera usar (por ejemplo, para |
|
819 |
// cargar un proyecto por l�nea de comandos) |
|
820 |
PluginServices.setArguments(args); |
|
830 |
configureLocales(); |
|
821 | 831 |
|
822 |
configureLocales(args); |
|
823 |
|
|
824 | 832 |
logger.info("Configure LookAndFeel"); |
825 | 833 |
configureLookAndFeel(); |
826 | 834 |
} |
... | ... | |
1152 | 1160 |
} |
1153 | 1161 |
|
1154 | 1162 |
private boolean validJVM() { |
1155 |
if (!SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)) {
|
|
1156 |
logger.warn("gvSIG requires Java version 1.4 or higher.");
|
|
1163 |
if (!SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)) {
|
|
1164 |
logger.warn("gvSIG requires Java version 1.6 or higher.");
|
|
1157 | 1165 |
logger.warn("The Java HOME is '" + SystemUtils.getJavaHome().getAbsolutePath() + "'."); |
1158 | 1166 |
return false; |
1159 | 1167 |
} |
... | ... | |
3092 | 3100 |
* Swing are configured. |
3093 | 3101 |
* |
3094 | 3102 |
*/ |
3095 |
private static void configureLocales(String[] args) {
|
|
3103 |
private static void configureLocales() { |
|
3096 | 3104 |
// Configurar el locale |
3097 | 3105 |
String localeStr = null; |
3098 | 3106 |
|
3099 |
localeStr = PluginServices.getArgumentByName("language"); |
|
3100 |
if (localeStr == null) { |
|
3107 |
if( getArguments().contains("language") ) { |
|
3108 |
localeStr = getArguments().get("language"); |
|
3109 |
} else { |
|
3101 | 3110 |
localeStr = andamiConfig.getLocaleLanguage(); |
3102 | 3111 |
} |
3103 | 3112 |
localeStr = normalizeLanguageCode(localeStr); |
Also available in: Unified diff