Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[8321] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/c

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8321
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8321&view=rev
Author:   deniger
Date:     2013-03-13 23:45:53 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------


Added Paths:
-----------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java

Removed Paths:
-------------
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
    trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java

Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
===================================================================

--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java	2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,89 +0,0 @@
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluCommandComposite;
-import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-import org.fudaa.ebli.calque.edition.ZEditorDefault;
-import org.fudaa.ebli.calque.edition.ZModeleEditable;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
- *
- * @author deniger ( genesis)
- */
-public class AddSommetAction extends EbliActionSimple {
-
-  private final ZScene scene;
-
-  public AddSommetAction(ZScene scene) {
-    super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
-    assert scene != null;
-    this.scene = scene;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent _e) {
-    updateStateBeforeShow();
-    if (isEnabled()) {
-      ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
-      ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
-      CtuluCommandComposite cmp = null;
-      if (editor.getMng() != null) {
-        cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
-      }
-      Object source = _e.getSource();
-      GrPoint pointReel = null;
-      if (source instanceof JComponent) {
-        JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
-        if (ancestorOfClass != null) {
-          pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
-          if (pointReel != null) {
-            pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
-          }
-        }
-      }
-      if (pointReel == null) {
-        return;
-      }
-      if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
-        scene.repainSelection();
-        if (editor.getMng() != null && cmp != null) {
-          editor.getMng().addCmd(cmp.getSimplify());
-        }
-      }
-    }
-  }
-
-  @Override
-  public void updateStateBeforeShow() {
-    BCalque calqueActif = scene.getCalqueActif();
-    boolean enable = false;
-    if (calqueActif instanceof ZCalqueEditable) {
-      ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
-      if (!calqueEditable.isSelectionEmpty()) {
-        ZModeleEditable modelEditable = calqueEditable.getModelEditable();
-        if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
-          if (scene.canUseAtomicMode(calqueActif)) {
-            enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
-          }
-        }
-      }
-    }
-    setEnabled(enable);
-  }
-
-  public boolean isActivatedFor(BCalque cqActif) {
-    return scene.canUseAtomicMode(cqActif);
-  }
-}

Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java (from rev 8280, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java	                        (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,89 @@
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.calque.edition.ZEditorDefault;
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
+ *
+ * @author deniger ( genesis)
+ */
+public class AddSommetAction extends EbliActionSimple {
+
+  private final ZScene scene;
+
+  public AddSommetAction(ZScene scene) {
+    super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
+    assert scene != null;
+    this.scene = scene;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent _e) {
+    updateStateBeforeShow();
+    if (isEnabled()) {
+      ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
+      ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
+      CtuluCommandComposite cmp = null;
+      if (editor.getMng() != null) {
+        cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
+      }
+      Object source = _e.getSource();
+      GrPoint pointReel = null;
+      if (source instanceof JComponent) {
+        JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
+        if (ancestorOfClass != null) {
+          pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
+          if (pointReel != null) {
+            pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
+          }
+        }
+      }
+      if (pointReel == null) {
+        return;
+      }
+      if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
+        scene.repainSelection();
+        if (editor.getMng() != null && cmp != null) {
+          editor.getMng().addCmd(cmp.getSimplify());
+        }
+      }
+    }
+  }
+
+  @Override
+  public void updateStateBeforeShow() {
+    BCalque calqueActif = scene.getCalqueActif();
+    boolean enable = false;
+    if (calqueActif instanceof ZCalqueEditable) {
+      ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
+      if (!calqueEditable.isSelectionEmpty()) {
+        ZModeleEditable modelEditable = calqueEditable.getModelEditable();
+        if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
+          if (scene.canUseAtomicMode(calqueActif)) {
+            enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
+          }
+        }
+      }
+    }
+    setEnabled(enable);
+  }
+
+  public boolean isActivatedFor(BCalque cqActif) {
+    return scene.canUseAtomicMode(cqActif);
+  }
+}

Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java	2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,52 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionChangeState;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
-
-  private final transient ZScene scene_;
-
-  /**
-   * Cr\xE9ation de l'action.
-   */
-  public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
-    super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
-    scene_ = _scn;
-  }
-
-  @Override
-  public void changeAction() {
-    scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
-  }
-
-  /**
-   * Changement de calque selectionn\xE9.
-   */
-  @Override
-  public void valueChanged(TreeSelectionEvent e) {
-    updateState();
-  }
-
-  public void updateState() {
-    setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
-  }
-}
\ No newline at end of file

Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java	                        (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,52 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionChangeState;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
+
+  private final transient ZScene scene_;
+
+  /**
+   * Cr\xE9ation de l'action.
+   */
+  public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
+    super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
+    scene_ = _scn;
+  }
+
+  @Override
+  public void changeAction() {
+    scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
+  }
+
+  /**
+   * Changement de calque selectionn\xE9.
+   */
+  @Override
+  public void valueChanged(TreeSelectionEvent e) {
+    updateState();
+  }
+
+  public void updateState() {
+    setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
+  }
+}
\ No newline at end of file

Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java	2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,41 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueNormalSelectionAction extends EbliActionSimple {
-
-  private final transient ZScene scene_;
-
-  /**
-   * Cr\xE9ation de l'action.
-   */
-  public CalqueNormalSelectionAction(final ZScene _scn) {
-    super("MODE_NORMAL", null, "MODE_NORMAL");
-    putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
-    scene_ = _scn;
-  }
-
-  @Override
-  public void actionPerformed(ActionEvent _e) {
-    scene_.setSelectionMode(SelectionMode.NORMAL);
-  }
-}
\ No newline at end of file

Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java	                        (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java	2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,41 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueNormalSelectionAction extends EbliActionSimple {
+
+  private final transient ZScene scene_;
+
+  /**
+   * Cr\xE9ation de l'action.
+   */
+  public CalqueNormalSelectionAction(final ZScene _scn) {
+    super("MODE_NORMAL", null, "MODE_NORMAL");
+    putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+    scene_ = _scn;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent _e) {
+    scene_.setSelectionMode(SelectionMode.NORMAL);
+  }
+}
\ No newline at end of file

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





Thread: [Fudaa-svn-commit] SF.net SVN: fudaa:[8321] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/c

https://gitlab.com/fudaa

fudaa-svn-commit