[Fudaa-svn-commit] SF.net SVN: fudaa:[7673] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 7673
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7673&view=rev
Author:   deniger
Date:     2012-09-28 00:13:31 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java
    trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEtiquetteCourbeModel.java
    trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListBranchesAction.java

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java	2012-09-28 00:10:46 UTC (rev 7672)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultLoiTableModel.java	2012-09-28 00:13:31 UTC (rev 7673)
@@ -7,7 +7,6 @@
 import org.fudaa.ebli.courbe.EGCourbe;
 import org.fudaa.ebli.courbe.EGTableGraphePanel;
 import org.fudaa.ebli.courbe.EGTableGraphePanel.SpecTableModel;
-import org.opengis.filter.expression.PropertyName;
 
 /**
  * Etend le tableModel par defaut de ebli-graphe, pour ajouter une colonne indiquant les erreurs/warnings et pour ne réagir qu'au courbe des points.
@@ -29,6 +28,9 @@
 
   @Override
   protected void selectedCourbeChanged(EGCourbe _a) {
+    if (_a == null && getCourbe() == null) {
+      return;
+    }
     if (_a == null || _a.getModel() instanceof AbstractLoiCourbeModel) {
       super.selectedCourbeChanged(_a);
     }

Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEtiquetteCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEtiquetteCourbeModel.java	2012-09-28 00:10:46 UTC (rev 7672)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionEtiquetteCourbeModel.java	2012-09-28 00:13:31 UTC (rev 7673)
@@ -30,6 +30,9 @@
   boolean contained = false;
 
   protected void reload(ProfilSectionLoiUiController uiController) {
+    if (uiController.getLoiModel() == null) {
+      return;
+    }
     ProfilSectionLine findLine = uiController.getLoiModel().findLine(etiquette);
     contained = findLine != null;
     if (findLine != null) {

Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListBranchesAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListBranchesAction.java	2012-09-28 00:10:46 UTC (rev 7672)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/action/ModellingOpenListBranchesAction.java	2012-09-28 00:13:31 UTC (rev 7673)
@@ -4,7 +4,6 @@
  */
 package org.fudaa.fudaa.crue.modelling.action;
 
-import org.fudaa.fudaa.crue.modelling.loi.*;
 import javax.swing.Action;
 import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
 import org.fudaa.fudaa.crue.modelling.perspective.ActiveModelisation;
@@ -23,7 +22,7 @@
 public final class ModellingOpenListBranchesAction extends AbstractModellingSousModeleOpenAction {
 
   public ModellingOpenListBranchesAction() {
-    putValue(Action.NAME, NbBundle.getMessage(ModellingOpenDFRTAction.class, "ModellingListBrancheNodeAction.Name"));
+    putValue(Action.NAME, NbBundle.getMessage(ModellingOpenListBranchesAction.class, "ModellingListBrancheNodeAction.Name"));
   }
 
   @Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.