fudaa-svn-commit

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

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

Revision: 7405
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7405&view=rev
Author:   deniger
Date:     2012-06-26 10:30:39 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------


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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2012-06-26 10:23:40 UTC (rev 7404)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2012-06-26 10:30:39 UTC (rev 7405)
@@ -72,10 +72,12 @@
 
   class CommandSaisieMultiple implements CtuluCommandPersitant {
 
+    @Override
     public boolean canUndo() {
       return dessin_ != null && dessin_.isEnCours();
     }
 
+    @Override
     public void undo() {
       dessin_.getFormeEnCours().removeLastSaisie();
     }

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

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

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

Revision: 8655
          http://sourceforge.net/p/fudaa/svn/8655
Author:   deniger
Date:     2014-03-05 21:46:37 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
ajout wrapper

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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2014-03-05 12:01:39 UTC (rev 8654)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2014-03-05 21:46:37 UTC (rev 8655)
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JInternalFrame;
 import javax.swing.KeyStroke;
@@ -383,7 +384,6 @@
       }
     }
 
-
     boolean b = isModifiable;
     // Si la selection est sur le m\xEAme objet.
     b = b && (idGeom = hlp.getUniqueSelectedIdx()) != -1;
@@ -394,7 +394,8 @@
         if (!(geom instanceof GISMultiPoint)) {
           if (hlp.getNbAtomicSelected() == 1) {
             b = b
-                    && (hlp.getUniqueAtomicSelection().getMinIndex() == 0 || hlp.getUniqueAtomicSelection().getMaxIndex() + 1 == geom.getCoordinateSequence().size());
+                    && (hlp.getUniqueAtomicSelection().getMinIndex() == 0 || hlp.getUniqueAtomicSelection().getMaxIndex() + 1 == geom.
+                    getCoordinateSequence().size());
           } else if (hlp.getNbAtomicSelected() == 2) {
             b = b && Math.abs(hlp.getUniqueAtomicSelection().getMinIndex() - hlp.getUniqueAtomicSelection().getMaxIndex()) == 1;
           } else {
@@ -641,8 +642,8 @@
   public void moved(double _dx, double _dy, double _dz, boolean _confirmOnZ) {
     if (_confirmOnZ && _dz != 0
             && !ui_.question(EbliLib.getS("Accroche suivant Z"),
-            EbliLib.getS("Voulez vous translater les objets\ns\xE9lectionn\xE9s suivant DZ={0} ?",
-            getXYFormatter().getXYFormatter().format(_dz)))) {
+                    EbliLib.getS("Voulez vous translater les objets\ns\xE9lectionn\xE9s suivant DZ={0} ?",
+                            getXYFormatter().getXYFormatter().format(_dz)))) {
       _dz = 0;
     }
 
@@ -865,6 +866,10 @@
     return null;
   }
 
+  protected void configureEditorPanel(JComponent jc) {
+
+  }
+
   /**
    * L'\xE9dition pour un objet selectionn\xE9 unique.
    *
@@ -874,6 +879,7 @@
     final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
     final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected,
             true, true, getCoordinateDefinitions());
+    configureEditorPanel(ed);
     ed.setCmd(getMng());
     ed.afficheModale(getFrame(), _target.getTitle());
   }
@@ -890,6 +896,7 @@
     final boolean editAttribute = true;
     final EbliAtomicsEditorPanel ed = new EbliAtomicsEditorPanel(idx, vertex, getCoordinateDefinitions(),
             _target.getModelEditable(), editAttribute, getMng());
+    configureEditorPanel(ed);
     ed.afficheModale(getFrame(), _target.getTitle());
   }
 
@@ -910,6 +917,7 @@
     final EbliSegmentsEditorPanel ed = new EbliSegmentsEditorPanel(idx, segments, getCoordinateDefinitions(),
             (ZModeleLigneBriseeEditable) _target.getModelEditable(),
             editAttribute, getMng());
+    configureEditorPanel(ed);
     ed.afficheModale(getFrame(), _target.getTitle());
   }
 

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

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

[<bma...@us...>]

Revision: 9467
          http://sourceforge.net/p/fudaa/svn/9467
Author:   bmarchan
Date:     2016-11-25 14:38:35 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
Fix crash action edition si un calque n'a pas de modele editable.

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

Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2016-11-25 13:59:18 UTC (rev 9466)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/edition/ZEditorDefault.java	2016-11-25 14:38:35 UTC (rev 9467)
@@ -876,6 +876,10 @@
    * @param _target Le calque cible editable.
    */
   protected void editSingleObject(final ZCalqueEditable _target) {
+    if (_target.getModelEditable() == null) {
+      return;
+    }
+    
     final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
     final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected,
             true, true, getCoordinateDefinitions());
@@ -885,6 +889,10 @@
   }
 
   protected void editVertexObject(final ZCalqueEditable _target) {
+    if (_target.getModelEditable() == null) {
+      return;
+    }
+    
     final EbliListeSelectionMultiInterface idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelectionMulti();
     if (idxSelected.getNbListSelected() > 1) {
       return;

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