Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8436] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2013-07-11 22:03:35
|
Revision: 8436
http://sourceforge.net/p/fudaa/svn/8436
Author: deniger
Date: 2013-07-11 22:03:30 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
CRUE-541
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java
trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties
trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sydoc.html
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfig.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -27,6 +27,7 @@
private String coeurFolderPath;
private String comment;
private boolean usedByDefault;
+ private boolean crue9Dependant;
private CrueVersionType crueVersionType;
private CrueConfigMetier crueConfigMetier;
private File baseDir;
@@ -35,6 +36,15 @@
return baseDir;
}
+ public boolean isCrue9Dependant() {
+ return crue9Dependant;
+ }
+
+ public void setCrue9Dependant(boolean crue9Dependant) {
+ this.crue9Dependant = crue9Dependant;
+ }
+
+
public void setBaseDir(File baseDir) {
this.baseDir = baseDir;
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/coeur/CoeurConfigContrat.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -37,6 +37,8 @@
*/
boolean isUsedByDefault();
+ boolean isCrue9Dependant();
+
/**
* Utilise qu'en interne pour OTFA.
*
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -415,6 +415,7 @@
valid.nbrCatEMHNoeud=Nombre de noeuds
valid.nbrCatEMHConteneur=Nombre de CatEMHConteneur
valid.nbrPtEvolutionFF=Nombre de PtEvolutionFF
+valid.firstAbsLoiDf.mustBeZero=Le premier point de la LoiDF {0} doit avoir une abscisse \u00e9gale \u00e0 0
valid.nbrPtProfil=Nombre de PtProfil
valid.noNodes=La liste de noeuds est vide.
valid.noBranches=La liste de branches est vide.
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/etude/ManagerEMHScenario.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,6 +39,7 @@
super(CrueLevelType.SCENARIO, nom);
}
+ @Override
public String getEMHType() {
return EMHScenario.class.getSimpleName();
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueConverterCONF.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -73,6 +73,7 @@
metier.setName(dao.id);
metier.setComment(dao.Commentaire);
metier.setXsdVersion(dao.VersionGrammaire);
+ metier.setCrue9Dependant(dao.Crue9Dependant);
metier.setCoeurFolderPath(dao.DossierCoeur);
metier.setUsedByDefault(dao.CoeurParDefaut);
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/conf/CrueDaoStructureCONF.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -64,6 +64,7 @@
public String id;
public String Commentaire;
public String VersionGrammaire;
+ boolean Crue9Dependant;
public boolean CoeurParDefaut;
public String DossierCoeur;
}
Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/conf/CrueCONFTest.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static junit.framework.Assert.assertTrue;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.BusinessMessages;
@@ -88,6 +89,7 @@
CoeurConfig coeur = coeurs.get(0);
assertEquals("CRUE10.1", coeur.getName());
assertEquals("Coeur Crue10.1", coeur.getComment());
+ assertTrue(coeur.isCrue9Dependant());
assertEquals("1.1.1", coeur.getXsdVersion());
assertEquals(coeur.getName(), coeurManager.getCoeurConfig(coeur.getName()).getName());
try {
@@ -100,6 +102,7 @@
coeur = coeurs.get(1);
assertEquals("CRUE10.2a", coeur.getName());
assertEquals("Coeur Crue10.2a", coeur.getComment());
+ assertFalse(coeur.isCrue9Dependant());
assertEquals("1.2", coeur.getXsdVersion());
assertEquals(new File(baseDir, "Crue10.2a").getAbsolutePath(), coeur.getCoeurFolder().getAbsolutePath());
assertEquals(false, coeur.isUsedByDefault());
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/FudaaCrue_Site.xml 2013-07-11 22:03:30 UTC (rev 8436)
@@ -4,12 +4,14 @@
<Coeur id="CRUE10.1">
<Commentaire>Coeur Crue10.1</Commentaire>
<VersionGrammaire>1.1.1</VersionGrammaire>
+ <Crue9Dependant>true</Crue9Dependant>
<CoeurParDefaut>true</CoeurParDefaut>
<DossierCoeur>Crue10.1</DossierCoeur>
</Coeur>
<Coeur id="CRUE10.2a">
<Commentaire>Coeur Crue10.2a</Commentaire>
<VersionGrammaire>1.2</VersionGrammaire>
+ <Crue9Dependant>false</Crue9Dependant>
<CoeurParDefaut>false</CoeurParDefaut>
<DossierCoeur>Crue10.2a</DossierCoeur>
</Coeur>
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreator.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -59,6 +59,9 @@
}
private void copyLinkedCrue9Files(ManagerEMHScenario scenario, CtuluLog log, EMHRun newRun) {
+ if (!projet.getCoeurConfig().isCrue9Dependant()) {
+ return;
+ }
if (scenario.isCrue10() && scenario.getLinkedscenarioCrue9() != null) {
ManagerEMHScenario linkedScenarioCrue9 = projet.getScenario(scenario.getLinkedscenarioCrue9());
if (linkedScenarioCrue9 == null) {
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/ScenarioConverterProcess.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -53,7 +53,7 @@
EMHScenario emhScenario = null;
if (!errors.containsFatalError()) {
ManagerEMHScenario targetScenario = resultManager.getResult();
- if (targetScenario.isCrue10()) {
+ if (targetScenario.isCrue10() && projet.getCoeurConfig().isCrue9Dependant()) {
if (sourceScenario.isCrue9()) {
targetScenario.setLinkedscenarioCrue9(sourceScenario.getNom());
} else {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilder.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,7 +39,7 @@
return group;
}
SysdocFolder sysdocFolder = new SysdocFolder(baseDir);
- CtuluLibFile.getFileFromJar("/sysdoc.html", sysdocFolder.getSysdocHelpFile());
+ CtuluLibFile.getFileFromJar("/sydoc.html", sysdocFolder.getSysdocHelpFile());
File tocFile = sysdocFolder.getTocFile();
String error = CtuluLibFile.canWrite(tocFile);
if (error != null) {
@@ -49,7 +49,7 @@
File copied = null;
if (tocFile.exists()) {
try {
- copied = File.createTempFile("sysdoc-toc", ".xml");
+ copied = File.createTempFile("sydoc-toc", ".xml");
CtuluLibFile.copyFile(tocFile, copied);
} catch (IOException iOException) {
log.addSevereError(iOException.getMessage());
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/common/SysdocFolder.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -12,7 +12,7 @@
public class SysdocFolder {
public static final String INDEXHTML_FILENAME = "index.html";
- public static final String SYSDOC_FOLDER_NAME = ".sysdoc";
+ public static final String SYSDOC_FOLDER_NAME = ".sydoc";
private final File baseDir;
private final File sysdocDir;
private final File sysdocSearchIndexDir;
@@ -26,7 +26,7 @@
}
public File getSysdocHelpFile() {
- return new File(sysdocDir, "sysdoc.html");
+ return new File(sysdocDir, "sydoc.html");
}
public File getSysdocSearchIndexDir() {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessor.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -39,7 +39,7 @@
public CtuluLog write(File file, DocEntry entry) {
CtuluLog log = new CtuluLog(SysdocMessages.RESOURCE_BUNDLE);
PersistContent content = new PersistContent();
- content.setXsdName("sysdoc-" + version + ".xsd");
+ content.setXsdName("sydoc-" + version + ".xsd");
content.setEntry(entry);
FileOutputStream out = null;
try {
Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/org/fudaa/dodico/crue/sysdoc/common/sysdocMessages.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -1,11 +1,11 @@
file.write.error=Erreur lors de l'\u00e9criture du fichier
file.read.error=Erreur lors de la lecture du fichier
-tocNotFound.Error=La table des mati\u00e8res n''a pas \u00e9t\u00e9 trouv\u00e9. Contacter le responsable de Sysdoc afin de g\u00e9n\u00e9rer les fichiers n\u00e9cessaires.
+tocNotFound.Error=La table des mati\u00e8res n''a pas \u00e9t\u00e9 trouv\u00e9. Contacter le responsable de Sydoc afin de g\u00e9n\u00e9rer les fichiers n\u00e9cessaires.
tocNotFound.Info=Chemin: {0}
tocContentInvalid.Error=Le contenu de la tables des mati\u00e8res est invalide. Chemin {0}
RebuildToc.Log=Construction de la table des mati\u00e8res
-RebuildToc.CantCreateBaseFolder.Error=Le dossier de base de Sysdoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
-RebuildToc.CantCreateSysdocFolder.Error=Le dossier interne de Sysdoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
+RebuildToc.CantCreateBaseFolder.Error=Le dossier de base de Sydoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
+RebuildToc.CantCreateSysdocFolder.Error=Le dossier interne de Sydoc ne peut pas \u00eatre cr\u00e9e: {0}.\n V\u00e9rifier les droits d'acc\u00e8s au dossier.
RebuildToc.NoEntryFound= le dossier ne contient pas de fichiers de documentation au format html.
RebuildToc.NoEntryFound.Info=Dossier concern\u00e9: {0}
RebuildToc.OldTocKept=La g\u00e9n\u00e9ration de la table des mati\u00e8res a \u00e9chou\u00e9. L'ancien fichier a \u00e9t\u00e9 conserv\u00e9
Copied: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sydoc.html (from rev 8404, trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html)
===================================================================
Deleted: trunk/soft/fudaa-crue/crue-sysdoc/src/main/resources/sysdoc.html
===================================================================
Modified: trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/crue-validation/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelperLoi.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -30,23 +30,30 @@
}
public static CtuluLog valideLoi(final Loi in, final CrueConfigMetier props) {
- final CtuluLog res=new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ final CtuluLog res = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
valideLoi(in, props, res, null);
return res;
-
+
}
- protected static void valideLoi(final Loi in, final CrueConfigMetier props, final CtuluLog res, final String pref) {
+
+ protected static void valideLoi(final Loi in, final CrueConfigMetier ccm, final CtuluLog res, final String pref) {
final List<PtEvolutionFF> ptEvolutionFF = in.getEvolutionFF().getPtEvolutionFF();
final int size = ptEvolutionFF.size();
- props.getValidator("nbrPtLoi").validateNumber(BusinessMessages.getString("valid.nbrPtEvolutionFF"), size, res);
- if(size==0){
- res.addError("valid.nbrPtEvolutionFF.IsEmpty",in.getNom());
+ ccm.getValidator("nbrPtLoi").validateNumber(BusinessMessages.getString("valid.nbrPtEvolutionFF"), size, res);
+ if (size == 0) {
+ res.addError("valid.nbrPtEvolutionFF.IsEmpty", in.getNom());
+ } else if (LoiDF.class.equals(in.getClass())) {
+ double firstAbs = ptEvolutionFF.get(0).getAbscisse();
+ PropertyEpsilon loiAbscisseEps = ccm.getLoiAbscisseEps(in);
+ if (!loiAbscisseEps.isZero(firstAbs)) {
+ res.addError("valid.firstAbsLoiDf.mustBeZero", in.getNom());
+ }
}
-
- final PropertyValidator abscisseValidator = props.getLoiAbscisseValidator(in);
- validateListPt2d(ptEvolutionFF, abscisseValidator, props.getLoiOrdonneeValidator(in), res, pref);
- ConfigLoi configLoi = props.getConfLoi().get(in.getType());
- validControlLoi(configLoi, props, in, pref, ptEvolutionFF, res);
+
+ final PropertyValidator abscisseValidator = ccm.getLoiAbscisseValidator(in);
+ validateListPt2d(ptEvolutionFF, abscisseValidator, ccm.getLoiOrdonneeValidator(in), res, pref);
+ ConfigLoi configLoi = ccm.getConfLoi().get(in.getType());
+ validControlLoi(configLoi, ccm, in, pref, ptEvolutionFF, res);
}
public static void validControlLoi(ConfigLoi configLoi, final CrueConfigMetier props, final Loi in, final String pref,
@@ -109,11 +116,13 @@
valideLoi(cont.getLoi(), props, res, prefix);
}
- public static CtuluLog validateLoiDF(final LoiDF loi, final CrueConfigMetier map) {
+ public static CtuluLog validateLoiDF(final LoiDF loi, final CrueConfigMetier ccm) {
final CtuluLog res = new CtuluLog();
res.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
res.setDesc(loi.getNom());
- valideLoi(loi, map, res, null);
+ valideLoi(loi, ccm, res, null);
+ final List<PtEvolutionFF> ptEvolutionFF = loi.getEvolutionFF().getPtEvolutionFF();
+
return res;
}
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrueDev.conf 2013-07-11 22:03:30 UTC (rev 8436)
@@ -3,7 +3,7 @@
# options used by the launcher by default, can be overridden by explicit
# command line switches
-default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc" -J-Xmx512m --branding fudaacrue -J-Dsysdoc-admin=true"
+default_options="-J-Ddev.etcDir="C:\data\Fudaa-Crue\etc" -J-Xmx512m --branding fudaacrue -J-Dsydoc-admin=true"
# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
# default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -1,9 +1,9 @@
-currentVersion=Fudaa-Crue {0}
-LBL_splash_window_title=Starting Fudaa-Crue
-SPLASH_HEIGHT=290
-SPLASH_WIDTH=400
-SplashProgressBarBounds=0,237,400,20
-SplashProgressBarColor=0xFF
-SplashRunningTextBounds=6,224,380,10
-SplashRunningTextColor=0xFF
-SplashRunningTextFontSize=12
+currentVersion=Fudaa-Crue {0}
+LBL_splash_window_title=Starting Fudaa-Crue
+SPLASH_HEIGHT=664
+SPLASH_WIDTH=664
+SplashProgressBarBounds=69,294,541,12
+SplashProgressBarColor=0xFF
+SplashRunningTextBounds=31,314,608,23
+SplashRunningTextColor=0xFF
+SplashRunningTextFontSize=7
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CopyManagerNodeAction.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -85,8 +85,8 @@
NbBundle.getMessage(getClass(), "CopyAction.TypeMessage"),
NbBundle.getMessage(getClass(), "CopyAction.Title"), JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE, null, new String[]{NbBundle.getMessage(getClass(),
- "CopyAction.OneButton"), NbBundle.getMessage(
- getClass(), "CopyAction.DeepButton"), NbBundle.getMessage(getClass(), "CopyAction.CancelButton")},
+ "CopyAction.OneButton"), NbBundle.getMessage(
+ getClass(), "CopyAction.DeepButton"), NbBundle.getMessage(getClass(), "CopyAction.CancelButton")},
NbBundle.getMessage(getClass(), "CopyAction.OneButton"));
if (res < 0 || res > 1) {
@@ -315,7 +315,7 @@
if (srcContainer instanceof ManagerEMHScenario) {
final ManagerEMHScenario destScenario = new ManagerEMHScenario(this.infos.containersToCopy.get(srcContainer));
- if (((ManagerEMHScenario) srcContainer).isCrue10()) {
+ if (((ManagerEMHScenario) srcContainer).isCrue10() && infos.project.getCoeurConfig().isCrue9Dependant()) {
destScenario.setLinkedscenarioCrue9(((ManagerEMHScenario) srcContainer).getLinkedscenarioCrue9());
}
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ManagerEMHScenarioNode.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -78,7 +78,7 @@
@Override
public final boolean canDestroy() {
ManagerEMHScenario thisScenario = getManagerEMHScenario();
- if (thisScenario.isCrue9()) {
+ if (thisScenario.isCrue9() && getProjet().getCoeurConfig().isCrue9Dependant()) {
List<ManagerEMHScenario> listeScenarios = getProjet().getListeScenarios();
for (ManagerEMHScenario scenario : listeScenarios) {
if (scenario.isCrue10() && StringUtils.equals(thisScenario.getNom(), scenario.getLinkedscenarioCrue9())) {
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/ManagerRoleOptionProcessor.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -20,7 +20,7 @@
@ServiceProvider(service = OptionProcessor.class)
public class ManagerRoleOptionProcessor extends OptionProcessor {
- private Option openAsManager = Option.withoutArgument(Option.NO_SHORT_NAME, "sysdoc-admin");
+ private Option openAsManager = Option.withoutArgument(Option.NO_SHORT_NAME, "sydoc-admin");
@Override
protected Set<Option> getOptions() {
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/admin/SysdocAdminUI.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -43,7 +43,7 @@
*
* @author Frederic Deniger
*/
-@Messages("CheckMsg.Button=Contr\u00f4ler Sysdoc")
+@Messages("CheckMsg.Button=Contr\u00f4ler Sydoc")
public class SysdocAdminUI {
private ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
@@ -52,11 +52,11 @@
* permet d'activer le role d'admin sysdoc: utiliser pour le OptionProcessor ManagerRoleOptionProcessor.
*/
public static void activeRole() {
- System.setProperty("sysdoc-admin", "true");
+ System.setProperty("sydoc-admin", "true");
}
public static boolean isRoleActivated() {
- return "true".equals(System.getProperty("sysdoc-admin"));
+ return "true".equals(System.getProperty("sydoc-admin"));
}
SysdocTopComponent sysdocTopComponent;
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/java/org/fudaa/fudaa/crue/sysdoc/services/SysdocService.java 2013-07-11 22:03:30 UTC (rev 8436)
@@ -93,7 +93,7 @@
}
public File getSysdocLocalizedDir() {
- File sysdocBaseDir = new File(configurationManagerService.getCoeurManager().getSiteDir(), "sysdoc");
+ File sysdocBaseDir = new File(configurationManagerService.getCoeurManager().getSiteDir(), "sydoc");
String local = configurationManagerService.getCurrentLocale();
File sysdocLocaleDir = new File(sysdocBaseDir, local);
return sysdocLocaleDir;
Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-07-11 20:26:23 UTC (rev 8435)
+++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/Bundle.properties 2013-07-11 22:03:30 UTC (rev 8436)
@@ -3,12 +3,12 @@
#OpenIDE-Module-Short-Description=
#OpenIDE-Module-Long-Description=
#OpenIDE-Module-Display-Category=
-Menu/Sysdoc=Sysdoc
-CTL_SysdocTopComponent=Sysdoc
+Menu/Sysdoc=Sydoc
+CTL_SysdocTopComponent=Sydoc
HINT_SysdocTopComponent=Aide int\u00e9gr\u00e9e de Fudaa-Crue
FileNotFoundError=Le fichier cible n''existe pas: {0}
OpenDocLink.Error=Le chemin {0} n''est pas d\u00e9fini dans Sysdoc
-BuildToc.Button.Tooltip=Utiliser ce bouton pour charger un page vide et d\u00e9bloquer l'acc\u00e8s aux fichiers de sysdoc
+BuildToc.Button.Tooltip=Utiliser ce bouton pour charger un page vide et d\u00e9bloquer l'acc\u00e8s aux fichiers de Sydoc
SysdocAdmingressMsgTest=Construction de la table des mati\u00e8res
Sysdoc.TocTooltip=Table des mati\u00e8res
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
