Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4350] branches/Prepro-0.92-SNAPSHOT
|
From: <de...@us...> - 2009-01-13 20:42:51
|
Revision: 4350
http://fudaa.svn.sourceforge.net/fudaa/?rev=4350&view=rev
Author: deniger
Date: 2009-01-13 20:42:41 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
correction oubli de commit
@override est mal utilise
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/commun/EbliEditorArrow.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -264,13 +264,10 @@
return i;
}
- @Override
public Dimension getDefaultImageDimension() {
- // TODO Auto-generated method stub
return getSize();
}
- @Override
public BufferedImage produceImage(Map _params) {
final BufferedImage i = CtuluLibImage.createImage(getWidth(), getHeight(), _params);
final Graphics2D g2d = i.createGraphics();
@@ -379,15 +376,11 @@
repaint();
}
- @Override
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
}
- @Override
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
}
/**
@@ -400,7 +393,6 @@
* marqueur qui s'active dans le cas du drag and drop et qui marque le point initial ainsi que le point destination jusqu'au lacher.
*/
boolean marqueurDeplacement_=false;
- @Override
public void mousePressed(MouseEvent e) {
// TODO Auto-generated method stub
if(!ajout()){
@@ -415,7 +407,6 @@
}
- @Override
public void mouseReleased(MouseEvent e) {
// TODO Auto-generated method stub
if(!ajout() && positionPointToMove_!=-1){
@@ -428,8 +419,7 @@
}
}
- Point positionDeplacement_=null;
- @Override
+ Point positionDeplacement_;
public void mouseDragged(MouseEvent e) {
//System.out.println("Souris dragged: "+positionPointToMove_);
if(marqueurDeplacement_){
@@ -438,9 +428,7 @@
}
}
- @Override
public void mouseMoved(MouseEvent e) {
- // TODO Auto-generated method stub
System.out.println("Souris MOVED: "+positionPointToMove_);
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -7,6 +7,8 @@
*/
package org.fudaa.ebli.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluLibArray;
import org.fudaa.ctulu.CtuluListSelectionInterface;
@@ -219,6 +221,12 @@
return duplic;
}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
+
+ public void setPersistSpecificDatas(Object _data, Map _infos) {}
+
//@Override
//public String getUnite() {
// // TODO Auto-generated method stub
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -7,6 +7,8 @@
*/
package org.fudaa.ebli.courbe;
+import java.util.Map;
+
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.collection.CourbeInterface;
@@ -188,7 +190,14 @@
* @return
*/
EGModel duplicate();
+
+ /**
+ * @return
+ */
+ Object getPersistSpecificDatas();
+ void setPersistSpecificDatas(Object data, Map infos);
+
//String getUnite();
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetArrowEditor.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -17,109 +17,94 @@
import com.memoire.fu.FuLog;
-
-
/**
* Classe editeur de Fleche
+ *
* @author Adrien Hadoux
- *
*/
-public class EbliWidgetArrowEditor extends EbliWidget implements InplaceEditorProvider<EbliEditorArrow>{
+public class EbliWidgetArrowEditor extends EbliWidget implements InplaceEditorProvider<EbliEditorArrow> {
- public EbliEditorArrow editor_;
- BufferedImage imageFleche;
-
-
- public EbliWidgetArrowEditor(EbliScene scene,EbliEditorArrow editor) {
- super(scene, false);
- // TODO Auto-generated constructor stub
- editor_=editor;
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- // -- creation de l action pour editor --//
- //final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+ public EbliEditorArrow editor_;
+ BufferedImage imageFleche;
- // -- ajout de l action au widget correspondant --//
- // this.getActions().addAction(editorAction);
+ public EbliWidgetArrowEditor(EbliScene scene, EbliEditorArrow editor) {
+ super(scene, false);
+ // TODO Auto-generated constructor stub
+ editor_ = editor;
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ // -- creation de l action pour editor --//
+ // final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
- final EbliWidgetControllerFlecheEditor controller = new EbliWidgetControllerFlecheEditor(this);
- controller.setEditable(true);
- setController(controller);
-
- }
+ // -- ajout de l action au widget correspondant --//
+ // this.getActions().addAction(editorAction);
+ final EbliWidgetControllerFlecheEditor controller = new EbliWidgetControllerFlecheEditor(this);
+ controller.setEditable(true);
+ setController(controller);
- protected void paintWidget() {
- final Rectangle rec = getClientArea();
- final Graphics2D g = getGraphics();
- // g.translate(rec.x, rec.y);
- if (rec.width > 0 && rec.height > 0) {
+ }
+ protected void paintWidget() {
+ final Rectangle rec = getClientArea();
+ final Graphics2D g = getGraphics();
+ // g.translate(rec.x, rec.y);
+ if (rec.width > 0 && rec.height > 0) {
- // mode edition
- //if (imageFleche == null || imageFleche.getWidth() != (rec.width-1) || imageFleche.getHeight() != (rec.height-1)) {
- FuLog.debug("EWI: recreate image");
- final Map params = new HashMap();
- CtuluLibImage.setCompatibleImageAsked(params);
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- imageFleche = editor_.produceImage(rec.width - 1, rec.height - 1, params);
+ // mode edition
+ // if (imageFleche == null || imageFleche.getWidth() != (rec.width-1) || imageFleche.getHeight() !=
+ // (rec.height-1)) {
+ FuLog.debug("EWI: recreate image");
+ final Map params = new HashMap();
+ CtuluLibImage.setCompatibleImageAsked(params);
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ imageFleche = editor_.produceImage(rec.width - 1, rec.height - 1, params);
- //}
- g.drawImage(imageFleche, rec.x, rec.y, rec.width - 1, rec.height - 1, null);
- }
- }
-
-
- @Override
- public EbliEditorArrow createEditorComponent(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget) {
- //-- on met a jour le traceligne model --//
- editor_.model_=getTraceLigneModel();
- editor_.foreground_=getColorContour();
- final Rectangle rec = getClientArea();
- editor_.setSize(new Dimension(rec.width,rec.height));
- editor_.setPreferredSize(new Dimension(rec.width,rec.height));
-
- return editor_;
- }
+ // }
+ g.drawImage(imageFleche, rec.x, rec.y, rec.width - 1, rec.height - 1, null);
+ }
+ }
- @Override
- public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor) {
- // TODO Auto-generated method stub
- return null;
- }
+ public EbliEditorArrow createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget) {
+ // -- on met a jour le traceligne model --//
+ editor_.model_ = getTraceLigneModel();
+ editor_.foreground_ = getColorContour();
+ final Rectangle rec = getClientArea();
+ editor_.setSize(new Dimension(rec.width, rec.height));
+ editor_.setPreferredSize(new Dimension(rec.width, rec.height));
- @Override
- public Rectangle getInitialEditorComponentBounds(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor, Rectangle viewBounds) {
- // TODO Auto-generated method stub
- final Rectangle rec = convertLocalToScene(getClientArea());
- rec.width -= 1;
- rec.height -= 1;
- return rec;
- }
+ return editor_;
+ }
- @Override
- public void notifyClosing(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor, boolean commit) {
- // TODO Auto-generated method stub
- imageFleche =null;
- repaint();
- editingStop();
- }
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
+ EbliEditorArrow editor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public void notifyOpened(
- org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
- Widget widget, EbliEditorArrow editor) {
- // TODO Auto-generated method stub
- editingStart();
- }
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, Widget widget,
+ EbliEditorArrow editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ final Rectangle rec = convertLocalToScene(getClientArea());
+ rec.width -= 1;
+ rec.height -= 1;
+ return rec;
+ }
+ public void notifyClosing(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor, boolean commit) {
+ imageFleche = null;
+ repaint();
+ editingStop();
+ }
+
+ public void notifyOpened(org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, EbliEditorArrow editor) {
+ editingStart();
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -46,7 +46,8 @@
return false;
}
- public static void defaultFill(EvolutionReguliereInterface _e, InfoData _table, CtuluListSelectionInterface _selectedPt) {
+ public static void defaultFill(EvolutionReguliereInterface _e, InfoData _table,
+ CtuluListSelectionInterface _selectedPt) {
if (_e.isUsed()) {
_table.put(FudaaLib.getS("Courbe utilis\xE9e"), CtuluLibString.getString(_e.getUsed()) + CtuluLibString.ESPACE
+ CtuluLib.getS("fois"));
@@ -162,15 +163,11 @@
return new FudaaCourbeDefautModel(this.e_.getCopy(this.e_.getListener()));
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ }
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -42,10 +42,10 @@
/**
* ACHTUNG!!!; constructeur utilis\xE9 uniquement pour la persistance des donnees!!!
*/
- public FudaaCourbeTimeModel(){
-
+ public FudaaCourbeTimeModel() {
+
}
-
+
public void fillWithInfo(InfoData _table, CtuluListSelectionInterface _selectedPt) {}
protected void clearCache() {
@@ -92,9 +92,7 @@
}
public int getNbValues() {
- if (y_ == null) {
- return 0;
- }
+ if (y_ == null) { return 0; }
return time_.length;
}
@@ -207,29 +205,19 @@
public EGModel duplicate() {
FudaaCourbeTimeModel duplic = new FudaaCourbeTimeModel(this.time_);
- if (this.yRange_ != null)
- duplic.yRange_ = new CtuluRange(this.yRange_);
- if(this.nom_!=null)
- duplic.nom_ = nom_;
- if (this.y_ != null)
- duplic.y_ = CtuluLibArray.copy(y_);
-
-
+ if (this.yRange_ != null) duplic.yRange_ = new CtuluRange(this.yRange_);
+ if (this.nom_ != null) duplic.nom_ = nom_;
+ if (this.y_ != null) duplic.y_ = CtuluLibArray.copy(y_);
+
return duplic;
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
-
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MVProfileCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -62,8 +62,7 @@
title_ = _variable.toString();
time_ = _timeStep;
builder_ = _builder;
- if(builder_!=null)
- res_ = builder_.createResults(_timeStep, _prog);
+ if (builder_ != null) res_ = builder_.createResults(_timeStep, _prog);
y_ = new TDoubleArrayList(res_.getNbIntersect());
computeY(_prog);
}
@@ -242,16 +241,12 @@
}
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileCoordinatesModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -190,16 +190,12 @@
return duplic;
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -246,16 +246,12 @@
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+ }
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 19:16:54 UTC (rev 4349)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2009-01-13 20:42:41 UTC (rev 4350)
@@ -168,15 +168,11 @@
return new TrTelemacWeirCourbeModel(this.i_, this.mng_, this.cote_, CtuluLibArray.copy(this.x_));
}
-@Override
-public Object getPersistSpecificDatas() {
- // TODO Auto-generated method stub
- return null;
-}
+ public Object getPersistSpecificDatas() {
+ return null;
+ }
-@Override
-public void setPersistSpecificDatas(Object data, Map infos) {
- // TODO Auto-generated method stub
-
-}
+ public void setPersistSpecificDatas(Object data, Map infos) {
+
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
