From: <de...@us...> - 2013-09-03 12:51:46
|
Revision: 8480 http://sourceforge.net/p/fudaa/svn/8480 Author: deniger Date: 2013-09-03 12:51:39 +0000 (Tue, 03 Sep 2013) Log Message: ----------- CRUE-572 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/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 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-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingContainersTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -1,12 +1,9 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.fudaa.crue.modelling; import javax.swing.ActionMap; import javax.swing.BorderFactory; import org.fudaa.dodico.crue.metier.emh.EMHScenario; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.common.node.NodeHelper; import org.fudaa.fudaa.crue.modelling.global.GlobalActionChildFactory; import org.fudaa.fudaa.crue.modelling.global.GlobalContainerNode; @@ -26,15 +23,15 @@ * Top component which displays something. */ @ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingContainersTopComponent//EN", -autostore = false) + autostore = false) @TopComponent.Description(preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID, -iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png", -persistenceType = TopComponent.PERSISTENCE_ALWAYS) + 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.ModellingContainersTopComponent") @ActionReference(path = "Menu/Window/Modelling", position = 4) @TopComponent.OpenActionRegistration(displayName = ModellingContainersTopComponent.TOPCOMPONENT_ACTION_DISPLAYNAME, -preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID) + preferredID = ModellingContainersTopComponent.TOPCOMPONENT_ID) public final class ModellingContainersTopComponent extends AbstractModellingTopComponent implements LookupListener, ExplorerManager.Provider { public static final String TOPCOMPONENT_ID = "ModellingContainersTopComponent"; @@ -53,7 +50,8 @@ outlineView.getOutline().setFullyNonEditable(true); outlineView.getOutline().setFillsViewportHeight(true); outlineView.getOutline().setColumnHidingAllowed(false); - outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, NbBundle.getMessage(ModellingContainersTopComponent.class, "ModellingContainersTopComponent.ColumnVisible")); + outlineView.addPropertyColumn(GlobalContainerNode.PROP_VISIBILITY, NbBundle.getMessage(ModellingContainersTopComponent.class, + "ModellingContainersTopComponent.ColumnVisible")); add(outlineView); outlineView.getOutline().getColumnModel().getColumn(1).setWidth(20); outlineView.getOutline().getColumnModel().getColumn(1).setPreferredWidth(20); @@ -139,11 +137,10 @@ } void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { + DialogHelper.readProperties(outlineView, "outlineView", p); } } Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingEMHTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -9,6 +9,7 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import org.fudaa.dodico.crue.metier.emh.EMH; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.emh.EMHTreePanel; import org.fudaa.fudaa.crue.emh.common.TreeNodeEMH; import org.fudaa.fudaa.crue.modelling.node.ModellingNodeEMHFactory; @@ -192,6 +193,7 @@ // better to version settings since initial version as advocated at // http://wiki.apidesign.org/wiki/PropertyFiles p.setProperty("version", "1.0"); + emhTreePanel.saveSize(); // TODO store your settings } Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingFilesTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -14,7 +14,6 @@ import org.fudaa.ebli.calque.BArbreCalque; import org.fudaa.ebli.calque.BCalque; import org.fudaa.ebli.calque.ZCalqueImageRaster; -import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.controle.BSelecteurCheckBox; import org.fudaa.fudaa.crue.modelling.services.ModellingScenarioVisuService; import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel; Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/ModellingNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -7,7 +7,6 @@ import java.util.HashSet; import java.util.Set; import javax.swing.ActionMap; -import org.fudaa.dodico.crue.edition.DonPrtGeoProfilSimplifier; import org.fudaa.dodico.crue.edition.EditionChangeSousModele; import org.fudaa.dodico.crue.edition.EditionChangeSousModele.ChangeRes; import org.fudaa.dodico.crue.edition.EditionDelete; @@ -16,7 +15,6 @@ import org.fudaa.dodico.crue.metier.emh.EMHScenario; import org.fudaa.dodico.crue.metier.emh.EMHSousModele; import org.fudaa.dodico.crue.metier.emh.EnumCasierType; -import org.fudaa.dodico.crue.metier.emh.EnumCatEMH; import org.fudaa.dodico.crue.metier.emh.EnumSectionType; import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper; import org.fudaa.fudaa.crue.common.log.LogsDisplayer; @@ -25,6 +23,7 @@ import org.fudaa.fudaa.crue.emh.node.NodeEMHDefault; import org.fudaa.dodico.crue.edition.SimplificationProcessor; import org.fudaa.dodico.crue.edition.SimplificationSeuils; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.modelling.loi.SimplificationSeuilsChooser; import org.fudaa.fudaa.crue.modelling.node.ModellingNodeEMHFactory; import org.fudaa.fudaa.crue.modelling.services.ModellingSelectedEMHService; @@ -311,13 +310,10 @@ } void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); - // TODO store your settings + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { - // TODO read your settings according to their version + DialogHelper.readProperties(outlineView, "outlineView", p); } } Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilCasierMenuReceiver.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -80,7 +80,7 @@ if (seuil.compareTo(0d) <= 0) { return; } - if (!seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilCasier)) { + if (seuilVariable != null && !seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilCasier)) { final ModellingGlobalConfiguration modellingGlobalConfiguration = modellingConfigService.getModellingGlobalConfiguration(); modellingGlobalConfiguration.setSeuilSimplifProfilCasier(seuil); modellingConfigService.setModellingGlobalConfiguration(modellingGlobalConfiguration); Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingProfilSectionMenuReceiver.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -13,7 +13,6 @@ import org.fudaa.dodico.crue.config.ccm.ItemVariable; import org.fudaa.dodico.crue.edition.DonPrtGeoProfilSimplifier; import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection; -import org.fudaa.dodico.crue.metier.emh.EMHSousModele; import org.fudaa.dodico.crue.metier.algo.DonPrtGeoProfilSectionInverser; import org.fudaa.ebli.commun.EbliActionSimple; import org.fudaa.ebli.courbe.EGCourbe; @@ -103,7 +102,7 @@ if (seuil.compareTo(0d) <= 0) { return; } - if (!seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilSection)) { + if (seuilVariable != null && !seuilVariable.getEpsilon().isSame(seuil, initSeuilSimplifProfilSection)) { final ModellingGlobalConfiguration modellingGlobalConfiguration = modellingConfigService.getModellingGlobalConfiguration(); modellingGlobalConfiguration.setSeuilSimplifProfilSection(seuil); modellingConfigService.setModellingGlobalConfiguration(modellingGlobalConfiguration); 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-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilCasierEditorTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -386,6 +386,8 @@ Collections.sort(profilCasiers, ObjetNommeByNameComparator.INSTANCE); cbProfils.setModel(new DefaultComboBoxModel(profilCasiers.toArray(new DonPrtGeoProfilCasier[profilCasiers.size()]))); int idx = -1; + //pour forcer la sélection a changer. + cbProfils.setSelectedIndex(-1); if (restoreOldProfil) { idx = findProfilIdx(oldNomSelected); } Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostEmhExplorerTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -37,12 +37,12 @@ @TopComponent.OpenActionRegistration(displayName = "#CTL_PostEmhExplorerTopComponent", preferredID = PostEmhExplorerTopComponent.TOPCOMPONENT_ID) public final class PostEmhExplorerTopComponent extends AbstractTopComponent implements LookupListener { - + public static final String TOPCOMPONENT_ID = "PostEmhExplorerTopComponent"; private PostRunService postService = Lookup.getDefault().lookup(PostRunService.class); EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class); private Result<EMHScenario> resultat; - + public PostEmhExplorerTopComponent() { initComponents(); setName(NbBundle.getMessage(PostEmhExplorerTopComponent.class, "CTL_PostEmhExplorerTopComponent")); @@ -53,12 +53,12 @@ putClientProperty(TopComponent.PROP_UNDOCKING_DISABLED, Boolean.TRUE); associateLookup(Lookup.EMPTY); } - + @Override protected String getHelpCtxId() { return SysdocUrlBuilder.getTopComponentHelpCtxId("01-vueExploreurEMHs", PerspectiveEnum.POST); } - + @Override public void resultChanged(LookupEvent ev) { if (postService.isRunLoaded()) { @@ -68,7 +68,7 @@ } } EMHTreePanel emhTreePanel; - + private void runLoadedFromCurrentProject() { //TODO attention on suppose que le run a été chargé depuis le projet courant emhTreePanel = new EMHTreePanel(projetService.getSelectedProject(), postService.getScenarioLoaded()); @@ -78,7 +78,7 @@ this.revalidate(); this.repaint(); } - + private void runUnloaded() { if (emhTreePanel != null) { emhTreePanel.saveSize(); @@ -118,18 +118,19 @@ runUnloaded(); } } - + @Override public void componentClosedTemporarily() { } - + void writeProperties(java.util.Properties p) { // better to version settings since initial version as advocated at // http://wiki.apidesign.org/wiki/PropertyFiles p.setProperty("version", "1.0"); + emhTreePanel.saveSize(); // TODO store your settings } - + void readProperties(java.util.Properties p) { // TODO read your settings according to their version } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportNetworkTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -8,6 +8,7 @@ import org.fudaa.dodico.crue.metier.emh.EMH; import org.fudaa.dodico.crue.metier.emh.EMHScenario; import org.fudaa.fudaa.crue.common.PerspectiveEnum; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder; import org.fudaa.fudaa.crue.emh.node.HierarchyChildFactory; import org.fudaa.fudaa.crue.emh.node.LinkedEMHHelper; @@ -187,13 +188,10 @@ } void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); - // TODO store your settings + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { - // TODO read your settings according to their version + DialogHelper.readProperties(outlineView, "outlineView", p); } } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportSelectRunTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -5,6 +5,7 @@ import org.fudaa.dodico.crue.common.transformer.TransformerHelper; import org.fudaa.dodico.crue.metier.etude.EMHProjet; import org.fudaa.fudaa.crue.common.PerspectiveEnum; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.common.node.NodeHelper; import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder; import org.fudaa.fudaa.crue.report.data.ReportRunContent; @@ -173,14 +174,11 @@ // Variables declaration - do not modify//GEN-BEGIN:variables // End of variables declaration//GEN-END:variables void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); - // TODO store your settings + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { - // TODO read your settings according to their version + DialogHelper.readProperties(outlineView, "outlineView", p); } private void initRootNode() { Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVariableTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -239,15 +239,12 @@ } } - void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); - // TODO store your settings + void writeProperties(java.util.Properties p) { + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { - // TODO read your settings according to their version + DialogHelper.readProperties(outlineView, "outlineView", p); } public void requestActiveLater() { Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportViewManagerTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -7,6 +7,7 @@ import java.beans.PropertyVetoException; import javax.swing.ActionMap; import org.fudaa.fudaa.crue.common.PerspectiveEnum; +import org.fudaa.fudaa.crue.common.helper.DialogHelper; import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder; import org.fudaa.fudaa.crue.common.view.ExpandedNodesManager; import org.fudaa.fudaa.crue.report.view.ReportViewTopComponentListener; @@ -139,13 +140,10 @@ } void writeProperties(java.util.Properties p) { - // better to version settings since initial version as advocated at - // http://wiki.apidesign.org/wiki/PropertyFiles - p.setProperty("version", "1.0"); - // TODO store your settings + DialogHelper.writeProperties(outlineView, "outlineView", p); } void readProperties(java.util.Properties p) { - // TODO read your settings according to their version + DialogHelper.readProperties(outlineView, "outlineView", p); } } Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java =================================================================== --- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2013-09-02 22:30:20 UTC (rev 8479) +++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/ScenariosTopComponent.java 2013-09-03 12:51:39 UTC (rev 8480) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.fudaa.crue.study; import java.awt.event.FocusAdapter; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |