[Fudaa-svn-commit] SF.net SVN: fudaa:[8248] trunk/framework

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

Revision: 8248
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8248&view=rev
Author:   deniger
Date:     2013-01-23 22:45:35 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
    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/EbliSingleObjectTableModel.java

Modified: trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ctulu-gis/src/main/java/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -43,6 +43,7 @@
 import com.memoire.fu.FuLog;
 import com.vividsolutions.jts.geom.Geometry;
 import java.util.Date;
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.ctulu.gis.GISDataModelFeatureAdapter;
 
@@ -214,9 +215,9 @@
             StringBuilder sb = new StringBuilder();
             if (value instanceof GISAttributeModel) {
               GISAttributeModel md = (GISAttributeModel) value;
-              sb.append('{').append(StringUtils.replace(md.getObjectValueAt(0).toString(), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
+              sb.append('{').append(StringUtils.replace(ObjectUtils.toString(md.getObjectValueAt(0)), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
               for (int k = 1; k < md.getSize(); k++) {
-                sb.append(',').append(StringUtils.replace(md.getObjectValueAt(k).toString(), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
+                sb.append(',').append(StringUtils.replace(ObjectUtils.toString(md.getObjectValueAt(k)), GISDataModelFeatureAdapter.VALUE_SEPARATOR, GISDataModelFeatureAdapter.VALUE_SEPARATOR_AS_STRING));
               }
               sb.append('}');
             } else if (value != null) {

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	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -419,6 +419,10 @@
     add(tableRep_, BuBorderLayout.CENTER);
   }
 
+  public void setDeferredModifications(boolean _active) {
+    modelData_.setDeferredModifications(_active);
+  }
+
   public EbliSingleObjectTableModel getTableModel() {
     return modelData_;
   }

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 21:45:29 UTC (rev 8247)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/EbliSingleObjectTableModel.java	2013-01-23 22:45:35 UTC (rev 8248)
@@ -288,6 +288,7 @@
           coordSeq_.setOrdinate(coordSeq_.size() - 1, _idxCol - 1, (Double) _value);
         }
       } else if (_idxCol > 2) {
+        modificationDone_=true;
         lattmdls.get(_idxCol - 3).setObject(_idxRow, _value, null);
       }
 

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