From: <bma...@us...> - 2009-03-06 14:58:19
|
Revision: 4515 http://fudaa.svn.sourceforge.net/fudaa/?rev=4515&view=rev Author: bmarchan Date: 2009-03-06 14:58:09 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Nettoyage et renommage. Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.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/MdlImplementation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.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/MdlRefinementPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/ZDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java Added Paths: ----------- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePointAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/MdlResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt Removed Paths: ------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlDecimationPanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -14,6 +14,7 @@ import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.gui.CtuluDialogPanel; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuRadioButton; 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 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -34,8 +34,8 @@ import org.fudaa.fudaa.modeleur.action.SceneInvertAction; import org.fudaa.fudaa.modeleur.action.SceneLinearisePolyligneAction; import org.fudaa.fudaa.modeleur.action.SceneMoveInLayerAction; -import org.fudaa.fudaa.modeleur.action.SceneOrganizePoint; -import org.fudaa.fudaa.modeleur.action.SceneProfilInterpolation; +import org.fudaa.fudaa.modeleur.action.SceneOrganizePointAction; +import org.fudaa.fudaa.modeleur.action.SceneProfilInterpolationAction; import org.fudaa.fudaa.modeleur.action.SceneProjectionAction; import org.fudaa.fudaa.modeleur.action.SceneRefinementAction; import org.fudaa.fudaa.sig.layer.FSigEditor; @@ -84,10 +84,10 @@ acts.add(new SceneInterpolationAction((MdlSceneEditor)sceneEditor_)); acts.add(new SceneInvertAction((MdlSceneEditor)sceneEditor_)); acts.add(new SceneProjectionAction((MdlSceneEditor)sceneEditor_)); - acts.add(new SceneProfilInterpolation((MdlSceneEditor)sceneEditor_)); + acts.add(new SceneProfilInterpolationAction((MdlSceneEditor)sceneEditor_)); acts.add(new SceneLinearisePolyligneAction((MdlSceneEditor) sceneEditor_)); - acts.add(new SceneOrganizePoint((MdlSceneEditor) sceneEditor_, "x")); - acts.add(new SceneOrganizePoint((MdlSceneEditor) sceneEditor_, "y")); + acts.add(new SceneOrganizePointAction((MdlSceneEditor) sceneEditor_, "x")); + acts.add(new SceneOrganizePointAction((MdlSceneEditor) sceneEditor_, "y")); acts.add(null); acts.add(new SceneAbscisseCurviligneAction(this)); acts.add(null); Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -44,6 +44,7 @@ import org.fudaa.fudaa.modeleur.action.MdlShow1DFrameAction; import org.fudaa.fudaa.modeleur.action.MdlShow2DFrameAction; import org.fudaa.fudaa.modeleur.modeleur1d.MdlFille1d; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.sig.FSigProjectPersistence; import org.fudaa.fudaa.sig.FSigResource; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -41,6 +41,7 @@ import org.fudaa.ebli.trace.TraceSurface; import org.fudaa.ebli.trace.TraceSurfaceModel; import org.fudaa.fudaa.commun.FudaaLib; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.FSigLib; import com.memoire.bu.BuBorderLayout; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -41,6 +41,7 @@ import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader; import org.fudaa.fudaa.modeleur.MdlImplementation.MdlFileFilter; import org.fudaa.fudaa.modeleur.MdlProjectImportTreeModel.LayerNode; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.FSigLib; import com.memoire.bu.BuInformationsSoftware; 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 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -36,6 +36,7 @@ import org.fudaa.ebli.trace.TraceLigneModel; import org.fudaa.ebli.trace.TraceSurface; import org.fudaa.ebli.trace.TraceSurfaceModel; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.FSigLib; import com.memoire.bu.BuLabel; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlRefinementPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlRefinementPanel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlRefinementPanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -14,6 +14,7 @@ import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.gui.CtuluDialogPanel; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuRadioButton; Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -1,39 +0,0 @@ -/** - * @creation 2002-09-25 - * @modification $Date: 2006/09/19 15:10:20 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.fudaa.modeleur; - -import com.memoire.bu.BuResource; - -import org.fudaa.fudaa.ressource.FudaaResource; - -/** - * Des ressources pour Fudaa-Modeleur, en particulier la traduction de langage. - * @version $Id: FSigResource.java,v 1.4 2006/09/19 15:10:20 deniger Exp $ - * @author Bertrand Marchand - */ -public final class MdlResource extends FudaaResource { - - public final static MdlResource MDL = new MdlResource(FudaaResource.FUDAA); - - private MdlResource(final BuResource _b) { - super(_b); - } - - public static String getS(final String _s) { - return MDL.getString(_s); - } - - public static String getS(final String _s, final String _v0) { - return MDL.getString(_s, _v0); - } - - public static String getS(final String _s, final String _v0, final String _v1) { - return MDL.getString(_s, _v0, _v1); - } - -} \ No newline at end of file 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 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlSceneEditor.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -51,6 +51,7 @@ import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.modeleur.layer.MdlModel2dLine; import org.fudaa.fudaa.modeleur.layer.MdlModel2dMultiPoint; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.CoordinateSequence; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/ZDialog.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/ZDialog.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/ZDialog.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -18,6 +18,7 @@ import javax.swing.JPanel; import org.fudaa.ctulu.gis.GISAttributeConstants; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuLabel; Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -1,61 +0,0 @@ -/* - * @creation 22 janv. 2009 - * @modification $Date:$ - * @license GNU General Public License 2 - * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail fud...@li... - */ -package org.fudaa.fudaa.modeleur.action; - -import java.awt.event.ActionEvent; - -import org.fudaa.ctulu.CtuluLib; -import org.fudaa.ebli.calque.ZSelectionEvent; -import org.fudaa.ebli.calque.ZSelectionListener; -import org.fudaa.ebli.commun.EbliActionSimple; -import org.fudaa.fudaa.commun.FudaaLib; -import org.fudaa.fudaa.modeleur.MdlSceneEditor; - -/** - * Allow to reorganize geometries with criterion. The criterions can be x or y. - * @author Emmanuel MARTIN - * @version $Id:$ - */ -public class SceneOrganizePoint extends EbliActionSimple implements ZSelectionListener { - - public static final String x="x"; - public static final String y="y"; - - /** The criterion used */ - protected String criterion_; - protected MdlSceneEditor sceneEditor_; - - /** - * @param _sceneEditor - * @param _criterion - * the criterion, can be x or y. Put directly the string "x" or - * SceneOrganizePoint.x. As you want. - */ - public SceneOrganizePoint(MdlSceneEditor _sceneEditor, String _criterion) { - super(FudaaLib.getS("R\xE9organisation sur ")+(_criterion==null?"":_criterion), null, "REORGANIZE_POLYLIGNE"); - sceneEditor_=_sceneEditor; - criterion_=_criterion; - if(sceneEditor_==null||criterion_==null) - throw new IllegalArgumentException(FudaaLib.getS("Les param\xE8tres ne doivent pas \xEAtre null")); - if(!criterion_.equals(x)&&!criterion_.equals(y)) - throw new IllegalArgumentException(FudaaLib.getS("Le crit\xE8re n'a pas \xE9t\xE9 reconnu.")); - sceneEditor_.getScene().addSelectionListener(this); - } - - public void selectionChanged(ZSelectionEvent _evt) { - setEnabled(!sceneEditor_.getScene().isSelectionEmpty()); - } - - public String getEnableCondition() { - return CtuluLib.getS("<p>S\xE9lectionner une ou plusieurs g\xE9om\xE9trie(s)."); - } - - public void actionPerformed(final ActionEvent _e) { - sceneEditor_.organizePoint(criterion_); - } -} Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePointAction.java (from rev 4514, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePoint.java) =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePointAction.java (rev 0) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneOrganizePointAction.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -0,0 +1,61 @@ +/* + * @creation 22 janv. 2009 + * @modification $Date:$ + * @license GNU General Public License 2 + * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail fud...@li... + */ +package org.fudaa.fudaa.modeleur.action; + +import java.awt.event.ActionEvent; + +import org.fudaa.ctulu.CtuluLib; +import org.fudaa.ebli.calque.ZSelectionEvent; +import org.fudaa.ebli.calque.ZSelectionListener; +import org.fudaa.ebli.commun.EbliActionSimple; +import org.fudaa.fudaa.commun.FudaaLib; +import org.fudaa.fudaa.modeleur.MdlSceneEditor; + +/** + * Allow to reorganize geometries with criterion. The criterions can be x or y. + * @author Emmanuel MARTIN + * @version $Id$ + */ +public class SceneOrganizePointAction extends EbliActionSimple implements ZSelectionListener { + + public static final String x="x"; + public static final String y="y"; + + /** The criterion used */ + protected String criterion_; + protected MdlSceneEditor sceneEditor_; + + /** + * @param _sceneEditor + * @param _criterion + * the criterion, can be x or y. Put directly the string "x" or + * SceneOrganizePoint.x. As you want. + */ + public SceneOrganizePointAction(MdlSceneEditor _sceneEditor, String _criterion) { + super(FudaaLib.getS("R\xE9organisation sur ")+(_criterion==null?"":_criterion), null, "REORGANIZE_POLYLIGNE"); + sceneEditor_=_sceneEditor; + criterion_=_criterion; + if(sceneEditor_==null||criterion_==null) + throw new IllegalArgumentException(FudaaLib.getS("Les param\xE8tres ne doivent pas \xEAtre null")); + if(!criterion_.equals(x)&&!criterion_.equals(y)) + throw new IllegalArgumentException(FudaaLib.getS("Le crit\xE8re n'a pas \xE9t\xE9 reconnu.")); + sceneEditor_.getScene().addSelectionListener(this); + } + + public void selectionChanged(ZSelectionEvent _evt) { + setEnabled(!sceneEditor_.getScene().isSelectionEmpty()); + } + + public String getEnableCondition() { + return CtuluLib.getS("<p>S\xE9lectionner une ou plusieurs g\xE9om\xE9trie(s)."); + } + + public void actionPerformed(final ActionEvent _e) { + sceneEditor_.organizePoint(criterion_); + } +} Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -1,74 +0,0 @@ -/* - * @creation 26 nov. 2008 - * @modification $Date$ - * @license GNU General Public License 2 - * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail fud...@li... - */ -package org.fudaa.fudaa.modeleur.action; - -import java.awt.event.ActionEvent; - -import org.fudaa.ctulu.CtuluLib; -import org.fudaa.ctulu.gis.GISAttributeConstants; -import org.fudaa.ctulu.gis.GISZoneCollection; -import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface; -import org.fudaa.ebli.calque.ZModeleGeometry; -import org.fudaa.ebli.calque.ZScene; -import org.fudaa.ebli.calque.ZSelectionEvent; -import org.fudaa.ebli.calque.ZSelectionListener; -import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper; -import org.fudaa.ebli.commun.EbliActionSimple; -import org.fudaa.fudaa.modeleur.MdlSceneEditor; -import org.fudaa.fudaa.ressource.FudaaResource; - -import com.memoire.bu.BuResource; - -/** - * Une action pour projeter une g\xE9om\xE9trie sur un ou des semis de points. - * @author Emmanuel MARTIN - */ -public class SceneProfilInterpolation extends EbliActionSimple implements ZSelectionListener { - MdlSceneEditor sceneEditor_; - - public SceneProfilInterpolation(MdlSceneEditor _sceneEditor) { - super(FudaaResource.FUDAA.getString("Cr\xE9er un profil depuis une trace"), null, "INTERPOLE_PROFIL"); - setDefaultToolTip(FudaaResource.FUDAA.getString("Cr\xE9e un profil par interpolation sur un nuage de points depuis une trace")); - sceneEditor_=_sceneEditor; - sceneEditor_.getScene().addSelectionListener(this); - } - - public void actionPerformed(final ActionEvent _e) { - sceneEditor_.interpolateProfile(); - } - - public void updateForSelectionChanged() { - ZScene scn=sceneEditor_.getScene(); - SceneSelectionHelper hlp=sceneEditor_.getScene().getSelectionHelper(); - boolean b=false; - // Si la selection est en mode globale et qu'une seule g\xE9om\xE9trie est selectionn\xE9e. - if(!scn.isAtomicMode()&&hlp.getUniqueSelectedIdx()!=-1){ - int idGeom=scn.sceneId2LayerId(hlp.getUniqueSelectedIdx()); - ZCalqueAffichageDonneesInterface calque=scn.getLayerForId(hlp.getUniqueSelectedIdx()); - // La nature de la g\xE9om\xE9trie est bien trace profil - if(calque.modeleDonnees() instanceof ZModeleGeometry){ - GISZoneCollection zone=((ZModeleGeometry) calque.modeleDonnees()).getGeomData(); - int iattNat=zone.getIndiceOf(GISAttributeConstants.NATURE); - if (iattNat!=-1) - b=zone.getValue(iattNat, idGeom).equals(GISAttributeConstants.ATT_NATURE_TP); - } - } - setEnabled(b); - } - - public String getEnableCondition() { - return CtuluLib.getS("S\xE9lectionner une trace de profil."); - } - - /* (non-Javadoc) - * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent) - */ - public void selectionChanged(ZSelectionEvent _evt) { - updateForSelectionChanged(); - } -} Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolationAction.java (from rev 4514, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolation.java) =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolationAction.java (rev 0) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/SceneProfilInterpolationAction.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -0,0 +1,74 @@ +/* + * @creation 26 nov. 2008 + * @modification $Date$ + * @license GNU General Public License 2 + * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail fud...@li... + */ +package org.fudaa.fudaa.modeleur.action; + +import java.awt.event.ActionEvent; + +import org.fudaa.ctulu.CtuluLib; +import org.fudaa.ctulu.gis.GISAttributeConstants; +import org.fudaa.ctulu.gis.GISZoneCollection; +import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface; +import org.fudaa.ebli.calque.ZModeleGeometry; +import org.fudaa.ebli.calque.ZScene; +import org.fudaa.ebli.calque.ZSelectionEvent; +import org.fudaa.ebli.calque.ZSelectionListener; +import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper; +import org.fudaa.ebli.commun.EbliActionSimple; +import org.fudaa.fudaa.modeleur.MdlSceneEditor; +import org.fudaa.fudaa.ressource.FudaaResource; + +import com.memoire.bu.BuResource; + +/** + * Une action pour projeter une g\xE9om\xE9trie sur un ou des semis de points. + * @author Emmanuel MARTIN + */ +public class SceneProfilInterpolationAction extends EbliActionSimple implements ZSelectionListener { + MdlSceneEditor sceneEditor_; + + public SceneProfilInterpolationAction(MdlSceneEditor _sceneEditor) { + super(FudaaResource.FUDAA.getString("Cr\xE9er un profil depuis une trace"), null, "INTERPOLE_PROFIL"); + setDefaultToolTip(FudaaResource.FUDAA.getString("Cr\xE9e un profil par interpolation sur un nuage de points depuis une trace")); + sceneEditor_=_sceneEditor; + sceneEditor_.getScene().addSelectionListener(this); + } + + public void actionPerformed(final ActionEvent _e) { + sceneEditor_.interpolateProfile(); + } + + public void updateForSelectionChanged() { + ZScene scn=sceneEditor_.getScene(); + SceneSelectionHelper hlp=sceneEditor_.getScene().getSelectionHelper(); + boolean b=false; + // Si la selection est en mode globale et qu'une seule g\xE9om\xE9trie est selectionn\xE9e. + if(!scn.isAtomicMode()&&hlp.getUniqueSelectedIdx()!=-1){ + int idGeom=scn.sceneId2LayerId(hlp.getUniqueSelectedIdx()); + ZCalqueAffichageDonneesInterface calque=scn.getLayerForId(hlp.getUniqueSelectedIdx()); + // La nature de la g\xE9om\xE9trie est bien trace profil + if(calque.modeleDonnees() instanceof ZModeleGeometry){ + GISZoneCollection zone=((ZModeleGeometry) calque.modeleDonnees()).getGeomData(); + int iattNat=zone.getIndiceOf(GISAttributeConstants.NATURE); + if (iattNat!=-1) + b=zone.getValue(iattNat, idGeom).equals(GISAttributeConstants.ATT_NATURE_TP); + } + } + setEnabled(b); + } + + public String getEnableCondition() { + return CtuluLib.getS("S\xE9lectionner une trace de profil."); + } + + /* (non-Javadoc) + * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent) + */ + public void selectionChanged(ZSelectionEvent _evt) { + updateForSelectionChanged(); + } +} Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dAxe.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -15,8 +15,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer1dAxePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dBank.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -14,8 +14,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dBankPersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dLimiteStockage.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -14,8 +14,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer1dLimiteStockageLinePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer1dTrace.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -15,8 +15,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer1dTracePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -20,9 +20,9 @@ import org.fudaa.ebli.commun.EbliActionInterface; import org.fudaa.ebli.trace.TraceIcon; import org.fudaa.ebli.trace.TraceIconModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dCloudPersistence; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dMultiPointPersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dConstraintLine.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -15,8 +15,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dConstraintLinePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dContour.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -17,8 +17,8 @@ import org.fudaa.ebli.trace.TraceIconModel; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dContourPersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dDirectionLine.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -15,8 +15,8 @@ import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dDirectionLinePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -19,8 +19,8 @@ import org.fudaa.ebli.find.EbliFindExpressionContainerInterface; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dLevelPersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; import org.nfunk.jep.Variable; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -18,10 +18,10 @@ import org.fudaa.ebli.commun.EbliActionInterface; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dLevelPersistence; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dLinePersistence; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dProfilePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; import org.fudaa.fudaa.sig.layer.FSigLayerLineEditable; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dZone.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -17,8 +17,8 @@ import org.fudaa.ebli.trace.TraceIconModel; import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.fudaa.modeleur.MdlResource; import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dZonePersistence; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.layer.FSigEditor; /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlModel2dLevel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -12,7 +12,7 @@ import org.fudaa.ctulu.gis.GISAttributeConstants; import org.fudaa.ctulu.gis.GISAttributeDouble; import org.fudaa.ebli.calque.ZModelGeometryListener; -import org.fudaa.fudaa.modeleur.MdlResource; +import org.fudaa.fudaa.modeleur.resource.MdlResource; /** * Un mod\xE8le de calque pour le calque 2D lignes de niveaux. Les lignes de niveau sont des lignes XY Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt 2009-03-06 14:58:09 UTC (rev 4515) @@ -1 +0,0 @@ -Fond de carte=Raster map \ No newline at end of file Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java 2009-03-05 20:31:20 UTC (rev 4514) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/ExportPanel.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -19,7 +19,7 @@ import org.fudaa.ctulu.gui.CtuluDialogPanel; import org.fudaa.ctulu.gui.CtuluFileChooserPanel; import org.fudaa.fudaa.commun.FudaaLib; -import org.fudaa.fudaa.modeleur.MdlResource; +import org.fudaa.fudaa.modeleur.resource.MdlResource; import org.fudaa.fudaa.sig.FSigLib; import com.memoire.bu.BuFileFilter; Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/MdlResource.java (from rev 4503, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlResource.java) =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/MdlResource.java (rev 0) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/MdlResource.java 2009-03-06 14:58:09 UTC (rev 4515) @@ -0,0 +1,39 @@ +/** + * @creation 2002-09-25 + * @modification $Date: 2006/09/19 15:10:20 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.fudaa.modeleur.resource; + +import com.memoire.bu.BuResource; + +import org.fudaa.fudaa.ressource.FudaaResource; + +/** + * Des ressources pour Fudaa-Modeleur, en particulier la traduction de langage. + * @version $Id: FSigResource.java,v 1.4 2006/09/19 15:10:20 deniger Exp $ + * @author Bertrand Marchand + */ +public final class MdlResource extends FudaaResource { + + public final static MdlResource MDL = new MdlResource(FudaaResource.FUDAA); + + private MdlResource(final BuResource _b) { + super(_b); + } + + public static String getS(final String _s) { + return MDL.getString(_s); + } + + public static String getS(final String _s, final String _v0) { + return MDL.getString(_s, _v0); + } + + public static String getS(final String _s, final String _v0, final String _v1) { + return MDL.getString(_s, _v0, _v1); + } + +} \ No newline at end of file Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt (from rev 4503, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/mdl_en.fr_txt) =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt (rev 0) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt 2009-03-06 14:58:09 UTC (rev 4515) @@ -0,0 +1 @@ +Fond de carte=Raster map \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |