January 2010 - Isis-fish-commits - mailman.cloud.codelutin.com

r2956 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 10:18:21 +0000 (Thu, 28 Jan 2010) New Revision: 2956 Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java Log: Remove deprecated class Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java 2010-01-28 10:17:53 UTC (rev 2955) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/VCSConnectionState.java 2010-01-28 10:18:21 UTC (rev 2956) @@ -1,55 +0,0 @@ -/* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget; - -import fr.ifremer.isisfish.IsisFish; -import javax.swing.Icon; -import javax.swing.JLabel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Resource; - -/** - * VCSConnectionState. - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - * - * @deprecated since 20090414 (unused) - */ -public class VCSConnectionState extends JLabel { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(VCSConnectionState.class); - - public VCSConnectionState() { - Icon icon; - boolean connected = IsisFish.vcs.isConnected(); - if (connected) { - icon = Resource.getIcon("images/stock_connect.png"); - } else { - icon = Resource.getIcon("images/stock_disconnect.png"); - } - setIcon(icon); - } - -}

1 0

r2955 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/ui/widget test/java/fr/ifremer/isisfish/ui/widget
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 10:17:53 +0000 (Thu, 28 Jan 2010) New Revision: 2955 Added: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/FormInterval.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java Log: Update interval panel code, move main() to unit test Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/FormInterval.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2010-01-28 09:48:10 UTC (rev 2954) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -1,48 +0,0 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget; - -import java.awt.Frame; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -/** - * FormInterval. - */ -public class FormInterval extends Frame { - - /** serialVersionUID. */ - private static final long serialVersionUID = 4911081593147906648L; - - class QuitListener extends WindowAdapter { - public void windowClosing(WindowEvent e) { - e.getWindow().dispose(); - } - } - - public FormInterval(Interval i) { - IntervalPanel ip = new IntervalPanel(); - this.add(ip); - // ip.setEnabled(false); - ip.setModel(i); - - this.addWindowListener(new QuitListener()); - pack(); - } -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2010-01-28 09:48:10 UTC (rev 2954) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -1,5 +1,5 @@ /* ##%% - * Copyright (C) 2002 - 2009 Code Lutin + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -69,7 +69,9 @@ } /** - * Retourne le nombre minimal que peut prendre comme valeur cette interval + * Retourne le nombre minimal que peut prendre comme valeur cette interval. + * + * @return interval minimal value */ public int getMin() { return min; @@ -84,7 +86,9 @@ } /** - * Retourne le nombre maximal que peut prendre comme valeur cette interval + * Retourne le nombre maximal que peut prendre comme valeur cette interval. + * + * @return interval maximal value */ public int getMax() { return max; @@ -202,9 +206,10 @@ } /** - * retourne une chaine XML qui represente l'objet. + * Retourne une chaine XML qui represente l'objet. * * @deprecated since 20090414 (unused) + * @return interval representation as xml */ public String toXML() { return "<Interval min=\"" + getMin() + "\" max=\"" + getMax() @@ -213,27 +218,9 @@ } /** - * Retourne une representation string de la valeur donne. - * - * @deprecated since 20090414 (unused) - */ - public String getString(int entier) { - return String.valueOf(entier); - } - - /** - * Retourne une representation entiere de la valeur String donne - * - * @deprecated since 20090414 (unused) - */ - public int getString(String ch) { - return Integer.parseInt(ch); - } - - /** * @return une iteration */ - public Iterator iterator() { + public Iterator<Integer> iterator() { return new IntervalIterator(getMin(), getMax(), getFirst(), getLast()); } @@ -262,8 +249,8 @@ return result; } - public static class IntervalIterator implements Iterator { - private int min; + public static class IntervalIterator implements Iterator<Integer> { + //private int min; private int max; @@ -274,7 +261,7 @@ private int current; public IntervalIterator(int min, int max, int first, int last) { - this.min = min; + //this.min = min; this.max = max; this.first = first; this.last = last; @@ -291,7 +278,7 @@ return (current++) % (max + 1); } - public Object next() { + public Integer next() { return new Integer(nextInt()); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2010-01-28 09:48:10 UTC (rev 2954) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -1,5 +1,5 @@ /* ##%% - * Copyright (C) 2002 - 2009 Code Lutin + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,7 +45,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -6795996897731533693L; - + /* some constants. */ private static final int HANDLE_WITH = 5; private static final Cursor DEFAULT_CURSOR = new Cursor(Cursor.DEFAULT_CURSOR); @@ -54,117 +54,118 @@ private static final Cursor MOVE_CURSOR = new Cursor(Cursor.MOVE_CURSOR); /* Colors. */ - private Color backColor = Color.blue; - private Color foreColor = Color.yellow; - private Color lineColor = Color.yellow.darker(); + private Color backColor = Color.BLUE; + private Color foreColor = Color.YELLOW; + private Color lineColor = Color.YELLOW.darker(); protected Interval model; /** - * rapport entre le model et la vu + * Rapport entre le model et la vue. */ protected float coef; /** - * decalage de la position de la souris lors d'un drag par rapport - * a la position de l'element 1 + * Decalage de la position de la souris lors d'un drag par rapport + * à la position de l'element 1. */ protected float delta; //tous pour changer la selection avec la souris private boolean inDrag = false; private int cursorType = 1; - private Cursor mouseCursor; + //private Cursor mouseCursor; - //si vrai le composant est editable private boolean enable = true; class MouseClick extends MouseAdapter { - public void mouseEntered( MouseEvent e) { + /*public void mouseEntered( MouseEvent e) { mouseCursor = getCursor(); - } - public void mousePressed( MouseEvent e) { + }*/ + public void mousePressed(MouseEvent e) { int mouseX = e.getX(); - if(model.getFirst() <= model.getLast()) { - inDrag = (model.getFirst()*coef - HANDLE_WITH < mouseX) && - (mouseX < (model.getLast()+1)*coef + HANDLE_WITH); + if (model.getFirst() <= model.getLast()) { + inDrag = (model.getFirst() * coef - HANDLE_WITH < mouseX) + && (mouseX < (model.getLast() + 1) * coef + HANDLE_WITH); + } else if (model.getFirst() > model.getLast()) { + inDrag = ((0 <= mouseX) && (mouseX < (model.getLast() + 1) + * coef + HANDLE_WITH)) + || ((model.getFirst() * coef - HANDLE_WITH < mouseX) && (mouseX <= getSize().width)); } - else if(model.getFirst() > model.getLast()) { - inDrag = - ((0 <= mouseX) && - (mouseX < (model.getLast()+1)*coef + HANDLE_WITH)) - || - ((model.getFirst()*coef - HANDLE_WITH < mouseX) && - (mouseX <= getSize().width)); + if (inDrag) { + delta = mouseX - (model.getFirst() * coef); } - if(inDrag) { - delta = mouseX - (model.getFirst()*coef); - } } - public void mouseReleased( MouseEvent e) { + public void mouseReleased(MouseEvent e) { inDrag = false; } } class MouseMove extends MouseMotionAdapter { - public void mouseMoved( MouseEvent e ) { + public void mouseMoved(MouseEvent e) { if (!inDrag && enable) { int x = e.getX(); //on determine sur quel section on est - if((model.getFirst()*coef - HANDLE_WITH < x ) && - (x < model.getFirst()*coef + HANDLE_WITH)) { - cursorType = 0; - setCursor(W_RESIZE_CURSOR); - }else if(((model.getLast()+1)*coef - HANDLE_WITH <x ) && - (x < (model.getLast()+1)*coef + HANDLE_WITH)) { - cursorType = 2; - setCursor(E_RESIZE_CURSOR); - delta = x - (model.getLast()*coef); + if ((model.getFirst() * coef - HANDLE_WITH < x) + && (x < model.getFirst() * coef + HANDLE_WITH)) { + cursorType = 0; + setCursor(W_RESIZE_CURSOR); + } else if (((model.getLast() + 1) * coef - HANDLE_WITH < x) + && (x < (model.getLast() + 1) * coef + HANDLE_WITH)) { + cursorType = 2; + setCursor(E_RESIZE_CURSOR); + delta = x - (model.getLast() * coef); + } else { + boolean bool = ((model.getFirst() <= model.getLast()) + && (model.getFirst() * coef + HANDLE_WITH < x) && (x < (model + .getLast() + 1) + * coef - HANDLE_WITH)) + || ((model.getFirst() > model.getLast()) && (((0 <= x) && (x < (model + .getLast() + 1) + * coef - HANDLE_WITH)) || ((model + .getFirst() + * coef + HANDLE_WITH < x) && (x <= getSize().width)))); + + if (bool) { + cursorType = 1; + setCursor(MOVE_CURSOR); } else { - boolean bool = - ((model.getFirst() <= model.getLast()) && - (model.getFirst()*coef + HANDLE_WITH < x) && - (x < (model.getLast()+1)*coef - HANDLE_WITH)) - || - ((model.getFirst() > model.getLast()) && - (((0 <= x) && - (x < (model.getLast()+1)*coef - HANDLE_WITH)) - || - ((model.getFirst()*coef + HANDLE_WITH < x) && - (x <= getSize().width)))); - - if (bool) { - cursorType = 1; - setCursor(MOVE_CURSOR); - } - else { - cursorType = 4; - setCursor(DEFAULT_CURSOR); - } + cursorType = 4; + setCursor(DEFAULT_CURSOR); } + } } } - public void mouseDragged( MouseEvent e ){ - if (inDrag && enable){ - int x=e.getX(); - switch (cursorType){ - case 0: //on tire par le debut - if (x < 0) x = 0; - if (x > getSize().width) x = getSize().width; + public void mouseDragged(MouseEvent e) { + if (inDrag && enable) { + int x = e.getX(); + switch (cursorType) { + case 0: //on tire par le debut + if (x < 0) { + x = 0; + } + if (x > getSize().width) { + x = getSize().width; + } model.setFirst(Math.round(x / coef)); break; - case 1: //on deplace - int decal = Math.round((x-delta)/coef) - model.getFirst(); + case 1: //on deplace + int decal = Math.round((x - delta) / coef) + - model.getFirst(); model.move(decal); break; - case 2: //on tire par la fin - if (x < 0) x = 0; - if (x > getSize().width) x = getSize().width; - model.setLast(Math.round((x-coef) / coef)); + case 2: //on tire par la fin + if (x < 0) { + x = 0; + } + if (x > getSize().width) { + x = getSize().width; + } + model.setLast(Math.round((x - coef) / coef)); break; } } @@ -172,17 +173,19 @@ } /** - * Constructeur - */ - public IntervalGraphic(Interval m){ + * Constructor with interval value. + * + * @param m interval + */ + public IntervalGraphic(Interval m) { super(); setModel(m); addMouseListener(new MouseClick()); addMouseMotionListener(new MouseMove()); } - public void setModel(Interval m){ - if(this.model != null) { + public void setModel(Interval m) { + if (this.model != null) { this.model.deleteObserver(this); } this.model = m; @@ -190,15 +193,15 @@ update(this.model, null); } - public void setEnabled(boolean enable){ + public void setEnabled(boolean enable) { this.enable = enable; } /** - * Dessine sur le graphique l'interval courant - */ - protected void redraw( Graphics g ) { - coef = (float)getSize().width / (float)(model.getMax()+1); + * Dessine sur le graphique l'interval courant. + */ + protected void redraw(Graphics g) { + coef = (float) getSize().width / (float) (model.getMax() + 1); int width = getSize().width; int height = getSize().height; @@ -208,46 +211,43 @@ //peindre le fond tmpg.setColor(backColor); - tmpg.fillRect(0 , 0, width, height); + tmpg.fillRect(0, 0, width, height); //peindre la section tmpg.setColor(foreColor); - for (Interval.IntervalIterator i=(Interval.IntervalIterator)model.iterator();i.hasNext();){ + for (Interval.IntervalIterator i = (Interval.IntervalIterator) model + .iterator(); i.hasNext();) { int val = i.nextInt(); tmpg.setColor(foreColor); - tmpg.fillRect(Math.round(val*coef) , 0, - Math.round(coef) , height); + tmpg.fillRect(Math.round(val * coef), 0, Math.round(coef), height); tmpg.setColor(lineColor); - tmpg.drawRect(Math.round(val*coef) , 0, - Math.round(coef) , height); + tmpg.drawRect(Math.round(val * coef), 0, Math.round(coef), height); } g.drawImage(ImageBuffer, 0, 0, getSize().width, getSize().height, - new ImageObserver(){ - public boolean imageUpdate( Image img, int infoflags, - int x, int y, - int width, int height ){ - return true; - } - }); + new ImageObserver() { + public boolean imageUpdate(Image img, int infoflags, int x, + int y, int width, int height) { + return true; + } + }); } - /** - */ - public void paint( Graphics g ){ + @Override + public void paint(Graphics g) { redraw(g); } - /** - */ - public void update( Graphics g ){ + @Override + public void update(Graphics g) { redraw(g); } /** - * Call by observable object - */ - public void update(Observable o, Object arg){ + * Called by observable object. + */ + @Override + public void update(Observable o, Object arg) { repaint(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2010-01-28 09:48:10 UTC (rev 2954) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -1,5 +1,5 @@ /* ##%% - * Copyright (C) 2002 - 2009 Code Lutin + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -33,7 +33,7 @@ * Mise a jour: $Date: 2009-03-09 15:40:20 +0100 (lun. 09 mars 2009) $ * par : $Author: sletellier $ */ -class IntervalLabel extends JLabel implements Observer { +public class IntervalLabel extends JLabel implements Observer { /** serialVersionUID. */ private static final long serialVersionUID = -6269941008930677478L; @@ -59,6 +59,7 @@ this.renderArray = renderArray; } + @Override public void update(Observable o, Object arg) { setText(toString(model.getFirst()) + " - " + toString(model.getLast())); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2010-01-28 09:48:10 UTC (rev 2954) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -1,5 +1,5 @@ -/* ##%% - * Copyright (C) 2002, 2003 Code Lutin +/* *##% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + *##%*/ package fr.ifremer.isisfish.ui.widget; @@ -39,15 +39,10 @@ /** serialVersionUID. */ private static final long serialVersionUID = 4245022583233407638L; + private final static int DEFAULT_WIDTH = 110; private final static int DEFAULT_HEIGHT = 50; - public static void main(String args[]) { - Interval i = new Interval(0, 11); - FormInterval f = new FormInterval(i); - f.setVisible(true); - } - private Interval model = null; private IntervalGraphic graph; private IntervalLabel label; Copied: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java (from rev 2946, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/FormInterval.java) =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -0,0 +1,51 @@ +/* *##% + * Copyright (C) 2002 - 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.widget; + +import java.awt.Frame; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +import fr.ifremer.isisfish.ui.widget.Interval; +import fr.ifremer.isisfish.ui.widget.IntervalPanel; + +/** + * FormInterval. + */ +public class FormInterval extends Frame { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4911081593147906648L; + + class QuitListener extends WindowAdapter { + public void windowClosing(WindowEvent e) { + e.getWindow().dispose(); + } + } + + public FormInterval(Interval i) { + IntervalPanel ip = new IntervalPanel(); + this.add(ip); + // ip.setEnabled(false); + ip.setModel(i); + + this.addWindowListener(new QuitListener()); + pack(); + } +} Added: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java 2010-01-28 10:17:53 UTC (rev 2955) @@ -0,0 +1,68 @@ +/* *##% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.widget; + +import javax.swing.SwingUtilities; + +import org.junit.Test; + +/** + * Test class for {@link IntervalPanel}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IntervalPanelTest { + + /** + * Test to display a frame with interval panel. + * + * @throws InterruptedException + */ + @Test + public void testIntervalPanelDisplay() throws InterruptedException { + Interval i = new Interval(0, 11); + final FormInterval f = new FormInterval(i); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + f.setVisible(true); + } + }); + + Thread t = new Thread(new Runnable() { + public void run() { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // do nothing + } + f.dispose(); + } + }); + t.start(); + + // it would really be nice to wait the thread, otherwise the test + // means nothing!!! + t.join(); + } +} Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2954 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 09:48:10 +0000 (Thu, 28 Jan 2010) New Revision: 2954 Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Log: Add rule domain Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2010-01-28 09:48:10 UTC (rev 2954) @@ -0,0 +1,43 @@ +/* *##% + * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import java.io.Serializable; +import java.util.Collection; + +import fr.ifremer.isisfish.rule.Rule; + +/** + * Factor domain for {@link Rule}s. + * + * @param <F> type des labels + * + * @author chatellier + * @version $Revision$ + * @since 3.3.0.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class RuleDomain<F extends Serializable> extends DiscreteDomain<Collection<Rule>, F> { + + /** serialVersionUID. */ + private static final long serialVersionUID = -5611785362638191719L; + +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2010-01-28 09:47:57 UTC (rev 2953) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2010-01-28 09:48:10 UTC (rev 2954) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer - Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,17 +18,24 @@ package fr.ifremer.isisfish.simulator.sensitivity; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixND; -import org.junit.Assert; -import org.junit.Test; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.rule.RuleMock; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; /** * Factors test. @@ -304,4 +311,37 @@ log.info("factor#toString() = " + factor); } } + + /** + * Test factor with matrix. + * + * @see MatrixND + */ + @Test + public void testRuleFactor() { + + // available rules + Rule ruleA = new RuleMock("hour restriction"); + Rule ruleB = new RuleMock("zone restriction"); + Rule ruleC = new RuleMock("ship number restriction"); + + // rules set + Collection<Rule> rules1 = new ArrayList<Rule>(); // 0 rule + Collection<Rule> rules2 = new ArrayList<Rule>(); // 1 rule + rules2.add(ruleA); + Collection<Rule> rules3 = new ArrayList<Rule>(); // 3 rule + rules3.add(ruleA); + rules3.add(ruleB); + rules3.add(ruleC); + + // factor and domain definition + Factor<Collection<Rule>, String> factor = new Factor<Collection<Rule>, String>("testrule"); + RuleDomain<String> ruleDomain = new RuleDomain<String>(); + ruleDomain.getValues().put("rules1", rules1); + ruleDomain.getValues().put("rules2", rules2); + ruleDomain.getValues().put("rules3", rules3); + factor.setDomain(ruleDomain); + + // TODO post r operation, and some asserts + } }

1 0

r2953 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: mexico/xml simulator/sensitivity simulator/sensitivity/domain simulator/sensitivity/visitor
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 09:47:57 +0000 (Thu, 28 Jan 2010) New Revision: 2953 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java Log: Domain values are no serializable anymore (only keys) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,7 +52,7 @@ * {@inheritDoc} */ @Override - public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, + public <E, F extends Serializable> void visit(Domain<E,F> domain, F label, E value) { } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Ifremer, Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -53,7 +53,7 @@ * {@inheritDoc} */ @Override - public <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, + public <E, F extends Serializable> void visit(Domain<E,F> domain, F label, E value) { xmlBuffer.append("<value>" + value + "</value>"); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,8 +25,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; /** - * Design plan contenant toutes les - * valeur de facteur possible. + * Design plan contenant toutes les valeurs de facteurs possible. * * @author chatellier * @version $Revision: 1.0 $ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -46,7 +46,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public interface Domain<E extends Serializable, F extends Serializable> extends Serializable { +public interface Domain<E, F extends Serializable> extends Serializable { /** * Return value associated to identifier. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,7 +38,7 @@ * * Last update : $Date: 19 févr. 2009 $ By : $Author: chatellier $ */ -public class Factor<E extends Serializable, F extends Serializable> implements Serializable, Cloneable { +public class Factor<E, F extends Serializable> implements Serializable, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 1643804268013964453L; @@ -59,8 +59,11 @@ * Ensemble des valeurs possibles a prendre en compte. La clé est un label * qui permet d'identifier la valeur. * - * Le domain peut etre : - discret : i.e un ensemble de valeurs - continu : - * i.e, une borne min, max + * Le domain peut etre : + * <ul> + * <li>discret : i.e un ensemble de valeurs</li> + * <li>continu : i.e, une borne min, max</li> + * </ul> * * @see ContinuousDomain * @see DiscreteDomain Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.Map; import fr.ifremer.isisfish.simulator.sensitivity.visitor.ScenarioVisitor; @@ -63,8 +62,7 @@ */ public boolean addFactor(Factor factor) { - Factor factorCopy = (Factor) factor - .clone(); + Factor factorCopy = (Factor) factor.clone(); boolean success = factors.add(factorCopy); return success; @@ -87,7 +85,7 @@ public void setFactors(List<Factor> factors) { this.factors = factors; } - + /** * Accept a new visitor. * @@ -95,7 +93,7 @@ */ public void accept(ScenarioVisitor visitor) { visitor.start(this); - for(Factor factor : factors) { + for (Factor factor : factors) { visitor.visit(this, factor); } visitor.end(this); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ /** * Domaine continu. * - * Composé d'un borne min et max. + * Composé d'une borne min et max et d'une cardinalité. * * @param <E> type des valeurs gérées par le domaine * @param <F> type des labels @@ -37,7 +37,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class ContinuousDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> { +public class ContinuousDomain<E, F extends Serializable> implements Domain<E, F> { /** serialVersionUID. */ private static final long serialVersionUID = -2037768174807839046L; @@ -136,7 +136,8 @@ this.cardinality = cardinality; } - public ContinuousDomain<E,F> clone(){ + @Override + public ContinuousDomain<E,F> clone() { ContinuousDomain<E,F> cloned = new ContinuousDomain<E,F>(); cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -40,7 +40,7 @@ * Last update : $Date: 24 févr. 2009 $ * By : $Author: chatellier $ */ -public class DiscreteDomain<E extends Serializable, F extends Serializable> implements Domain<E,F> { +public class DiscreteDomain<E, F extends Serializable> implements Domain<E, F> { /** serialVersionUID. */ private static final long serialVersionUID = -192647757737396585L; @@ -48,10 +48,10 @@ /** * Value for this domain. * - * Each "E" values is identified by a Serializable identifier. + * Each "E" values is identified by a {@link Serializable} identifier. */ protected SortedMap<F, E> values; - + /** * Constructor. */ @@ -82,15 +82,17 @@ * * @throws IllegalArgumentException if identifier is not a valid key */ - public E getValueForIdentifier(F identifier) throws IllegalArgumentException{ - - if( values == null || !values.containsKey(identifier)) { - throw new IllegalArgumentException("Can't get value for identifier " + identifier); + public E getValueForIdentifier(F identifier) + throws IllegalArgumentException { + + if (values == null || !values.containsKey(identifier)) { + throw new IllegalArgumentException( + "Can't get value for identifier " + identifier); } - + return values.get(identifier); } - + /** * Accept a new visitor. * @@ -98,16 +100,16 @@ */ public void accept(DomainVisitor visitor) { visitor.start(this); - for(Map.Entry<F, E> value : values.entrySet()) { + for (Map.Entry<F, E> value : values.entrySet()) { visitor.visit(this, value.getKey(), value.getValue()); } visitor.end(this); } - - public DiscreteDomain<E,F> clone(){ - DiscreteDomain<E,F> cloned = new DiscreteDomain<E,F>(); + + @Override + public DiscreteDomain<E, F> clone() { + DiscreteDomain<E, F> cloned = new DiscreteDomain<E, F>(); cloned.setValues(this.values); return cloned; - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; - import org.nuiton.math.matrix.MapFunction; import org.nuiton.math.matrix.MatrixND; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,6 @@ package fr.ifremer.isisfish.simulator.sensitivity.visitor; -import java.io.Serializable; - import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -47,7 +45,7 @@ * @param designPlan design plan * @param factor factor */ - void visit(DesignPlan designPlan, Factor factor); + void visit(DesignPlan designPlan, Factor<?, ?> factor); /** * End. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,22 +38,24 @@ * * @param domain domain */ - void start(Domain<? extends Serializable, ? extends Serializable> domain); + void start(Domain<?, ?> domain); /** * Visit domain value or property. * * @param <E> domain element type + * @param <F> label element type + * * @param domain domain * @param label value label or property name * @param value value */ - <E extends Serializable, F extends Serializable> void visit(Domain<E,F> domain, F label, E value); + <E, F extends Serializable> void visit(Domain<E, F> domain, F label, E value); /** * End. * * @param domain domain */ - void end(Domain<? extends Serializable, ? extends Serializable> domain); + void end(Domain<?, ?> domain); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-01-28 09:36:58 UTC (rev 2952) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2010-01-28 09:47:57 UTC (rev 2953) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -39,7 +39,7 @@ * * @param factor factor */ - void start(Factor factor); + void start(Factor<?, ?> factor); /** * Visit domain. @@ -47,7 +47,7 @@ * @param factor factor * @param domain domain */ - void visit(Factor factor, Domain domain); + <E, F extends Serializable> void visit(Factor<E, F> factor, Domain<E, F> domain); /** * End.

1 0

r2952 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 09:36:58 +0000 (Thu, 28 Jan 2010) New Revision: 2952 Modified: isis-fish/branches/3.3.1/pom.xml Log: Modify version Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2010-01-28 09:35:08 UTC (rev 2951) +++ isis-fish/branches/3.3.1/pom.xml 2010-01-28 09:36:58 UTC (rev 2952) @@ -11,7 +11,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.0-rc1-SNAPSHOT</version> + <version>3.3.1.0-SNAPSHOT</version>  <dependencies>

1 0

r2951 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule
by chatellier＠users.labs.libre-entreprise.org 28 Jan '10

28 Jan '10

Author: chatellier Date: 2010-01-28 09:35:08 +0000 (Thu, 28 Jan 2010) New Revision: 2951 Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java Log: Return description in getDescription() Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2010-01-27 16:08:10 UTC (rev 2950) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2010-01-28 09:35:08 UTC (rev 2951) @@ -52,7 +52,7 @@ */ @Override public String getDescription() throws Exception { - return null; + return description; } /*

1 0

r2950 - in isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish: . rule
by chatellier＠users.labs.libre-entreprise.org 27 Jan '10

27 Jan '10

Author: chatellier Date: 2010-01-27 16:08:10 +0000 (Wed, 27 Jan 2010) New Revision: 2950 Added: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java Log: Add a basic rule implementation (for test). Added: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2010-01-27 16:08:10 UTC (rev 2950) @@ -0,0 +1,93 @@ +/* *##% + * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.rule; + +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Date; + +/** + * A basic rule implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class RuleMock extends AbstractRule { + + public String description; + + public RuleMock(String description) { + this.description = description; + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#getNecessaryResult() + */ + @Override + public String[] getNecessaryResult() { + return null; + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#getDescription() + */ + @Override + public String getDescription() throws Exception { + return null; + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#init(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void init(SimulationContext context) throws Exception { + + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#condition(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, fr.ifremer.isisfish.entities.Metier) + */ + @Override + public boolean condition(SimulationContext context, Date date, Metier metier) + throws Exception { + return false; + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#preAction(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, fr.ifremer.isisfish.entities.Metier) + */ + @Override + public void preAction(SimulationContext context, Date date, Metier metier) + throws Exception { + // TODO Auto-generated method stub + + } + + /* + * @see fr.ifremer.isisfish.rule.Rule#postAction(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.Date, fr.ifremer.isisfish.entities.Metier) + */ + @Override + public void postAction(SimulationContext context, Date date, Metier metier) + throws Exception { + + } +} Property changes on: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2949 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 Jan '10

27 Jan '10

Author: chatellier Date: 2010-01-27 10:14:03 +0000 (Wed, 27 Jan 2010) New Revision: 2949 Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Result copy is not done anymore. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-26 21:09:50 UTC (rev 2948) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-27 10:14:03 UTC (rev 2949) @@ -462,11 +462,9 @@ // if not finished, re-add it at end if (jobIsFinished) { - if (log.isInfoEnabled()) { log.info("Job " + job.getId() + " finished"); } - doPostSimulationOperation(job, launcher); } @@ -538,7 +536,6 @@ else { // cas d'une simulation arretee par exception - File informationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); SimulationInformation information = new SimulationInformation(informationFile); if (StringUtils.isNotEmpty(information.getException())) { @@ -559,8 +556,11 @@ /** * Operation to do after simulation end. * - * - get simulation result - * - do result export + * <ul> + * <li>get simulation result</li> + * <li>do registred post actions</li> + * <li>do sensitivity analisys second pass</li> + * </ul> * * @param job job * @param launcher {@link SimulatorLauncher} that manage simulation @@ -590,8 +590,6 @@ // on ne fait de post traitement que si // la simulation n'a pas été arretée if (!control.isStopSimulationRequest()) { - // post manage this storage - boolean simulationAvailble = true; //exportResult(job, simulation); // do posts actions for (PostAction action : job.getPostActions()) { @@ -607,9 +605,8 @@ // sensitivity calculator analyze result call // can't do analyze second pass if simulation // has been deleted - if (simulationAvailble) { - analyzeSensitivityResult(job, simulation); - } + // simulation can't be deleted anymore + analyzeSensitivityResult(job, simulation); } // notify simulation ended

1 0

r2948 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 21:09:50 +0000 (Tue, 26 Jan 2010) New Revision: 2948 Modified: isis-fish/trunk/pom.xml Log: Utilisation mavenpom4labs 2.0.4 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-26 15:56:28 UTC (rev 2947) +++ isis-fish/trunk/pom.xml 2010-01-26 21:09:50 UTC (rev 2948) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <groupId>ifremer</groupId>

1 0

r2947 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 26 Jan '10

26 Jan '10

Author: chatellier Date: 2010-01-26 15:56:28 +0000 (Tue, 26 Jan 2010) New Revision: 2947 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java Log: Fix regex to parse entity sematics ids Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-26 09:16:27 UTC (rev 2946) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-26 15:56:28 UTC (rev 2947) @@ -344,7 +344,7 @@ if (content != null) { content = content.trim(); - Pattern matrixPattern = Pattern.compile("^(.*)\$(.*\$)$"); + Pattern matrixPattern = Pattern.compile("^(.*)\$(.*)\$$"); Matcher matcher = matrixPattern.matcher(content); if (matcher.find()) {

1 0