Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7152] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-05-04 19:04:25
|
Revision: 7152
http://fudaa.svn.sourceforge.net/fudaa/?rev=7152&view=rev
Author: deniger
Date: 2012-05-04 19:04:19 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs-old.zip
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/ConfigurationManagerService.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -16,7 +16,6 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
-import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.common.BusinessMessages;
@@ -25,14 +24,12 @@
import org.fudaa.dodico.crue.config.CrueConfigMetierLoader;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
import org.fudaa.dodico.crue.io.conf.CrueCONFReaderWriter;
-import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfig;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigComparator;
import org.fudaa.dodico.crue.projet.coeur.CoeurConfigContrat;
import org.fudaa.dodico.crue.projet.coeur.CoeurManager;
import org.fudaa.dodico.crue.projet.coeur.CoeurManagerValidator;
import org.fudaa.dodico.crue.projet.conf.Configuration;
-import org.fudaa.dodico.crue.projet.conf.Option;
import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
import org.fudaa.dodico.crue.projet.conf.OptionsManager;
import org.fudaa.dodico.crue.projet.conf.UserConfiguration;
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/InstallationService.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -86,8 +86,11 @@
@Override
public void run() {
- DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
- NbBundle.getMessage(InstallationService.class, "Installation.CreateDefaultSiteAndCoeur.DialogContent", siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
+ DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(InstallationService.class,
+ "Installation.CreateDefaultSiteAndCoeur.DialogTitle"),
+ NbBundle.getMessage(InstallationService.class,
+ "Installation.CreateDefaultSiteAndCoeur.DialogContent",
+ siteConfig.getAbsolutePath(), coeurDir.getAbsoluteFile()));
}
});
}
@@ -106,8 +109,14 @@
public File getSiteDir() {
if (etcDir == null) {
- File platformDir = new File(System.getProperty("netbeans.home"));
- etcDir = new File(platformDir.getParentFile(), "etc");
+ String property = System.getProperty("dev.etcDir");
+ if (property != null) {
+ Logger.getLogger(InstallationService.class.getName()).log(Level.WARNING, "custom etc dir used: {0} ", property);
+ etcDir = new File(property);
+ } else {
+ File platformDir = new File(System.getProperty("netbeans.home"));
+ etcDir = new File(platformDir.getParentFile(), "etc");
+ }
}
return etcDir;
}
Deleted: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs-old.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncherServiceImpl.java 2012-05-04 19:04:19 UTC (rev 7152)
@@ -3,6 +3,7 @@
import java.io.File;
import java.util.EnumMap;
import java.util.Map;
+import java.util.MissingResourceException;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.io.common.CrueFileType;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
@@ -93,11 +94,16 @@
new Thread(runnable).start();
// requestProcessor.post(runnable);
} else {
+ final CoeurConfigContrat coeurConfig = execInputDefault.getProjet().getCoeurConfig();
+ if (!validCrue10(coeurConfig)) {
+ return;
+ }
+
perspectiveServicePost.setDirty(true);
try {
Crue10OptionBuilder optionsBuilder = new Crue10OptionBuilder(getExecOptions());
ExecConfigurer createConfigurer = optionsBuilder.createConfigurer(execInputDefault, options);
- getCrue10Runner(execInputDefault.getProjet().getCoeurConfig()).launchOn(execInputDefault, null, createConfigurer);
+ getCrue10Runner(coeurConfig).launchOn(execInputDefault, null, createConfigurer);
runAfter.run();
} finally {
perspectiveServicePost.setDirty(false);
@@ -105,6 +111,22 @@
}
}
+ /**
+ *
+ * @param coeurConfig
+ * @return true si l'excecutable existe.
+ */
+ private boolean validCrue10(final CoeurConfigContrat coeurConfig) {
+ File execFile = new File(coeurConfig.getExecFile());
+ if (!execFile.exists()) {
+ DialogHelper.showError(NbBundle.getMessage(CrueRunLauncherServiceImpl.class, "crue10Exe.notExist"),
+ NbBundle.getMessage(CrueRunLauncherServiceImpl.class, "crue10Exe.notExist.Details",
+ coeurConfig.getXsdVersion(), execFile.getAbsolutePath()));
+ return false;
+ }
+ return true;
+ }
+
public void runOld(ExecInputDefault execInputDefault, Map<CrueFileType, RunCalculOption> options) {
//TODO faire un thread et logger les résulat.
ManagerEMHScenario scenario = execInputDefault.getScenario();
@@ -121,7 +143,7 @@
if (scenario.isCrue9()) {
return validCrue9();
}
- return new File(coeurConfig.getExecFile()).exists();
+ return validCrue10(coeurConfig);
}
/**
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-03 22:38:34 UTC (rev 7151)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-05-04 19:04:19 UTC (rev 7152)
@@ -20,3 +20,4 @@
LaunchCrue9.ExecNotDefined.DialogMessage=<html><body>Le chemin vers l'ex\u00e9cutable Crue9 n'est pas d\u00e9fini.<br>Pour le faire, aller dans le menu Outils et Option.</body></html>
LaunchCrue9.ExecNotDefined.DialogTitle=Ex\u00e9cutable Crue9 non d\u00e9fini
Progression.Crue9.Name=Lancement de Crue9
+
Copied: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties (from rev 7151, trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties)
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/services/Bundle.properties 2012-05-04 19:04:19 UTC (rev 7152)
@@ -0,0 +1,6 @@
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+crue10Exe.notExist=Ex\u00e9cutable crue10 non trouv\u00e9
+crue10Exe.notExist.Details=<html><body>L''ex\u00e9cutable crue10.exe du coeur {0} n''a pas \u00e9t\u00e9 trouv\u00e9. Il est attendu \u00e0 l''emplacement:<br><ul><li> {1}</li></ul></body></html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
