[Fudaa-svn-commit] SF.net SVN: fudaa:[7857] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/edition

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

Revision: 7857
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7857&view=rev
Author:   deniger
Date:     2012-11-05 13:57:48 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleEditable.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2012-11-05 10:44:40 UTC (rev 7856)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2012-11-05 13:57:48 UTC (rev 7857)
@@ -294,11 +294,14 @@
       boolean modification = false; // true si une modification a \xE9t\xE9 faite
       // Application des modifications des attributs globaux
       for (int i = globalAttr_.length - 1; i >= 0; i--) {
+        if (!globalAttrEditor_[i].isEditable()) {
+          continue;
+        }
         final Object val = globalAttrEditor_[i].getValue(globalComp_[i]);
         // Si une modificatin a \xE9t\xE9 faite, modification est mis \xE0 true, sauf si
         // cette modification est faite sur ETAT_GEOM
-        modification = modification || (!val.equals(globalAttr_[i].getObjectValueAt(idx_)) && globalAttr_[i].getAttribute() != GISAttributeConstants.ETAT_GEOM);
         if (!globalAttr_[i].getObjectValueAt(idx_).equals(val) && globalAttr_[i].getAttribute() != GISAttributeConstants.ETAT_GEOM) {
+          modification = true;
           globalAttr_[i].setObject(idx_, val, cmd);
         }
       }
@@ -470,13 +473,7 @@
    */
   @Override
   public void apply() {
-    //la g\xE9ometrie peut ne pas \xEAtre modifiable par contre les attributs si...
-//    if(!isGeomModifiable()){
-//      return;
-//    }
-    if (isGeomModifiable()) {
-      modeleSrc_.modificationWillBeDone();
-    }
+    modeleSrc_.modificationWillBeDone();
     CtuluCommandComposite cmd = new CtuluCommandComposite("Modifications de la g\xE9om\xE9trie");
     if (tableRep_ != null) {
       tableRep_.apply(cmd);
@@ -487,6 +484,7 @@
     }
     // D\xE9active le model
     modelData_.setSource(null, -1);
+    modeleSrc_.modificationDone();
   }
 
   @Override

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleEditable.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleEditable.java	2012-11-05 10:44:40 UTC (rev 7856)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleEditable.java	2012-11-05 13:57:48 UTC (rev 7857)
@@ -38,4 +38,6 @@
    * @return True si la g\xE9om\xE9trie est valide.
    */
   public boolean isDataValid(CoordinateSequence _seq, ZEditionAttributesDataI _data, CtuluAnalyze _ana);
+
+  public void modificationDone();
 }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java	2012-11-05 10:44:40 UTC (rev 7856)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java	2012-11-05 13:57:48 UTC (rev 7857)
@@ -53,6 +53,9 @@
   public void modificationWillBeDone() {
   }
 
+  public void modificationDone() {
+  }
+
   public ZModeleGeometryDefault(GISZoneCollectionGeometry _zone) {
     setGeometries(_zone);
 

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