Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-07-10 21:42:11
|
Revision: 7475
http://fudaa.svn.sourceforge.net/fudaa/?rev=7475&view=rev
Author: deniger
Date: 2012-07-10 21:42:05 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/cini/
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/cini/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-07-13 15:27:49
|
Revision: 7495
http://fudaa.svn.sourceforge.net/fudaa/?rev=7495&view=rev
Author: deniger
Date: 2012-07-13 15:27:43 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheSpecificEditorFactory.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java 2012-07-13 14:53:54 UTC (rev 7494)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/AbstractModellingEMHTopComponent.java 2012-07-13 15:27:43 UTC (rev 7495)
@@ -8,6 +8,8 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.MissingResourceException;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
@@ -24,6 +26,8 @@
import org.fudaa.fudaa.crue.modelling.AbstractModellingTopComponent;
import org.fudaa.fudaa.crue.modelling.services.EnumModification;
import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
+import org.openide.awt.HtmlBrowser;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
@@ -36,6 +40,7 @@
JTextField jEMHName;
JTextField jCommentaire;
+ JButton btHelp;
JLabel jEMHNameError;
Long emhUid;
protected final ActionListener modifiedActionListener = new ActionListener() {
@@ -107,18 +112,25 @@
}
});
jEMHNameError = new JLabel();
+ btHelp = ModellingEMHBrancheSpecificEditorFactory.createButtonHelp();
+ btHelp.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ showCommonHelp();
+ }
+ });
JPanel pn = new JPanel(new BuGridLayout(2, 5, 6));
pn.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
pn.add(new JLabel(NbBundle.getMessage(AbstractModellingEMHTopComponent.class, "ListTopComponent.EMHName.Label")));
+ JPanel pnName = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
+ pnName.add(jEMHName);
if (northEastCmp != null) {
- JPanel pnName = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
- pnName.add(jEMHName);
pnName.add(northEastCmp);
- pn.add(pnName);
- } else {
- pn.add(jEMHName);
}
+ pnName.add(btHelp);
+ pn.add(pnName);
pn.add(new JLabel());
pn.add(jEMHNameError);
return pn;
@@ -128,6 +140,14 @@
return super.modellingScenarioModificationService.getModellingScenarioService().getScenarioLoaded();
}
+ protected void showCommonHelp() {
+ try {
+ HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL("http://fr.wikipedia.org/wiki/Hydraulique_fluviale"));
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
@Override
public void cancelModification() {
scenarioReloaded();
Added: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheSpecificEditorFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheSpecificEditorFactory.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheSpecificEditorFactory.java 2012-07-13 15:27:43 UTC (rev 7495)
@@ -0,0 +1,75 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.fudaa.fudaa.crue.modelling.emh;
+
+import com.memoire.bu.BuResource;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.MissingResourceException;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
+import org.openide.awt.HtmlBrowser;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frédéric Deniger
+ */
+public class ModellingEMHBrancheSpecificEditorFactory {
+
+ JPanel create(final CatEMHBranche branche, final EnumBrancheType type) {
+ JPanel res = createMainPanel(type);
+ JPanel center = createCenterPanel(branche, type);
+ res.add(center);
+ return res;
+ }
+
+ protected JPanel createMainPanel(final EnumBrancheType type) throws MissingResourceException {
+ JPanel res = new JPanel(new BorderLayout());
+ res.setBorder(BorderFactory.createTitledBorder(NbBundle.getMessage(ModellingEMHBrancheSpecificEditorFactory.class, "BrancheDescription", type.geti18n())));
+ JTextField txt = new JTextField(50);
+ txt.setText("Aide pour le type " + type.geti18n());
+ txt.setEditable(false);
+ JPanel pn = new JPanel(new BorderLayout(10, 0));
+ pn.add(txt);
+ JButton bt = createButtonHelp();
+ bt.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ showHelp(type);
+ }
+ });
+ pn.add(bt, BorderLayout.EAST);
+ res.add(pn, BorderLayout.NORTH);
+ return res;
+ }
+
+ public void showHelp(EnumBrancheType brancheType) {
+ try {
+ HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL("http://fr.wikipedia.org/wiki/Hydraulique_fluviale"));
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+
+ protected static JButton createButtonHelp() {
+ JButton bt = new JButton();
+ bt.setIcon(BuResource.BU.getIcon("aide"));
+ return bt;
+ }
+
+ private JPanel createCenterPanel(CatEMHBranche branche, EnumBrancheType type) {
+ return new JPanel();
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-13 14:53:54 UTC (rev 7494)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/emh/ModellingEMHBrancheTopComponent.java 2012-07-13 15:27:43 UTC (rev 7495)
@@ -6,8 +6,11 @@
import com.memoire.bu.BuGridLayout;
import java.awt.BorderLayout;
+import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.util.List;
import javax.swing.*;
import org.fudaa.ctulu.CtuluLog;
@@ -45,7 +48,6 @@
JButton btSectionAval;
JButton btListSection;
JComboBox cbType;
-
public ModellingEMHBrancheTopComponent() {
setName(NbBundle.getMessage(ModellingEMHBrancheTopComponent.class, TOPCOMPONENT_ACTION));
@@ -59,6 +61,15 @@
pn.add(new JLabel(NbBundle.getMessage(ModellingEMHBrancheTopComponent.class, "BrancheType.DisplayName")));
cbType = new JComboBox(EnumBrancheType.getAvailablesBrancheType().toArray(new EnumBrancheType[0]));
cbType.addActionListener(modifiedActionListener);
+ cbType.addItemListener(new ItemListener() {
+
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ udpdateSpecificCenter();
+ }
+ }
+ });
cbType.setRenderer(new ToStringInternationalizableCellRenderer());
pn.add(cbType);
cbActive.addActionListener(modifiedActionListener);
@@ -165,6 +176,7 @@
LogsDisplayer.displayError(log, getName());
}
}
+ ModellingEMHBrancheSpecificEditorFactory factory = new ModellingEMHBrancheSpecificEditorFactory();
@Override
protected void updateOtherComponents() {
@@ -182,7 +194,27 @@
btSectionAmont.setText(branche.getSectionAmont().getEmhNom());
btSectionAval.setText(branche.getSectionAval().getEmhNom());
}
+ JPanel currentCenter;
+ protected void udpdateSpecificCenter() {
+ final EnumBrancheType type = (EnumBrancheType) cbType.getSelectedItem();
+ if (type == null) {
+ return;
+ }
+ if (currentCenter != null) {
+ remove(currentCenter);
+ }
+ CatEMHBranche branche = getEMH();
+ currentCenter = factory.create(branche, type);
+ add(currentCenter);
+ repaint();
+ revalidate();
+ JDialog dialog = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, this);
+ if (dialog != null) {
+ dialog.pack();
+ }
+ }
+
@Override
protected void setEditable(boolean b) {
super.setEditable(b);
@@ -194,7 +226,8 @@
@Override
protected void createComponents() {
- add(buildNorthPanel(), BorderLayout.CENTER);
+ add(buildNorthPanel(), BorderLayout.NORTH);
+
add(createCancelSaveButtons(), BorderLayout.SOUTH);
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties 2012-07-13 14:53:54 UTC (rev 7494)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/emh/Bundle.properties 2012-07-13 15:27:43 UTC (rev 7495)
@@ -19,3 +19,4 @@
OpenListSection.DisplayName=Liste des sections
SectionButton.Tooltip=Ouvrir l'\u00e9diteur de la section
ListSectionButton.Tooltip=Ouvrir la liste des sections
+BrancheDescription=Branche {0}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-07-19 16:17:01
|
Revision: 7519
http://fudaa.svn.sourceforge.net/fudaa/?rev=7519&view=rev
Author: deniger
Date: 2012-07-19 16:16:55 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-07-19 16:09:09 UTC (rev 7518)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-07-19 16:16:55 UTC (rev 7519)
@@ -21,6 +21,7 @@
import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByIdComparator;
import org.fudaa.dodico.crue.metier.comparator.ObjetNommeByNameComparator;
import org.fudaa.dodico.crue.metier.emh.*;
+import org.fudaa.dodico.crue.metier.factory.CruePrefix;
import org.fudaa.dodico.crue.metier.factory.LoiFactory;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
import org.fudaa.dodico.crue.metier.transformer.TransformerHelper;
@@ -237,6 +238,7 @@
setModified(true);
}
});
+ loiUiController.setEditable(editable);
setModified(false);
}
@@ -301,13 +303,14 @@
if (ok) {
DonLoiHYConteneur loiConteneur = getScenario().getLoiConteneur();
if (!isNewLoi) {
- int idx=Math.max(0,loiConteneur.getLois().indexOf(currentLoi)-1);
+ //TODO faire la recherche dans la boite
+ int idx = Math.max(0, loiConteneur.getLois().indexOf(currentLoi) - 1);
loiConteneur.removeLois(currentLoi);
- currentLoi=null;
- if(idx<loiConteneur.getLois().size()){
- currentLoi=loiConteneur.getLois().get(idx);
+ currentLoi = null;
+ if (idx < loiConteneur.getLois().size()) {
+ currentLoi = loiConteneur.getLois().get(idx);
}
-
+
modellingScenarioModificationService.setScenarioModified(new ScenarioModificationEvent(EnumModification.DLHY));
} else {
//on sélectionne la loi disponible dans la combobox.
@@ -334,6 +337,7 @@
EnumTypeLoi typeLoi = (EnumTypeLoi) cb.getSelectedItem();
isNewLoi = true;
currentLoi = LoiFactory.createLoi(typeLoi, getCcm());
+ currentLoi.setNom(CruePrefix.getPrefix(currentLoi.getType()));
updateWithLoi();
setModified(true);
}
@@ -344,7 +348,7 @@
return;
}
currentLoi = currentLoi.clonedWithoutUser();
- currentLoi.setNom(null);
+ currentLoi.setNom(CruePrefix.getPrefix(currentLoi.getType()));
isNewLoi = true;
updateWithLoi();
setModified(true);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2012-07-19 16:09:09 UTC (rev 7518)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2012-07-19 16:16:55 UTC (rev 7519)
@@ -30,6 +30,6 @@
LoiModifiedDialog.SaveButton=Valider et continuer
LoiModifiedDialog.DontSaveButton=Ignorer les modifications et continuer
LoiModifiedDialog.CancelButton=Annuler l'op\u00e9ration
-DeleteConfirmation.Message=<html><body>La loi {0} va \u00eatre supprim\u00e9e. Cette action n'est pas annulable.<br>Voulez-vous continuer ?
+DeleteConfirmation.Message=<html><body>La loi {0} va \u00eatre supprim\u00e9e. Cette action n''est pas annulable.<br>Voulez-vous continuer ?
DeleteAbort.LoiIsUsed=La loi ne peut pas \u00eatre supprim\u00e9e. Elle est utilis\u00e9e par les entr\u00e9es suivantes:
CreateLoi.TypeLabel=Type de la nouvelle loi:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-08-21 00:51:13
|
Revision: 8465
http://sourceforge.net/p/fudaa/svn/8465
Author: deniger
Date: 2013-08-21 00:51:08 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
CRUE-557
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2013-08-21 00:20:43 UTC (rev 8464)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2013-08-21 00:51:08 UTC (rev 8465)
@@ -31,7 +31,7 @@
iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = "modelling-topLeft", openAtStartup = false, position = 1)
-@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingActionsTopComponent")
+@ActionID(category = "Window", id = "org.fudaa.fudaa.crue.modelling.ModellingContainersTopComponent")
@ActionReference(path = "Menu/Window/Modelling", position = 4)
@TopComponent.OpenActionRegistration(displayName = ModellingContainersTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME,
preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID)
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2013-08-21 00:20:43 UTC (rev 8464)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2013-08-21 00:51:08 UTC (rev 8465)
@@ -3,14 +3,14 @@
<filesystem>
<folder name="Actions">
- <folder name="Window">
+<!-- <folder name="Window">
<file name="org-fudaa-fudaa-crue-modelling-ModellingActionsTopComponent.instance_hidden"/>
<file name="org-fudaa-fudaa-crue-modelling-ModellingContainersTopComponent.instance">
<attr name="iconBase" stringvalue="org/fudaa/fudaa/crue/modelling/rond-orange_16.png"/>
<attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
<attr name="preferredID" stringvalue="ModellingActionsTopComponent"/>
</file>
- </folder>
+ </folder>-->
</folder>
<folder name="Menu">
<!-- <folder name="Modelling">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-08-21 07:00:08
|
Revision: 8467
http://sourceforge.net/p/fudaa/svn/8467
Author: deniger
Date: 2013-08-21 07:00:02 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
CRUE-544
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleCasierComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-08-21 00:51:31 UTC (rev 8466)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-08-21 07:00:02 UTC (rev 8467)
@@ -36,7 +36,6 @@
import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.loi.casier.ProfilCasierLoiUiController;
-import org.fudaa.fudaa.crue.loi.common.AbstractLoiUiController;
import org.fudaa.fudaa.crue.loi.common.LoiPopupMenuReceiver;
import org.fudaa.fudaa.crue.modelling.services.EnumModification;
import org.fudaa.fudaa.crue.modelling.services.ScenarioModificationEvent;
@@ -189,7 +188,7 @@
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
- selectedCasierChanged();
+ selectedCasierChanged(false);
}
}
});
@@ -277,9 +276,7 @@
if (currentProfil == null) {
return;
}
- String casier = getSelectedCasier().getNom() + " / " + getEditingNom();
- setName(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "ProfilCasierView.Title", casier));
- updateTopComponentName();
+ updateTopComponentNameFromSelection();
String error = validateNom();
if (error != null) {
lbNomValidation.setToolTipText(error);
@@ -363,26 +360,46 @@
cbProfils.setSelectedItem(toSelect);
}
- protected void selectedCasierChanged() {
+ protected int findProfilIdx(String id) {
+ ComboBoxModel model = cbProfils.getModel();
+ for (int i = model.getSize() - 1; i >= 0; i--) {
+ DonPrtGeoProfilCasier profil = (DonPrtGeoProfilCasier) model.getElementAt(i);
+ if (id.equals(profil.getId())) {
+ cbProfils.setSelectedIndex(i);
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ protected void selectedCasierChanged(boolean restoreOldProfil) {
CatEMHCasier casier = getSelectedCasier();
- Object oldProfil = currentProfil;
+ DonPrtGeoProfilCasier oldProfil = currentProfil;
+ //TODO A VERIFIER
+ String oldNomSelected = null;
+ if (oldProfil != null) {
+ oldNomSelected = oldProfil.getId();
+ }
currentProfil = null;
if (casier != null) {
List<DonPrtGeoProfilCasier> profilCasiers = DonPrtHelper.getProfilCasier(casier);
Collections.sort(profilCasiers, ObjetNommeByNameComparator.INSTANCE);
- int idx = profilCasiers.indexOf(oldProfil);
cbProfils.setModel(new DefaultComboBoxModel(profilCasiers.toArray(new DonPrtGeoProfilCasier[profilCasiers.size()])));
- cbProfils.setSelectedItem(null);
+ int idx = -1;
+ if (restoreOldProfil) {
+ idx = findProfilIdx(oldNomSelected);
+ }
if (idx >= 0) {
cbProfils.setSelectedIndex(idx);
} else if (!profilCasiers.isEmpty()) {
cbProfils.setSelectedIndex(0);
+ } else {
+ cbProfils.setSelectedItem(null);
}
- setName(NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "ProfilCasierView.Title", casier.getNom()));
} else {
- setName(initName);
cbProfils.setModel(new DefaultComboBoxModel());
}
+ updateTopComponentNameFromSelection();
updateCrudButtons();
}
@@ -461,14 +478,15 @@
@Override
protected void scenarioLoadedHandler() {
updating = true;
- final CatEMHCasier oldCasier = getSelectedCasier();
- EMHSousModele sousModeleToSelect = null;
+
+ CatEMHCasier oldCasier = getSelectedCasier();
if (oldCasier != null) {
- sousModeleToSelect = oldCasier.getParent();
+ oldCasier = (CatEMHCasier) getScenario().getIdRegistry().getEmh(oldCasier.getUiId());
}
- sousModelesCasiers.updateValuesAndSelection(getScenario(), oldCasier, sousModeleToSelect);
+ sousModelesCasiers.updateValuesAndSelection(getScenario(), oldCasier);
buildListProfilCasier();
- selectedCasierChanged();
+ selectedCasierChanged(true);
+
isNewProfil = false;
updating = false;
profilCasierLoiUiController.getGraphe().setExportTableCommentSupplier(this);
@@ -723,4 +741,19 @@
applyCourbeConfig();
setModified(false);
}
+
+ protected void updateTopComponentNameFromSelection() throws MissingResourceException {
+ String nameToUse = initName;
+ final CatEMHCasier selectedCasier = getSelectedCasier();
+ if (selectedCasier != null) {
+ if (getSelectedCasierProfil() != null) {
+ String casier = selectedCasier.getNom() + " / " + getEditingNom();
+ nameToUse = NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "ProfilCasierView.Title", casier);
+ } else {
+ nameToUse = NbBundle.getMessage(ProfilCasierEditorTopComponent.class, "ProfilCasierView.Title", selectedCasier.getNom());
+ }
+ }
+ setName(nameToUse);
+ updateTopComponentName();
+ }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleCasierComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleCasierComponent.java 2013-08-21 00:51:31 UTC (rev 8466)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleCasierComponent.java 2013-08-21 07:00:02 UTC (rev 8467)
@@ -55,25 +55,24 @@
}
boolean updating;
- void updateValuesAndSelection(EMHScenario scenario, CatEMHCasier initCasierToSelect, EMHSousModele initSousModelToSelect) {
+ void updateValuesAndSelection(EMHScenario scenario, CatEMHCasier initCasierToSelect) {
updating = true;
List<EMHSousModele> sousModelesList = scenario.getSousModeles();
EMHSousModele[] sousModelesArray = (EMHSousModele[]) sousModelesList.toArray(new EMHSousModele[sousModelesList.size()]);
- EMHSousModele sousModeleToSelect = initSousModelToSelect;
final IdRegistry idRegistry = scenario.getIdRegistry();
- if (sousModeleToSelect == null) {//on récupère l'ancienne selection
- sousModeleToSelect = getSelectedSousModele();
- }
- if (sousModeleToSelect != null) {
- sousModeleToSelect = (EMHSousModele) idRegistry.getEmh(sousModeleToSelect.getUiId());//au cas ou changement d'instance...
- }
CatEMHCasier casierToSelect = initCasierToSelect;
if (casierToSelect == null) {
casierToSelect = getSelectedCasier();
}
+ EMHSousModele sousModeleToSelect = null;
if (casierToSelect != null) {
casierToSelect = (CatEMHCasier) idRegistry.getEmh(casierToSelect.getUiId());//au cas ou changement d'instance...
sousModeleToSelect = casierToSelect.getParent();//au cas une casier ait changé de sous-modele
+ } else {
+ sousModeleToSelect = getSelectedSousModele();
+ if (sousModeleToSelect != null) {
+ sousModeleToSelect = (EMHSousModele) idRegistry.getEmh(sousModeleToSelect.getUiId());//au cas ou changement d'instance...
+ }
}
cbSousModeles.setModel(new DefaultComboBoxModel(sousModelesArray));
if (sousModeleToSelect == null && sousModelesArray.length == 1) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2013-08-21 00:51:31 UTC (rev 8466)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2013-08-21 07:00:02 UTC (rev 8467)
@@ -3,20 +3,9 @@
<filesystem>
<folder name="Actions">
-<!-- <folder name="Window">
- <file name="org-fudaa-fudaa-crue-modelling-ModellingActionsTopComponent.instance_hidden"/>
- <file name="org-fudaa-fudaa-crue-modelling-ModellingContainersTopComponent.instance">
- <attr name="iconBase" stringvalue="org/fudaa/fudaa/crue/modelling/rond-orange_16.png"/>
- <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
- <attr name="preferredID" stringvalue="ModellingActionsTopComponent"/>
- </file>
- </folder>-->
+
</folder>
<folder name="Menu">
-<!-- <folder name="Modelling">
- <attr name="displayName" bundlevalue="org.fudaa.fudaa.crue.modelling.Bundle#Menu/Modelling"/>
- <attr name="position" intvalue="5"/>
- </folder>-->
<folder name="Window">
<folder name="Modelling">
<attr name="displayName" bundlevalue="org.fudaa.fudaa.crue.modelling.Bundle#Menu/Modelling"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X