Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7357] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-06-19 15:32:39
|
Revision: 7357
http://fudaa.svn.sourceforge.net/fudaa/?rev=7357&view=rev
Author: deniger
Date: 2012-06-19 15:32:33 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
maj test
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java
trunk/soft/fudaa-crue/crue-server/src/test/resources/integration/v1.1.1.zip
trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/save.png
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidatorForCrue9Export.java 2012-06-19 15:32:33 UTC (rev 7357)
@@ -401,13 +401,13 @@
}
private void validateBranche6(CatEMHBranche emh) {
- List<RelationEMHSectionDansBranche> sections = emh.getSections();
- for (RelationEMHSectionDansBranche relationSection : sections) {
- CatEMHSection section = relationSection.getEmh();
- if (containsMoreThanOneLit(section)) {
- addWarnOrError("crue9.compatible.branche6ContainsTooManyLit", emh.getNom(), section.getNom());
- }
- }
+// List<RelationEMHSectionDansBranche> sections = emh.getSections();
+// for (RelationEMHSectionDansBranche relationSection : sections) {
+// CatEMHSection section = relationSection.getEmh();
+// if (containsMoreThanOneLit(section)) {
+// addWarnOrError("crue9.compatible.branche6ContainsTooManyLit", emh.getNom(), section.getNom());
+// }
+// }
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationV1_1_1.java 2012-06-19 15:32:33 UTC (rev 7357)
@@ -78,9 +78,9 @@
bilans.put("Sc_Vierge_c10", sixInfos);
bilans.put("Sc_Poub_c10", sixInfos);
bilans.put("Sc_M3-0_c9c10", noMessage);
- bilans.put("Sc_M3-0_c10", new ErrorBilanTester(0, 0, 2, 0));
+ bilans.put("Sc_M3-0_c10", new ErrorBilanTester(0, 0, 0, 0));
bilans.put("Sc_M3-0_c10c9", noMessage);
- bilans.put("Sc_M3-0_c10c10", new ErrorBilanTester(0, 0, 2, 0));
+ bilans.put("Sc_M3-0_c10c10", new ErrorBilanTester(0, 0, 0, 0));
bilans.put("Sc_M3-0_v1c10", new ErrorBilanTester(0, 0, 5, 0));//inactive
bilans.put("Sc_M3-0_v2c10", new ErrorBilanTester(0, 0, 3, 0));// un warning car CaclPseudoPerm non constant en
// EMH,type
@@ -88,23 +88,23 @@
bilans.put("Sc_M3-0_v4c10", noMessage);
bilans.put("Sc_M3-0_v5c10", noMessage);
bilans.put("Sc_M3-0_v6c10", noMessage);
- bilans.put("Sc_M3-0_v7c10", new ErrorBilanTester(0, 0, 7, 0));
+ bilans.put("Sc_M3-0_v7c10", new ErrorBilanTester(0, 0, 4, 0));
bilans.put("Sc_M3-0_v8c10", new ErrorBilanTester(0, 0, 1, 0));
bilans.put("Sc_M3-0_v9c10", noMessage);
bilans.put("Sc_M3-0_v10c10", noMessage);
// les scenarios avec erreurs:
bilans.put("Sc_M3_e1c9", new ErrorBilanTester(1, 0, 1, 0));
bilans.put("Sc_M3_e2c9", new ErrorBilanTester(6, 0, 0, 0));
- bilans.put("Sc_M3-0_e1c9", new ErrorBilanTester(5, 0, 0, 0));
- bilans.put("Sc_M3-0_e2c9", new ErrorBilanTester(2, 0, 0, 0));
- bilans.put("Sc_M3-0_e3c9", new ErrorBilanTester(0, 8, 0, 0));
+ bilans.put("Sc_M3-0_e1c9", new ErrorBilanTester(7, 0, 0, 0));
+ bilans.put("Sc_M3-0_e2c9", new ErrorBilanTester(4, 0, 0, 0));
+ bilans.put("Sc_M3-0_e3c9", new ErrorBilanTester(2, 8, 0, 0));
bilans.put("Sc_M3-0_e1c10", new ErrorBilanTester(1, 0, 0, 0));
bilans.put("Sc_M3-0_e2c10", new ErrorBilanTester(5, 0, 0, 0));
bilans.put("Sc_M3-0_e3c10", new ErrorBilanTester(4, 0, 1, 0));
bilans.put("Sc_M3-0_e4c10", new ErrorBilanTester(1, 0, 0, 0));
bilans.put("Sc_M3-0_e5c10", new ErrorBilanTester(1, 0, 0, 0));
bilans.put("Sc_M3-0_e6c10", new ErrorBilanTester(1, 0, 0, 0));
- bilans.put("Sc_M3-0_e7c10", new ErrorBilanTester(1, 0, 0, 0));
+ bilans.put("Sc_M3-0_e7c10", new ErrorBilanTester(4, 0, 0, 0));
bilans.put("Sc_M3-0_e8c10", new ErrorBilanTester(10, 0, 0, 0));
bilans.put("Sc_M3-0_e9c10", new ErrorBilanTester(10, 0, 2, 0));
testAllScenario(bilans, projet);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/integration/v1.1.1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/ui-branding/nb-configuration.xml 2012-06-19 15:32:33 UTC (rev 7357)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
- <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
- </properties>
-</project-shared-configuration>
+-->
+ <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-06-19 15:32:33 UTC (rev 7357)
@@ -68,7 +68,8 @@
</folder>
<folder name="Toolbars">
<file name="Standard.xml_hidden"/>
- <file name="toolbar.xml" url="toolbar.xml">
+ <file name="UndoRedo_hidden"/>
+ <file name="toolbar.xml" url="toolbar.xml">
<attr intvalue="1" name="position"/>
</file>
<file name="Clipboard_hidden"/>
Modified: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/toolbar.xml 2012-06-19 15:32:33 UTC (rev 7357)
@@ -3,7 +3,7 @@
"http://www.netbeans.org/dtds/toolbar1_1.dtd">
<Configuration>
<Row>
- <Toolbar name="UndoRedo" visible="true" draggable="false" align="left" position="1"/>
+ <Toolbar name="SaveModelling" visible="false" draggable="false" align="left" position="1"/>
<Toolbar name="Perspective" visible="true" draggable="false" align="left" position="2"/>
<Toolbar name="State" visible="true" draggable="false" align="left" position="3"/>
</Row>
Modified: trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/ui-modelling/nb-configuration.xml 2012-06-19 15:32:33 UTC (rev 7357)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
- <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
- <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
- </properties>
-</project-shared-configuration>
+-->
+ <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java 2012-06-19 14:17:49 UTC (rev 7356)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingSaveAction.java 2012-06-19 15:32:33 UTC (rev 7357)
@@ -7,20 +7,21 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.Action;
+import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
import org.fudaa.fudaa.crue.modelling.perspective.PerspectiveServiceModelling;
import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioModificationService;
-import org.openide.awt.ActionRegistration;
-import org.openide.awt.ActionReference;
-import org.openide.awt.ActionReferences;
-import org.openide.awt.ActionID;
+import org.openide.awt.*;
import org.openide.util.Lookup;
+import org.openide.util.Lookup.Result;
import org.openide.util.NbBundle;
@ActionID(category = "View",
- id = "org.fudaa.fudaa.crue.modelling.ModellingSaveAction")
-@ActionRegistration(displayName = "#CTL_ModellingSaveAction")
+id = "org.fudaa.fudaa.crue.modelling.ModellingSaveAction")
+@ActionRegistration(displayName = "#CTL_ModellingSaveAction", iconBase = "org/fudaa/fudaa/crue/modelling/action/save.png")
@ActionReferences({
+ @ActionReference(path = "Toolbars/SaveModelling", position = 1),
@ActionReference(path = "Menu/Modelling", position = 1)
})
public final class ModellingSaveAction extends AbstractModellingAction implements PropertyChangeListener {
@@ -36,10 +37,17 @@
@Override
protected boolean getEnableState() {
- return super.getEnableState() && modellingScenarioModificationService!=null && modellingScenarioModificationService.isModified();
+ return super.getEnableState() && modellingScenarioModificationService != null && modellingScenarioModificationService.isModified();
}
@Override
+ protected void updateEnableState() {
+ super.updateEnableState();
+ Toolbar toolbar = ToolbarPool.getDefault().findToolbar("SaveModelling");
+ toolbar.getParent().setVisible(isMyPerspectiveActivated());
+ }
+
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
updateEnableState();
}
@@ -53,7 +61,7 @@
public void doAction() {
if (scenarioService.saveScenario()) {
DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(ModellingSaveAction.class, "ModellingSaveAction.SucceedMessage",
- scenarioService.getManagerScenarioLoaded().getNom()));
+ scenarioService.getManagerScenarioLoaded().getNom()));
PerspectiveServiceModelling perpective = Lookup.getDefault().lookup(PerspectiveServiceModelling.class);
perpective.setDirty(false);
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/save.png (from rev 7339, trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/crystal_enregistrer.png)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
