Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6846] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2011-12-16 00:23:05
|
Revision: 6846
http://fudaa.svn.sourceforge.net/fudaa/?rev=6846&view=rev
Author: deniger
Date: 2011-12-16 00:22:58 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/etude/EMHProjet.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -84,11 +84,15 @@
}
public File getDirForRun(final ManagerEMHScenario sc, final EMHRun runCourant) {
- File dir = new File(getInfos().getDirectories().get(EMHProjectInfos.RUNS), sc.getNom());
+ File dir = getMainDirOfRuns(sc);
dir = new File(dir, runCourant.getNom());
return dir;
}
+ public File getMainDirOfRuns(final ManagerEMHScenario sc) {
+ return new File(getInfos().getDirectories().get(EMHProjectInfos.RUNS), sc.getNom());
+ }
+
/**
* @return the dir that contains the dc and dh files.
*/
@@ -248,13 +252,7 @@
* @param scenario
*/
public void deleteDirOfRuns(ManagerEMHScenario scenario) {
- final List<EMHRun> listeRuns = scenario.getListeRuns();
- if (CollectionUtils.isNotEmpty(listeRuns)) {
- for (EMHRun run : listeRuns) {
- CtuluLibFile.deleteDir(getDirForRun(scenario, run));
- }
-
- }
+ CtuluLibFile.deleteDir(getMainDirOfRuns(scenario));
}
/**
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/CommonMessage.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -22,6 +22,16 @@
}
public static void resetFrameTitle() {
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ resetFrameTitle();
+ }
+ });
+ return;
+ }
WindowManager.getDefault().getMainWindow().setTitle(getDefaultFrameTitle());
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/AbstractManagerNode.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.crue.study.node;
+import java.awt.EventQueue;
import java.io.IOException;
import java.util.concurrent.Callable;
import org.apache.commons.collections.CollectionUtils;
@@ -14,6 +15,7 @@
import org.joda.time.LocalDateTime;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;
@@ -30,6 +32,7 @@
public AbstractManagerNode(Children children, T manager) {
super(children, Lookups.singleton(manager));
classManager = manager.getClass();
+ setValue("customDelete", Boolean.TRUE);
}
public T getManager() {
@@ -57,13 +60,27 @@
@Override
public void destroy() throws IOException {
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ destroy();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ });
+ return;
+ }
if (getManager() instanceof ManagerEMHScenario && CollectionUtils.isNotEmpty(((ManagerEMHScenario) getManager()).getListeRuns())) {
- boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ScenarioWithRuns.ConfirmationMessage"));
+ boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ScenarioWithRuns.ConfirmationMessage", getName()));
if (!accepted) {
return;
}
} else {
- boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ConfirmationMessage"));
+ boolean accepted = DialogHelper.showQuestion(getName(), NbBundle.getMessage(AbstractManagerNode.class, "DeleteAction.ConfirmationMessage", getName()));
if (!accepted) {
return;
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -4,6 +4,7 @@
*/
package org.fudaa.fudaa.crue.study.node;
+import java.awt.EventQueue;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.Callable;
@@ -20,6 +21,7 @@
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.Sheet;
+import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.actions.SystemAction;
import org.openide.util.lookup.Lookups;
@@ -36,6 +38,7 @@
super(Children.LEAF, Lookups.singleton(fichier));
setName(fichier.getNom());
updateIcon();
+ setValue("customDelete", Boolean.TRUE);
}
public FichierCrue getFichierCrue() {
@@ -56,8 +59,9 @@
}
public boolean fileExists() {
- FichierCrue lookup = getFichierCrue();
- final boolean exists = lookup.getProjectFile(projetService.getSelectedProject()).exists();
+ FichierCrue fichierCrue = getFichierCrue();
+ final EMHProjet selectedProject = projetService.getSelectedProject();
+ final boolean exists = fichierCrue.getProjectFile(selectedProject).exists();
return exists;
}
@@ -84,6 +88,21 @@
@Override
public void destroy() throws IOException {
+ //les actions sont effectuées dans un thread a part.
+ if (!EventQueue.isDispatchThread()) {
+ EventQueue.invokeLater(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ destroy();
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ });
+ return;
+ }
Callable<Boolean> deleteCallable = new Callable<Boolean>() {
@Override
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingManagerEMHSousModele.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -17,10 +17,8 @@
* @author genesis
*/
public class ListingManagerEMHSousModele extends ChildrenKeysAbstract<ManagerEMHSousModele> {
-
+
StudyChangeListenerService studyChangeListenerService = Lookup.getDefault().lookup(StudyChangeListenerService.class);
-
-
private final NodesManager nodeManager;
public ListingManagerEMHSousModele(NodesManager nodeManager) {
@@ -41,7 +39,9 @@
}
public Children createChildren(ManagerEMHSousModele sousModele) {
-
+ if (sousModele.getListeFichiers() == null) {
+ return Children.LEAF;
+ }
AbstractNode fichier = new FichierCrueManagerNode(sousModele.getListeFichiers(), nodeManager);
Children.Array res = new Children.Array();
res.add(new Node[]{fichier});
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-12-15 23:50:15 UTC (rev 6845)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/services/EMHProjetService.java 2011-12-16 00:22:58 UTC (rev 6846)
@@ -71,8 +71,8 @@
}
/**
- * Utilise pour une modification qui demande un rechargement de etude.
- * @param call
+ * Utilise pour une modification qui demande un rechargement de l'etude. Apres appel a call.call une sauvegarde est effectuée.
+ * @param call action sur EMHProjet.
* @param logString
*/
public void deepModification(Callable<Boolean> call, String logString) {
@@ -80,6 +80,7 @@
try {
Boolean ok = call.call();
if (Boolean.TRUE.equals(ok)) {
+ quickSave();
reload(logString);
}
} catch (Exception ex) {
@@ -158,8 +159,8 @@
void activeProject(EMHProjet project, File etuFile) {
this.etuFile = etuFile;
+ dynamicContent.add(project);
nodesManager.setProject(project, etuFile);
- dynamicContent.add(project);
registerListener(project);
CommonMessage.modifyFrameTitle(etuFile.getAbsolutePath());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
