Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7470] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-09 16:39:29
|
Revision: 7470
http://fudaa.svn.sourceforge.net/fudaa/?rev=7470&view=rev
Author: deniger
Date: 2012-07-09 16:39:08 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
maj listes d'EMH
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java
trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PdtVarPanelEditor.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioORESNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/CommonObjectNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pcalWsmode.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimeEditor.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimePanel.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioPCALNodeAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.form
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingPCALTopComponentTest.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamCalcScenario.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -6,11 +6,14 @@
package org.fudaa.dodico.crue.metier.emh;
import org.fudaa.dodico.crue.config.CrueConfigMetier;
+import org.fudaa.dodico.crue.metier.annotation.PropertyDesc;
import org.fudaa.dodico.crue.metier.transformer.EnumToString;
import org.fudaa.dodico.crue.metier.transformer.ToStringTransformable;
import org.joda.time.LocalDateTime;
public class ParamCalcScenario extends AbstractInfosEMH implements ToStringTransformable {
+
+ public static final String PROP_DATE_DEB="dateDebSce";
private LocalDateTime dateDebSce;
@@ -18,9 +21,19 @@
dateDebSce = props.getDefaultDateValue("dateDebSce");
}
+ private ParamCalcScenario(LocalDateTime dateDebSce) {
+ this.dateDebSce = dateDebSce;
+ }
+
+ public ParamCalcScenario deepClone() {
+ return new ParamCalcScenario(dateDebSce);
+
+ }
+
/**
* @pdOid 7557974c-0ceb-4aec-9eee-7b7f4cc3c00d
*/
+ @PropertyDesc(i18n="dateDebSce.property")
public final LocalDateTime getDateDebSce() {
return dateDebSce;
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2012-07-09 16:39:08 UTC (rev 7470)
@@ -967,6 +967,8 @@
ElemPdt.property=El\u00e9ment
nbrPdt.property=Nombre de pas de temps
dureePdt.property=Dur\u00e9e
+dateDebSce.property=Date d\u00e9but du sc\u00e9nario
+
day.shortDesc=j
hour.shortDesc=H
min.shortDesc=min
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-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/layer.xml 2012-07-09 16:39:08 UTC (rev 7470)
@@ -104,6 +104,7 @@
<file name="modelling-optr.wsmode" url="modelling-optrWsmode.xml"/>
<file name="modelling-opti.wsmode" url="modelling-optiWsmode.xml"/>
<file name="modelling-pnum.wsmode" url="modelling-pnumWsmode.xml"/>
+ <file name="modelling-pcal.wsmode" url="modelling-pcalWsmode.xml"/>
<file name="post-editor.wsmode" url="post-editorWsmode.xml"/>
<file name="post-topRight.wsmode" url="post-topRightWsmode.xml"/>
<file name="post-bottomRight.wsmode" url="post-bottomRightWsmode.xml"/>
Copied: trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pcalWsmode.xml (from rev 7469, trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pnumWsmode.xml)
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pcalWsmode.xml (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/resources/org/fudaa/fudaa/crue/branding/modelling-pcalWsmode.xml 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mode version="2.4">
+ <name unique="modelling-pcal"/>
+ <kind type="view"/>
+ <state type="separated"/>
+ <bounds x="250" y="50" width="536" height="436" />
+ <frame state="0"/>
+ <empty-behavior permanent="false"/>
+</mode>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -4,6 +4,8 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.fudaa.fudaa.crue.common.editor.LocalDateTimeEditor;
+import org.fudaa.fudaa.crue.common.pdt.DurationPropertyEditor;
import org.fudaa.fudaa.crue.common.services.PerspectiveService;
import org.fudaa.fudaa.crue.common.services.SelectedPerspectiveService;
import org.openide.modules.ModuleInstall;
@@ -30,6 +32,8 @@
@Override
public void restored() {
BuResource.BU.setIconFamily("crystal");
+ DurationPropertyEditor.registerEditor();
+ LocalDateTimeEditor.registerEditor();
WindowManager.getDefault().invokeWhenUIReady(this);
}
Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimeEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimeEditor.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimeEditor.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,87 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.editor;
+
+import java.awt.Component;
+import java.beans.*;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.openide.explorer.propertysheet.ExPropertyEditor;
+import org.openide.explorer.propertysheet.PropertyEnv;
+import org.openide.nodes.Node;
+
+/**
+ *
+ * @author Frédéric Deniger
+ */
+public class LocalDateTimeEditor extends PropertyEditorSupport implements ExPropertyEditor, PropertyChangeListener {
+
+ public static void registerEditor() {
+ PropertyEditorManager.registerEditor(LocalDateTime.class, LocalDateTimeEditor.class);
+ }
+ public final static DateTimeFormatter SHORT_DATE_TIME = DateTimeFormat.shortDateTime();
+ PropertyEnv env;
+
+ @Override
+ public void attachEnv(PropertyEnv env) {
+ this.env = env;
+ env.addPropertyChangeListener(this);
+ env.setState(PropertyEnv.STATE_NEEDS_VALIDATION);
+ FeatureDescriptor featureDescriptor = env.getFeatureDescriptor();
+ featureDescriptor.setValue("suppressCustomEditor", Boolean.FALSE);
+ PropertyCrueUtils.configureNoEditAsText(featureDescriptor);
+ }
+ LocalDateTimePanel localDateTimePanel;
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (PropertyEnv.PROP_STATE.equals(evt.getPropertyName())
+ && evt.getNewValue() == PropertyEnv.STATE_VALID) {
+ setValue(localDateTimePanel.getLocalDateTime());
+ }
+ }
+
+ @Override
+ public boolean supportsCustomEditor() {
+ return true;
+ }
+
+ @Override
+ public Component getCustomEditor() {
+ if (localDateTimePanel == null) {
+ localDateTimePanel = new LocalDateTimePanel();
+ }
+ Node.Property featureDescriptor = (Node.Property) env.getFeatureDescriptor();
+ localDateTimePanel.setLocalDateTime((LocalDateTime) getValue());
+ localDateTimePanel.setEditable(featureDescriptor.canWrite());
+ return localDateTimePanel;
+ }
+
+ @Override
+ public String getAsText() {
+ LocalDateTime value = (LocalDateTime) getValue();
+ if (value == null) {
+ return StringUtils.EMPTY;
+ }
+ return SHORT_DATE_TIME.print(value);
+ }
+
+ @Override
+ public void setAsText(String text) throws IllegalArgumentException {
+ try {
+ DateTime parseDateTime = SHORT_DATE_TIME.parseDateTime(text);
+ if (parseDateTime != null) {
+ LocalDateTime local = new LocalDateTime(parseDateTime);
+ setValue(local);
+ }
+ } catch (Exception e) {
+ }
+ super.setAsText(text);
+ }
+}
Added: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimePanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimePanel.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/editor/LocalDateTimePanel.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,84 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.common.editor;
+
+import java.awt.FlowLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import org.fudaa.fudaa.crue.common.pdt.DurationPanelEditor;
+import org.jdesktop.swingx.JXDatePicker;
+import org.joda.time.LocalDateTime;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frédéric Deniger
+ */
+public class LocalDateTimePanel extends JPanel {
+
+ JXDatePicker datePicker = new JXDatePicker();
+ JSpinner hour;
+ JSpinner min;
+ JSpinner sec;
+
+ public LocalDateTimePanel() {
+ setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 0));
+ add(datePicker);
+ sec = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
+ ((JSpinner.DefaultEditor) sec.getEditor()).getTextField().setColumns(2);
+
+ min = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
+ ((JSpinner.DefaultEditor) min.getEditor()).getTextField().setColumns(2);
+
+ hour = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
+ ((JSpinner.DefaultEditor) hour.getEditor()).getTextField().setColumns(2);
+ add(new JLabel(" "));
+ add(hour);
+ add(new JLabel(NbBundle.getMessage(DurationPanelEditor.class, "Hour.Label")));
+ add(new JLabel(" "));
+ add(min);
+ add(new JLabel(NbBundle.getMessage(DurationPanelEditor.class, "Minute.Label")));
+ add(new JLabel(" "));
+ add(sec);
+ }
+
+ public void setLocalDateTime(LocalDateTime time) {
+ if (time == null) {
+ hour.setValue(0);
+ min.setValue(0);
+ sec.setValue(0);
+ datePicker.setDate(null);
+ } else {
+ hour.setValue(time.getHourOfDay());
+ min.setValue(time.getMinuteOfHour());
+ sec.setValue(time.getSecondOfMinute());
+ datePicker.setDate(time.toDateTime().toDate());
+ }
+ }
+
+ public int getValue(JSpinner spinner) {
+ return ((Number) spinner.getValue()).intValue();
+ }
+
+ public LocalDateTime getLocalDateTime() {
+ long time = datePicker.getDate().getTime();
+// hour.getValue()
+// time+=getValue(min)
+ LocalDateTime dateTime = new LocalDateTime(datePicker.getDate());
+ dateTime = dateTime.withHourOfDay(getValue(hour));
+ dateTime = dateTime.withMinuteOfHour(getValue(min));
+ dateTime = dateTime.withSecondOfMinute(getValue(sec));
+ return new LocalDateTime(dateTime);
+ }
+
+ void setEditable(boolean canWrite) {
+ datePicker.setEditable(canWrite);
+ hour.setEnabled(canWrite);
+ min.setEnabled(canWrite);
+ sec.setEnabled(canWrite);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/DurationPropertyEditor.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -5,10 +5,7 @@
package org.fudaa.fudaa.crue.common.pdt;
import java.awt.Component;
-import java.beans.FeatureDescriptor;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyEditorSupport;
+import java.beans.*;
import org.fudaa.dodico.crue.common.DateDurationConverter;
import org.fudaa.fudaa.crue.common.property.PropertyCrueUtils;
import org.joda.time.Duration;
@@ -16,13 +13,16 @@
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.nodes.Node;
-import org.openide.nodes.PropertySupport;
/**
*
* @author Frédéric Deniger
*/
public class DurationPropertyEditor extends PropertyEditorSupport implements ExPropertyEditor, PropertyChangeListener {
+
+ public static void registerEditor() {
+ PropertyEditorManager.registerEditor(Duration.class, DurationPropertyEditor.class);
+ }
PropertyEnv env;
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PdtVarPanelEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PdtVarPanelEditor.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/pdt/PdtVarPanelEditor.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -35,9 +35,7 @@
*/
public class PdtVarPanelEditor extends JPanel implements ExplorerManager.Provider, Lookup.Provider {
- static {
- PropertyEditorManager.registerEditor(Duration.class, DurationPropertyEditor.class);
- }
+
OutlineView view;
private ExplorerManager em = new ExplorerManager();
JButton btAdd;
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/property/AbstractNodeFirable.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -9,6 +9,7 @@
import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
+import org.openide.nodes.Node;
import org.openide.util.Lookup;
/**
@@ -56,5 +57,18 @@
setIconBaseWithExtension(LogIconTranslationProvider.getIconBase(CtuluLogLevel.WARNING));
}
+ public Node.Property find(String name) {
+ PropertySet[] propertySets = getPropertySets();
+ for (PropertySet propertySet : propertySets) {
+ Property<?>[] properties = propertySet.getProperties();
+ for (Property<?> property : properties) {
+ if (name.equals(property.getName())) {
+ return (Node.Property) property;
+ }
+ }
+ }
+ return null;
+ }
+
public abstract boolean isEditMode();
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioORESNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioORESNodeAction.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioORESNodeAction.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -1,6 +1,5 @@
package org.fudaa.fudaa.crue.modelling.action;
-import org.fudaa.fudaa.crue.modelling.calcul.ModellingModeleOPTGTopComponent;
import org.fudaa.fudaa.crue.modelling.calcul.ModellingScenarioORESTopComponent;
import org.openide.util.NbBundle;
@@ -12,7 +11,7 @@
public ModellingScenarioORESNodeAction(String name) {
- super(name, ModellingModeleOPTGTopComponent.MODE);
+ super(name, ModellingScenarioORESTopComponent.MODE);
}
@Override
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioPCALNodeAction.java (from rev 7466, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioORESNodeAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioPCALNodeAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingScenarioPCALNodeAction.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,37 @@
+package org.fudaa.fudaa.crue.modelling.action;
+
+import org.fudaa.fudaa.crue.modelling.calcul.ModellingScenarioPCALTopComponent;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public abstract class ModellingScenarioPCALNodeAction extends AbstractModellingOpenScenarioNodeAction {
+
+ public ModellingScenarioPCALNodeAction(String name) {
+
+ super(name, ModellingScenarioPCALTopComponent.MODE);
+ }
+
+ @Override
+ protected ModellingScenarioPCALTopComponent create() {
+ return new ModellingScenarioPCALTopComponent();
+ }
+
+ public static class Reopen extends ModellingScenarioPCALNodeAction {
+
+ public Reopen() {
+ super(NbBundle.getMessage(ModellingScenarioPCALNodeAction.class, "ModellingScenarioPCALNodeAction.Name"));
+ setReopen(true);
+ }
+ }
+
+ public static class NewFrame extends ModellingScenarioPCALNodeAction {
+
+ public NewFrame() {
+ super(NbBundle.getMessage(ModellingScenarioPCALNodeAction.class, "ModellingScenarioPCALNodeAction.NewFrame.Name"));
+ setReopen(false);
+ }
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.form (from rev 7466, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioORESTopComponent.form)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.form (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.form 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+ <AuxValues>
+ <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+ <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
+ </AuxValues>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+</Form>
Copied: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.java (from rev 7466, trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioORESTopComponent.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingScenarioPCALTopComponent.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,126 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.modelling.calcul;
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.reflect.InvocationTargetException;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.metier.emh.ParamCalcScenario;
+import org.fudaa.fudaa.crue.modelling.node.CommonObjectNode;
+import org.fudaa.fudaa.crue.modelling.services.EnumModification;
+import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
+import org.openide.util.NbBundle;
+import org.openide.windows.TopComponent;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.explorer.propertysheet.PropertySheet;
+import org.openide.nodes.Node;
+import org.openide.nodes.Node.Property;
+import org.openide.util.Exceptions;
+
+/**
+ * Top component which displays something.
+ */
+@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingScenarioPCALTopComponent//EN",
+autostore = false)
+...@To...scription(preferredID = ModellingScenarioPCALTopComponent.TOPCOMPONENT_ID, iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+...@To...gistration(mode = ModellingScenarioPCALTopComponent.MODE, openAtStartup = false, position = 1)
+public final class ModellingScenarioPCALTopComponent extends AbstractScenarioTopComponent {
+
+ public static final String MODE = "modelling-pcal";
+ public static final String TOPCOMPONENT_ID = "ModellingScenarioPCALTopComponent";
+ public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
+ public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
+
+ public ModellingScenarioPCALTopComponent() {
+ initComponents();
+ setName(NbBundle.getMessage(ModellingScenarioPCALTopComponent.class, TOPCOMPONENT_ACTION));
+ setToolTipText(NbBundle.getMessage(ModellingScenarioPCALTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
+ }
+
+ @Override
+ protected void setEditable(boolean b) {
+ }
+
+ @Override
+ public void valideModification() {
+ EMHScenario scenario = getScenario();
+ ParamCalcScenario pcal = scenario.getParamCalcScenario();
+ scenario.removeInfosEMH(pcal);
+ scenario.addInfosEMH(editedObject);
+ modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.PCAL));//a pour effet de recharger le scenario
+ setModified(false);
+ }
+
+ private class ChangeListener implements PropertyChangeListener {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ setModified(true);
+ }
+ }
+ ChangeListener changeListener;
+ ParamCalcScenario editedObject;
+ JButton cbNoDate;
+
+ @Override
+ protected JComponent buildCenterPanel(EMHScenario scenario, JComponent oldCenter) {
+ cbNoDate = new JButton(NbBundle.getMessage(ModellingScenarioPCALTopComponent.class, "PCAL.DoNotUseDateDeb.Label"));
+ changeListener = new ChangeListener();
+ editedObject = scenario.getParamCalcScenario().deepClone();
+ final CommonObjectNode node = new CommonObjectNode(editedObject, getCcm(), perspectiveServiceModelling);
+ PropertySheet sheet = new PropertySheet();
+ sheet.setNodes(new Node[]{node});
+ node.addPropertyChangeListener(changeListener);
+ JPanel panel = new JPanel(new BorderLayout());
+ panel.add(cbNoDate, BorderLayout.NORTH);
+ cbNoDate.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Property find = node.find(ParamCalcScenario.PROP_DATE_DEB);
+ try {
+ find.setValue(null);
+ } catch (Exception ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ });
+ panel.add(sheet);
+ return panel;
+
+ }
+
+ /**
+ * This method is called from within the constructor to initialize the form. WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
+ */
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ setLayout(new java.awt.BorderLayout());
+ }// </editor-fold>//GEN-END:initComponents
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ // End of variables declaration//GEN-END:variables
+ @Override
+ public void componentClosedTemporarily() {
+ }
+
+ void writeProperties(java.util.Properties p) {
+// p.setProperty("version", "1.0");
+ }
+
+ void readProperties(java.util.Properties p) {
+// String version = p.getProperty("version");
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/global/GlobalContainerNode.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -179,7 +179,9 @@
return new Action[]{
SystemAction.get(ModellingScenarioORESNodeAction.Reopen.class),
SystemAction.get(ModellingScenarioORESNodeAction.NewFrame.class),
- null,};
+ null,
+ SystemAction.get(ModellingScenarioPCALNodeAction.Reopen.class),
+ SystemAction.get(ModellingScenarioPCALNodeAction.NewFrame.class),};
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/CommonObjectNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/CommonObjectNode.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/node/CommonObjectNode.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -73,6 +73,7 @@
+
@Override
protected Sheet createSheet() {
Sheet sheet = Sheet.createDefault();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/EnumModification.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -9,6 +9,6 @@
* @author deniger ( genesis)
*/
public enum EnumModification {
- EMH_ORDER, COMMENTAIRE, ACTIVITY,EMH_RELATION,EMH_NAME,EMH_CREATION,EMH_COMMENTAIRE,OPTG,OPTR,OPTI,ORES,PNUM
-
+
+ EMH_ORDER, COMMENTAIRE, ACTIVITY, EMH_RELATION, EMH_NAME, EMH_CREATION, EMH_COMMENTAIRE, OPTG, OPTR, OPTI, ORES, PNUM, PCAL
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2012-07-09 16:39:08 UTC (rev 7470)
@@ -46,6 +46,10 @@
ModellingScenarioORESNodeAction.Name=Demandes de r\u00e9sultats
ModellingScenarioORESNodeAction.NewFrame.Name=Demandes de r\u00e9sultats (nouvelle fen\u00eatre)
+
+ModellingScenarioPCALNodeAction.Name=Param\u00e8tres de calcul
+ModellingScenarioPCALNodeAction.NewFrame.Name=Param\u00e8tres de calcul (nouvelle fen\u00eatre)
+
DeleteEMHAction.Name=Supprimer
DeleteEMHCascadeAction.Name=Supprimer en cascade
ChangeSousModeleParent.Label=Le sous-mod\u00e8le cible:
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2012-07-09 15:40:29 UTC (rev 7469)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2012-07-09 16:39:08 UTC (rev 7470)
@@ -22,6 +22,10 @@
HINT_ModellingScenarioORESTopComponent=Demandes de r\u00e9sultats
CTL_ModellingModelePNUMTopComponent=Param\u00e8tres num\u00e9riques
HINT_ModellingModelePNUMTopComponent=Param\u00e8tres num\u00e9riques
+
+CTL_ModellingScenarioPCALTopComponent=Param\u00e8tres calcul
+HINT_ModellingScenarioPCALTopComponent=Param\u00e8tres calcul
methodInterpolationParameter.DisplayNames=Param\u00e8tres
PNUM.UseParamNumCalcPseudoPerm.CheckBox=Utiliser param\u00e8tre calcul pseudo-permanent
PNUM.UseParamNumCalcTrans.CheckBox=Utiliser param\u00e8tre calcul transitoire
+PCAL.DoNotUseDateDeb.Label=Vider la date de d\u00e9but de scn\u00e9ario
Copied: trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingPCALTopComponentTest.java (from rev 7466, trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingORESTopComponentTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingPCALTopComponentTest.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingPCALTopComponentTest.java 2012-07-09 16:39:08 UTC (rev 7470)
@@ -0,0 +1,23 @@
+
+package org.fudaa.fudaa.crue.modelling.calcul;
+
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.fudaa.crue.common.editor.LocalDateTimeEditor;
+import org.fudaa.fudaa.crue.modelling.ModellingTestHelper;
+
+/**
+ *
+ * @author Frédéric Deniger
+ */
+public class ModellingPCALTopComponentTest {
+
+ public static void main(String[] args) {
+ LocalDateTimeEditor.registerEditor();
+ EMHScenario scenario = ModellingTestHelper.readScenario();
+ ModellingScenarioPCALTopComponent top = new ModellingScenarioPCALTopComponent();
+ ModellingTestHelper.configure(top, scenario);
+ top.testScenarioLoaded(scenario);
+ top.setEditable(true);
+ ModellingTestHelper.display(top);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
