Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4029] branches/FudaaModeleur_TC1Bis/fudaa_devel
|
From: <bma...@us...> - 2008-10-03 14:37:46
|
Revision: 4029
http://fudaa.svn.sourceforge.net/fudaa/?rev=4029&view=rev
Author: bmarchan
Date: 2008-10-03 14:37:38 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
Simplification de l'arborescence des modeles, ZModeleGeom et ZModeleGeometry sont fusionn?\195?\169s.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
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/ZModelClassLayerFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.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/FSigLayerFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
Removed Paths:
-------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
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/ZModelClassLayerFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.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/FSigLayerFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 21 nov. 06
- * @modification $Date: 2007-05-04 13:49:46 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -50,7 +50,7 @@
* Ce mod\xE8le est automatiquement mis a jour si une instance de l'arbre des calque lui est fourni.
*
* @author Fred Deniger, Bertrand Marchand
- * @version $Id: CalqueFindCourbeTreeModel.java,v 1.5 2007-05-04 13:49:46 deniger Exp $
+ * @version $Id$
*/
public class CalqueGISTreeModel extends DefaultTreeModel implements Observer {
@@ -229,7 +229,7 @@
*/
public void fillWithGeometries(LayerNode _nd, final List<Geometry> _dest) {
if (_nd.idxGeom_ >= 0) {
- final ZModeleGeom md=(ZModeleGeom)((ZCalqueAffichageDonneesAbstract)_nd.getUserObject()).modeleDonnees();
+ final ZModeleGeometry md=(ZModeleGeometry)((ZCalqueAffichageDonneesAbstract)_nd.getUserObject()).modeleDonnees();
_dest.add(md.getGeomData().getGeometry(_nd.idxGeom_));
} else if (((BCalque) _nd.getUserObject()).isGroupeCalque()) {
final BCalque[] cqs = ((BCalque) _nd.getUserObject()).getTousCalques();
@@ -247,7 +247,7 @@
private void fillWithLayerGeometries(final List<Geometry> _dest, final BCalque _cq) {
if (_cq instanceof ZCalqueAffichageDonneesAbstract) {
- final GISZoneCollection collec = ((ZModeleGeom)((ZCalqueAffichageDonneesAbstract)_cq).modeleDonnees()).getGeomData();
+ final GISZoneCollection collec = ((ZModeleGeometry)((ZCalqueAffichageDonneesAbstract)_cq).modeleDonnees()).getGeomData();
final GISVisitorGeometryCollector visitor = new GISVisitorGeometryCollector(finder_.getMask());
collec.accept(visitor);
_dest.addAll(visitor.getGeometries());
@@ -273,7 +273,7 @@
}
void addGeometries(final LayerNode _parent, final ZCalqueAffichageDonneesAbstract _cq) {
- final GISZoneCollection collec = ((ZModeleGeom)_cq.modeleDonnees()).getGeomData();
+ final GISZoneCollection collec = ((ZModeleGeometry)_cq.modeleDonnees()).getGeomData();
final GISAttributeModelObjectInterface nameAtt = (GISAttributeModelObjectInterface) collec.getModel(GISAttributeConstants.TITRE);
final int nb = collec.getNumGeometries();
for (int i = 0; i < nb; i++) {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 31 mars 2005
- * @modification $Date: 2008-04-01 17:05:16 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -63,13 +63,13 @@
* {@link ZModeleGeometry}.
*
* @author Bertrand Marchand
- * @version $Id: ZCalqueMultiPoint.java,v 1.1.2.2 2008-04-01 17:05:16 bmarchan Exp $
+ * @version $Id$
*/
public class ZCalqueGeometry extends ZCalqueAffichageDonneesLineAbstract {
/**
* @author Fred Deniger
- * @version $Id: ZCalqueMultiPoint.java,v 1.1.2.2 2008-04-01 17:05:16 bmarchan Exp $
+ * @version $Id$
*/
private class VariableNonAtomicFindExpression extends CalqueFindExpression {
@@ -81,7 +81,7 @@
public void initialiseExpr(final CtuluExpr _expr) {
super.initialiseExpr(_expr);
- final GISZoneCollection coll = ((ZModeleGeom) super.data_).getGeomData();
+ final GISZoneCollection coll = ((ZModeleGeometry) super.data_).getGeomData();
final int nb = coll.getNbAttributes();
if (nb > 0) {
if (varAtt_ == null) {
@@ -102,7 +102,7 @@
public void majVariable(final int _idx, final Variable[] _varToUpdate) {
super.majVariable(_idx, _varToUpdate);
if (varAtt_ != null && !CtuluLibArray.isEmpty(_varToUpdate)) {
- final GISZoneCollection coll = ((ZModeleGeom) super.data_).getGeomData();
+ final GISZoneCollection coll = ((ZModeleGeometry) super.data_).getGeomData();
for (int i = _varToUpdate.length - 1; i >= 0; i--) {
if (varAtt_.containsKey(_varToUpdate[i])) {
_varToUpdate[i].setValue(CtuluLib.getDouble(((Number) coll.getDataModel(varAtt_.get(_varToUpdate[i]))
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,30 +0,0 @@
-/*
- * @creation 25 mai 2005
- * @modification $Date: 2008-01-24 10:18:59 $
- * @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;
-
-import org.fudaa.ctulu.gis.GISZoneCollection;
-
-/**
- * Une interface mod\xE8le de donn\xE9es comportant des objets de type GIS. Ces objets sont exportables.
- *
- * @author Fred Deniger
- * @version $Id: ZModeleGeom.java,v 1.2.8.1 2008-01-24 10:18:59 bmarchan Exp $
- */
-public interface ZModeleGeom extends ZModeleDonnees {
-
- /**
- * Retourne la g\xE9ometrie GIS.
- * @return la geometrie
- */
- GISZoneCollection getGeomData();
-
- /**
- * Prepare l'exportation des donn\xE9es.
- */
- void prepareExport();
-}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,12 +1,13 @@
/*
* @creation 31 mars 2005
- * @modification $Date: 2008-03-26 16:46:43 $
+ * @modification $Date$
* @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;
+import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
@@ -14,14 +15,26 @@
* Un mod\xE8le contenant toutes sortes de GIS g\xE9om\xE9tries (non sp\xE9cialis\xE9).
* @see org.fudaa.ebli.calque.ZCalqueGeometry
* @author Bertrand Marchand
- * @version $Id: ZModeleMultiPoint.java,v 1.1.2.1 2008-03-26 16:46:43 bmarchan Exp $
+ * @version $Id$
*/
-public interface ZModeleGeometry extends ZModeleGeom{
+public interface ZModeleGeometry extends ZModeleDonnees {
/**
+ * Retourne la collection qui associe les g\xE9om\xE9tries du mod\xE8le \xE0 des atrributs.
+ * @return la collection.
+ */
+ GISZoneCollection getGeomData();
+
+ /**
+ * Prepare l'exportation des donn\xE9es, en particulier le Z des g\xE9om\xE9tries est rempli depuis
+ * l'attribut Z.
+ */
+ void prepareExport();
+
+ /**
* Retourne le nombre de points de la g\xE9om\xE9trie d'indice donn\xE9.
* @param _idxGeom l'indice de la g\xE9om\xE9trie
- * @return le nombre de point pour cette frontiere
+ * @return le nombre de point pour cette g\xE9om\xE9trie
*/
int getNbPointForGeometry(int _idxGeom);
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeometry.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
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-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 1 avr. 2005
- * @modification $Date: 2008-05-13 12:10:24 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -39,7 +39,7 @@
import org.fudaa.ebli.calque.ZCalqueClickInteraction;
import org.fudaa.ebli.calque.ZCalqueClikInteractionListener;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.ZScene;
import org.fudaa.ebli.calque.dessin.DeForme;
import org.fudaa.ebli.commun.EbliActionInterface;
@@ -62,7 +62,7 @@
* objets manipul\xE9s, met \xE0 jour le panneau des outils, contient les actions possibles, etc.
*
* @author Fred Deniger
- * @version $Id: ZEditorDefault.java,v 1.20.6.5 2008-05-13 12:10:24 bmarchan Exp $
+ * @version $Id$
*/
public class ZEditorDefault implements ZCalqueEditionInteractionTargetI, ZEditorInterface,
PropertyChangeListener, ZCalqueDeplacementTargetInterface {
@@ -794,7 +794,7 @@
if (!(cq instanceof ZCalqueAffichageDonnees) || ((ZCalqueAffichageDonnees) cq).isSelectionEmpty()) {
return;
}
- if (!(((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeom)) {
+ if (!(((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)) {
return;
}
final ZCalqueAffichageDonnees cqDonnees = (ZCalqueAffichageDonnees) cq;
@@ -817,7 +817,7 @@
if (idxGeom < 0) {
return;
}
- final EbliSingleGeomVisuPanel ed = new EbliSingleGeomVisuPanel(((ZModeleGeom) cqDonnees.modeleDonnees())
+ final EbliSingleGeomVisuPanel ed = new EbliSingleGeomVisuPanel(((ZModeleGeometry) cqDonnees.modeleDonnees())
.getGeomData(), idxGeom, idxVertex, getXYFormatter());
ed.afficheModale(getFrame(), cqDonnees.getTitle());
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelClassLayerFilter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelClassLayerFilter.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelClassLayerFilter.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 26 mai 2005
- * @modification $Date: 2006-07-13 13:35:47 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -18,11 +18,11 @@
import org.fudaa.ebli.calque.BCalqueVisitor;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZModeleDonnees;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
/**
* @author Fred Deniger
- * @version $Id: ZModelClassLayerFilter.java,v 1.3 2006-07-13 13:35:47 deniger Exp $
+ * @version $Id$
*/
public class ZModelClassLayerFilter implements BCalqueVisitor {
@@ -51,14 +51,14 @@
*/
public void fillArray(final GISZoneCollection[] _dest){
for (int i = res_.size() - 1; i >= 0; i--) {
- _dest[i] = ((ZModeleGeom) (((ZCalqueAffichageDonneesInterface) res_.get(i)).modeleDonnees()))
+ _dest[i] = ((ZModeleGeometry) (((ZCalqueAffichageDonneesInterface) res_.get(i)).modeleDonnees()))
.getGeomData();
}
}
public void fillArrayModel(final GISDataModel[] _dest){
for (int i = res_.size() - 1; i >= 0; i--) {
- _dest[i] = new GISDataModelZoneAdapter(((ZModeleGeom) (((ZCalqueAffichageDonneesInterface) res_
+ _dest[i] = new GISDataModelZoneAdapter(((ZModeleGeometry) (((ZCalqueAffichageDonneesInterface) res_
.get(i)).modeleDonnees())).getGeomData(), null);
}
}
@@ -66,8 +66,8 @@
public boolean visit(final BCalque _cq){
if (!res_.contains(_cq) && _cq instanceof ZCalqueAffichageDonneesInterface) {
final ZModeleDonnees data = ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees();
- if (data instanceof ZModeleGeom
- && model_.isAssignableFrom(((ZModeleGeom) data).getGeomData().getClass())) {
+ if (data instanceof ZModeleGeometry
+ && model_.isAssignableFrom(((ZModeleGeometry) data).getGeomData().getClass())) {
res_.add(_cq);
}
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelClassLayerFilter.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 15 avr. 2005
- * @modification $Date: 2006-04-12 15:28:02 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -11,14 +11,14 @@
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry ;
/**
* @author Fred Deniger
- * @version $Id: ZModeleEditable.java,v 1.3 2006-04-12 15:28:02 deniger Exp $
+ * @version $Id$
*/
-public interface ZModeleEditable extends ZModeleGeom{
+public interface ZModeleEditable extends ZModeleGeometry {
/**
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 4 avr. 2005
- * @modification $Date: 2007-04-16 16:35:08 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -40,13 +40,13 @@
/**
* @author Fred Deniger
- * @version $Id: ZModelePointEditable.java,v 1.17 2007-04-16 16:35:08 deniger Exp $
+ * @version $Id$
*/
public class ZModelePointEditable implements ZModelePointEditableInterface {
/**
* @author Fred Deniger
- * @version $Id: ZModelePointEditable.java,v 1.17 2007-04-16 16:35:08 deniger Exp $
+ * @version $Id$
*/
public class PointTableModel extends AbstractTableModel {
@@ -264,6 +264,38 @@
}
public Object getObject(final int _ind) {
- return null;
+ return pts_ == null ? null : pts_.getGeometry(_ind);
}
+
+ public void getDomaineForGeometry(int _idxGeom, GrBoite _target) {
+ _target.o_.x_=getX(_idxGeom);
+ _target.o_.y_=getY(_idxGeom);
+ _target.e_.x_=_target.o_.x_;
+ _target.e_.y_=_target.o_.y_;
+ }
+
+ public int getNbPointForGeometry(int _idxGeom) {
+ return 1;
+ }
+
+ public boolean isGeometryFermee(int _idxGeom) {
+ return false;
+ }
+
+ public boolean isGeometryReliee(int _idxGeom) {
+ return false;
+ }
+
+ public boolean isGeometryVisible(int _idxGeom) {
+ int iattVisibility=pts_.getIndiceOf(GISAttributeConstants.VISIBILITE);
+ if (iattVisibility==-1) return true;
+
+ return (Boolean)pts_.getValue(iattVisibility, _idxGeom);
+ }
+
+ public boolean point(GrPoint _pt, int _idxGeom, int _pointIdx) {
+ _pt.x_=getX(_idxGeom);
+ _pt.y_=getY(_idxGeom);
+ return true;
+ }
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 8 sept. 06
- * @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...
@@ -28,7 +28,7 @@
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesAbstract;
import org.fudaa.ebli.calque.ZCalqueGeometry;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.ebli.trace.TraceIconModel;
@@ -48,7 +48,7 @@
/**
* Un panneau de saisie des g\xE9om\xE9tries supports de projection suivant Z.
* @author Bertrand Marchand
- * @version $Id: MdlProjectImportPanel.java,v 1.1.2.1 2008/05/13 12:10:21 bmarchan Exp $
+ * @version $Id$
*/
public class MdlProjectionPanel extends CtuluDialogPanel {
@@ -92,7 +92,7 @@
for (int i=0; i<selpaths.length; i++) {
final CalqueGISTreeModel.LayerNode node=(CalqueGISTreeModel.LayerNode)selpaths[i].getLastPathComponent();
final ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) node.getUserObject();
- GISZoneCollection col=((ZModeleGeom)cq.modeleDonnees()).getGeomData();
+ GISZoneCollection col=((ZModeleGeometry)cq.modeleDonnees()).getGeomData();
// Pour le transport du Z.
col.initZCoordinate(node.getIdxGeom());
geoms[i]=col.getGeometry(node.getIdxGeom());
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 25 avr. 08
- * @modification $Date: 2008-05-13 12:10:19 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -29,7 +29,7 @@
import org.fudaa.ctulu.interpolation.bilinear.InterpolatorBilinear;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZModeleDonnees;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.ZScene;
import org.fudaa.ebli.calque.edition.ZSceneEditor;
import org.fudaa.fudaa.commun.FudaaLib;
@@ -44,7 +44,7 @@
/**
* L'\xE9diteur effectuant les traitements sur la scene sp\xE9cifiques au modeleur.
* @author Bertrand Marchand
- * @version $Id: MdlSceneEditor.java,v 1.1.2.1 2008-05-13 12:10:19 bmarchan Exp $
+ * @version $Id$
*/
public class MdlSceneEditor extends ZSceneEditor {
// Pour l'affichage des boites de dialogue.
@@ -115,7 +115,7 @@
* D\xE9place les g\xE9om\xE9tries s\xE9lectionn\xE9es dans le calque cible.
*/
public void moveInLayerSelectedGeometries() {
- ZModeleGeom mdldest=(ZModeleGeom)((ZCalqueAffichageDonneesInterface)getScene().getCalqueActif()).modeleDonnees();
+ ZModeleGeometry mdldest=(ZModeleGeometry)((ZCalqueAffichageDonneesInterface)getScene().getCalqueActif()).modeleDonnees();
GISZoneCollection coldest=mdldest.getGeomData();
int[] idxGeom=getScene().getLayerSelection().getSelectedIndex();
@@ -141,7 +141,7 @@
// Les attributs
Object[] datadest=new Object[coldest.getNbAttributes()];
- GISZoneCollection colsrc=((ZModeleGeom)getScene().getLayerForId(idxGeom[i]).modeleDonnees()).getGeomData();
+ GISZoneCollection colsrc=((ZModeleGeometry)getScene().getLayerForId(idxGeom[i]).modeleDonnees()).getGeomData();
for (int iatt=0; iatt<datadest.length; iatt++) {
int idxAtt=colsrc.getIndiceOf(coldest.getAttribute(iatt));
if (idxAtt!=-1) datadest[iatt]=colsrc.getValue(idxAtt,getScene().sceneId2LayerId(idxGeom[i]));
@@ -307,7 +307,7 @@
for (int i=0; i<idxGeom.length; i++) {
Object vals=targetGeoms.getValue(0,i);
- GISZoneCollection colTmp=((ZModeleGeom)getScene().getLayerForId(idxGeom[i]).modeleDonnees()).getGeomData();
+ GISZoneCollection colTmp=((ZModeleGeometry)getScene().getLayerForId(idxGeom[i]).modeleDonnees()).getGeomData();
if (col!=colTmp) {
col=colTmp;
zatt=col.getIndiceOf(col.getAttributeIsZ());
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 26 mai 2005
- * @modification $Date: 2007-05-04 14:00:26 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -25,11 +25,11 @@
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueVisitor;
import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
/**
* @author Fred Deniger
- * @version $Id: FSigGeomDataClosedLayerFilter.java,v 1.8 2007-05-04 14:00:26 deniger Exp $
+ * @version $Id$
*/
public class FSigGeomDataClosedLayerFilter implements BCalqueVisitor {
@@ -125,7 +125,7 @@
}
if (_cq instanceof ZCalqueLigneBrisee) {
counter_.init();
- final ZModeleGeom geom = ((ZCalqueLigneBrisee) _cq).getModele();
+ final ZModeleGeometry geom = ((ZCalqueLigneBrisee) _cq).getModele();
geom.getGeomData().accept(counter_);
nbPointTotal_ += counter_.nbPoint_;
if (counter_.nbPolygones_ > 0) {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigGeomDataClosedLayerFilter.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-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 5 avr. 2005
- * @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 fud...@li...
@@ -45,7 +45,7 @@
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
@@ -60,7 +60,7 @@
/**
* @author Fred Deniger
- * @version $Id: FSigEditor.java,v 1.7.4.6 2008-05-13 12:11:01 bmarchan Exp $
+ * @version $Id$
*/
public class FSigEditor extends ZEditorDefault implements GISZoneListener {
@@ -267,7 +267,7 @@
public void updateStateBeforeShow() {
final BCalque cq = FSigEditor.this.getPanel().getArbreCalqueModel().getSelectedCalque();
super.setEnabled((cq instanceof ZCalqueAffichageDonnees) && (!((ZCalqueAffichageDonnees) cq).isSelectionEmpty())
- && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeom)));
+ && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)));
}
public String getEnableCondition() {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 10 juin 2005
- * @modification $Date: 2007-04-30 14:22:39 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -25,12 +25,12 @@
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueVisitor;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
/**
* Un filtre sur les calques a exporter. Les calques a exporter peuvent \xEAtre uniquement les calques visibles.
* @author Fred Deniger
- * @version $Id: FSigLayerFilter.java,v 1.4 2007-04-30 14:22:39 deniger Exp $
+ * @version $Id$
*/
public class FSigLayerFilter implements BCalqueVisitor {
@@ -68,7 +68,7 @@
}
final GISZoneCollection getCollect(final ZCalqueAffichageDonneesInterface _o) {
- final GISZoneCollection geomData = ((ZModeleGeom) _o.modeleDonnees()).getGeomData();
+ final GISZoneCollection geomData = ((ZModeleGeometry) _o.modeleDonnees()).getGeomData();
geomData.prepareExport();
return geomData;
}
@@ -90,9 +90,9 @@
if (bonlyVisible_ && !_cq.isVisible()) return true;
if (!cqs_.contains(_cq) && _cq instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees() instanceof ZModeleGeom) {
+ && ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees() instanceof ZModeleGeometry) {
cqs_.add(_cq);
- final ZModeleGeom geom = (ZModeleGeom) ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees();
+ final ZModeleGeometry geom = (ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees();
if (geom.getGeomData().getDataStoreClass().equals(Point.class)) {
pointCq_.add(_cq);
} else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 18 mai 2005
- * @modification $Date: 2008-01-17 11:38:59 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -37,7 +37,7 @@
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
import org.fudaa.ebli.calque.edition.ZCalquePointEditable;
@@ -55,13 +55,13 @@
* avec attributs.
*
* @author Fred Deniger
- * @version $Id: FSigLayerGroup.java,v 1.6.2.1 2008-01-17 11:38:59 bmarchan Exp $
+ * @version $Id$
*/
public class FSigLayerGroup extends ZCalqueEditionGroup {
/**
* @author fred deniger
- * @version $Id: FSigLayerGroup.java,v 1.6.2.1 2008-01-17 11:38:59 bmarchan Exp $
+ * @version $Id$
*/
static final class CommandForLayerCreation implements CtuluCommand {
private final BCalque parent_;
@@ -87,7 +87,7 @@
/**
* @author fred deniger
- * @version $Id: FSigLayerGroup.java,v 1.6.2.1 2008-01-17 11:38:59 bmarchan Exp $
+ * @version $Id$
*/
static final class NewNamePanel extends CtuluDialogPanel {
/**
@@ -383,8 +383,8 @@
};
for (int i = 0; i < cq.length; i++) {
if (cq[i] instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeom) {
- final ZModeleGeom donnees = (ZModeleGeom) ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees();
+ && ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees() instanceof ZModeleGeometry) {
+ final ZModeleGeometry donnees = (ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) cq[i]).modeleDonnees();
donnees.getGeomData().setAttributes(att, cmp);
}
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 26 ao\xFBt 2005
- * @modification $Date: 2008-01-22 09:58:16 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -45,7 +45,7 @@
import org.fudaa.ebli.calque.BCalqueSaverSingle;
import org.fudaa.ebli.calque.BCalqueSaverTargetInterface;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.fudaa.commun.save.FudaaSaveLib;
@@ -53,7 +53,7 @@
/**
* @author Fred Deniger
- * @version $Id: FSigLayerPointPersistence.java,v 1.9.6.1 2008-01-22 09:58:16 bmarchan Exp $
+ * @version $Id$
*/
public class FSigLayerPointPersistence extends BCalquePersistenceSingle {
@@ -99,7 +99,7 @@
}
private GISZoneCollection getGeomData(final BCalque _cqToSave) {
- return ((ZModeleGeom) ((ZCalqueAffichageDonneesInterface) _cqToSave).modeleDonnees()).getGeomData();
+ return ((ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) _cqToSave).modeleDonnees()).getGeomData();
}
protected GISZoneCollection createInitCollection() {
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/persistence/FSigLayerPointPersistence.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java 2008-10-03 13:08:56 UTC (rev 4028)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.java 2008-10-03 14:37:38 UTC (rev 4029)
@@ -1,6 +1,6 @@
/*
* @creation 25 mai 2005
- * @modification $Date: 2008-02-22 16:27:43 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -52,7 +52,7 @@
import org.fudaa.ebli.calque.BArbreCalqueModel;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
-import org.fudaa.ebli.calque.ZModeleGeom;
+import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.fudaa.sig.FSigGeomSrcData;
@@ -63,7 +63,7 @@
/**
* Un wizard pour la modification d'une variable.
* @author Fred Deniger
- * @version $Id: FSigWizardVariableModifier.java,v 1.3.6.1 2008-02-22 16:27:43 bmarchan Exp $
+ * @version $Id$
*/
public class FSigWizardVariableModifier extends BuWizardTask implements TreeSelectionListener {
@@ -162,7 +162,7 @@
/**
* @author fred deniger
- * @version $Id: FSigWizardVariableModifier.java,v 1.3.6.1 2008-02-22 16:27:43 bmarchan Exp $
+ * @version $Id$
*/
static final class VariableCellTextRenderer extends CtuluCellTextRenderer {
protected void setValue(Object _value) {
@@ -567,8 +567,8 @@
if (_cqToScan instanceof ZCalqueEditionGroup) {
res = ((ZCalqueEditionGroup) _cqToScan).getAttributes();
} else if (_cqToScan instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees() instanceof ZModeleGeom) {
- res = ((ZModeleGeom) ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees()).getGeomData()
+ && ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees() instanceof ZModeleGeometry) {
+ res = ((ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) _cqToScan).modeleDonnees()).getGeomData()
.getAttributes();
}
return res == null ? nullAtt_ : res;
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigWizardVariableModifier.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.
|
