Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4099] branches/FudaaModeleur_TC1Bis/fudaa_devel
|
From: <bma...@us...> - 2008-10-26 21:52:40
|
Revision: 4099
http://fudaa.svn.sourceforge.net/fudaa/?rev=4099&view=rev
Author: bmarchan
Date: 2008-10-26 21:50:16 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Correctif pour un undo/redo fonctionnel.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -176,10 +176,11 @@
/**
* @param _panel le panneau des calques
*/
- public ZEditorDefault(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor) {
+ protected ZEditorDefault(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor) {
super();
panel_ = _panel;
sceneEditor_=_editor;
+ setMng(new CtuluCommandManager());
// panel_.addKeyListener(this);
buildDeletesAction();
EbliLib.updateMapKeyStroke(_panel, getDeleteActions());
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,7 +1,7 @@
/*
* @file MvVisuPanel.java
* @creation 6 f\xE9vr. 2004
- * @modification $Date: 2008-01-17 11:42:49 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -59,7 +59,7 @@
* element, etc.) et des services associ\xE9s.
*
* @author deniger
- * @version $Id: MvVisuPanel.java,v 1.5.6.1 2008-01-17 11:42:49 bmarchan Exp $
+ * @version $Id$
*/
public class MvVisuPanel extends FSigVisuPanel implements MvIsoPaintersSource {
@@ -201,7 +201,8 @@
}
protected FSigEditor createGisEditor() {
- return new FSigEditor(this, getCmdMng()) {
+ FSigEditor editor=
+ new FSigEditor(this) {
public GISPolygone[] getEnglobPolygone() {
final EfFrontierInterface frontiers = MvVisuPanel.this.getGridGroup().getGrid().getFrontiers();
@@ -211,6 +212,8 @@
return frontiers.getExternRing(MvVisuPanel.this.getGridGroup().getGrid());
}
};
+ mng_=editor.getMng();
+ return editor;
}
/**
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,6 +1,6 @@
/*
* @creation 28 janv. 08
- * @modification $Date: 2008/05/13 12:10:06 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -45,7 +45,7 @@
/**
* Un manager pour l'\xE9dition des calques SIG.
* @author Bertrand Marchand
- * @version $Id: MdlEditionManager.java,v 1.1.2.8 2008/05/13 12:10:06 bmarchan Exp $
+ * @version $Id$
*/
public class MdlEditionManager extends FSigEditor {
@@ -54,8 +54,8 @@
* @param _panel
* @param _cmd
*/
- public MdlEditionManager(MdlVisuPanel _panel, CtuluCommandManager _cmd) {
- super(_panel, new MdlSceneEditor(_panel,_panel.getScene()), _cmd);
+ public MdlEditionManager(MdlVisuPanel _panel) {
+ super(_panel, new MdlSceneEditor(_panel,_panel.getScene()));
}
/**
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,6 +1,6 @@
/*
* @creation 7 juin 07
- * @modification $Date: 2008/05/13 12:10:21 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -41,7 +41,7 @@
* Le panneau de visu 2D des donn\xE9es du modeleur au travers des calques. Contient le composant vue
* des calques + le composant d'affichage des coordonn\xE9es + le composant d'affichage du mode de selection
* @author fred deniger
- * @version $Id: MdlVisuPanel.java,v 1.1.2.6 2008/05/13 12:10:21 bmarchan Exp $
+ * @version $Id$
*/
public class MdlVisuPanel extends FSigVisuPanel {
@@ -64,7 +64,9 @@
}
protected FSigEditor createGisEditor() {
- return new MdlEditionManager(this, getCmdMng());
+ FSigEditor editor=new MdlEditionManager(this);
+ mng_=editor.getMng();
+ return editor;
}
public FSigLayerGroup getGroupGIS() {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -68,17 +68,17 @@
/**
* @param _panel
*/
- public FSigEditor(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor, final CtuluCommandManager _cmd) {
+ public FSigEditor(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor) {
super(_panel,_editor);
- setMng(_cmd);
+// setMng(_cmd);
}
/**
* @param _panel
*/
- public FSigEditor(final ZEbliCalquesPanel _panel, final CtuluCommandManager _cmd) {
+ public FSigEditor(final ZEbliCalquesPanel _panel) {
super(_panel);
- setMng(_cmd);
+// setMng(_cmd);
}
public void dataChanged(final GISAttributeInterface _attribute, final GISCollectionData _data) {
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,6 +1,6 @@
/**
* @creation 6 f\xE9vr. 2004
- * @modification $Date: 2008-05-13 12:11:01 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -43,11 +43,11 @@
* les calques SIG et des services associ\xE9s.
*
* @author Fred Deniger
- * @version $Id: FSigVisuPanel.java,v 1.2.4.3 2008-05-13 12:11:01 bmarchan Exp $
+ * @version $Id$
*/
public abstract class FSigVisuPanel extends ZEbliCalquesPanel implements CtuluUndoRedoInterface {
- private final CtuluCommandManager mng_;
+ protected CtuluCommandManager mng_;
FSigAttibuteTypeManager attMng_;
@@ -67,7 +67,7 @@
public FSigVisuPanel(final BGroupeCalque _gcMain, final FudaaCommonImplementation _impl) {
super(_gcMain, new FSigVisuPanelController(_impl));
impl_ = _impl;
- mng_ = new CtuluCommandManager();
+// mng_ = new CtuluCommandManager();
setModeVisible(true);
setEbliFormatter(new EbliFormatter());
gisEditor_.setUi(getImpl());
@@ -111,7 +111,9 @@
}
protected ZEditorDefault createGisEditor() {
- return new FSigEditor(this, getCmdMng());
+ ZEditorDefault editor=new FSigEditor(this);
+ mng_=editor.getMng();
+ return editor;
}
protected BuMenu[] createSpecificMenus(final String _title) {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,6 +1,6 @@
/*
* @creation 6 avr. 2005
- * @modification $Date: 2008-05-13 12:10:38 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -54,7 +54,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrGisProjectEditor.java,v 1.19.6.2 2008-05-13 12:10:38 bmarchan Exp $
+ * @version $Id$
*/
public class TrGisProjectEditor extends FSigEditor {
@@ -62,7 +62,7 @@
* @param _panel
*/
public TrGisProjectEditor(final TrVisuPanelEditor _panel) {
- super(_panel,_panel.getCmdMng());
+ super(_panel);
}
protected final TrVisuPanelEditor getTrPanel() {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2008-10-26 20:18:54 UTC (rev 4098)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java 2008-10-26 21:50:16 UTC (rev 4099)
@@ -1,6 +1,6 @@
/*
* @creation 6 avr. 2005
- * @modification $Date: 2007-06-14 12:01:41 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -69,7 +69,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public abstract class TrVisuPanelEditor extends TrVisuPanel {
@@ -164,7 +164,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public abstract class EditPropertiesFromGeom extends EditPropertiesAbstract {
@@ -181,7 +181,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class SiEditGeomAction extends EditPropertiesFromGeom {
@@ -197,7 +197,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class NodalEditGeomAction extends EditPropertiesFromGeom {
@@ -212,7 +212,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class NodalEditAction extends EditProperties {
@@ -232,7 +232,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class SiEditAction extends EditProperties {
@@ -253,7 +253,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class ElementEditAction extends EditProperties {
@@ -273,7 +273,7 @@
/**
* @author Fred Deniger
- * @version $Id: TrVisuPanelEditor.java,v 1.34 2007-06-14 12:01:41 deniger Exp $
+ * @version $Id$
*/
public class ElementEditGeomAction extends EditPropertiesFromGeom {
@@ -422,7 +422,9 @@
}
public FSigEditor createGisEditor() {
- return new TrGisProjectEditor(this);
+ FSigEditor editor=new TrGisProjectEditor(this);
+ mng_=editor.getMng();
+ return editor;
}
/**
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
