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

r3249 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier
by chatellier＠users.labs.libre-entreprise.org April 15, 2011

April 15, 2011

Author: chatellier Date: 2011-04-15 16:06:19 +0000 (Fri, 15 Apr 2011) New Revision: 3249 Log: Remove super call Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java 2011-04-15 16:06:03 UTC (rev 3248) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java 2011-04-15 16:06:19 UTC (rev 3249) @@ -56,7 +56,6 @@ * @param metierSeasonInfo species list */ public MetierSeasonInfoComboModel(List<MetierSeasonInfo> metierSeasonInfo) { - super(); this.metierSeasonInfo = metierSeasonInfo; }

1 0

r3248 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate
by chatellier＠users.labs.libre-entreprise.org April 15, 2011

April 15, 2011

Author: chatellier Date: 2011-04-15 16:06:03 +0000 (Fri, 15 Apr 2011) New Revision: 3248 Log: Remove deprecated stuff Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-04-15 16:05:13 UTC (rev 3247) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-04-15 16:06:03 UTC (rev 3248) @@ -362,7 +362,7 @@ switch (property) { case 0 : return matrix.getName(); case 1 : return matrix.getDim(); - case 2 : return matrix.getDimensionName(); + case 2 : return matrix.getDimensionNames(); case 3 : return matrix.getSemantics(); case 4 : return matrix.toList(); default : throw new HibernateException("Property index invalid : " + property); @@ -374,11 +374,11 @@ switch (property) { case 0 : matrix.setName((String)value); break; case 1 : throw new HibernateException("Modification of the dimension forbidden"); - case 2 : matrix.setDimensionName((String[])value); break; + case 2 : matrix.setDimensionNames((String[])value); break; case 3 : int index = 0; for (List semantics : (List[])value) { - matrix.setSemantics(index, semantics); + matrix.setSemantic(index, semantics); index++; } break; @@ -407,9 +407,9 @@ List datas = MatrixHelper.convertStringToList(datasAsString); matrix = MatrixFactory.getInstance().create(name, dim); - matrix.setDimensionName(dimNames); + matrix.setDimensionNames(dimNames); for (int i=0; i<semantics.length; i++) { - matrix.setSemantics(i, semantics[i]); + matrix.setSemantic(i, semantics[i]); } matrix.fromList(datas); session.getPersistenceContext(); @@ -428,7 +428,7 @@ MatrixND matrix = MatrixFactory.getInstance().create((MatrixND)value); st.setString(index, matrix.getName()); st.setString(index + 1, getDimToString(matrix.getDim())); - st.setString(index + 2, getDimNamesToString(matrix.getDimensionName())); + st.setString(index + 2, getDimNamesToString(matrix.getDimensionNames())); st.setString(index + 3, getSemanticsToString(matrix.getSemantics())); st.setClob(index + 4, new ClobImpl(matrix.toList().toString())); } @@ -439,7 +439,7 @@ return new Serializable[] { matrix.getName(), getDimToString(matrix.getDim()), - getDimNamesToString(matrix.getDimensionName()), + getDimNamesToString(matrix.getDimensionNames()), getSemanticsToString(matrix.getSemantics()), matrix.toList().toString() }; @@ -453,9 +453,9 @@ List[] semantics = getSemanticsFromString(name, (String)o[3], session); List datas = MatrixHelper.convertStringToList((String)o[4]); MatrixND matrix = MatrixFactory.getInstance().create(name, dim); - matrix.setDimensionName(dimNames); + matrix.setDimensionNames(dimNames); for (int i=0; i<semantics.length; i++) { - matrix.setSemantics(i, semantics[i]); + matrix.setSemantic(i, semantics[i]); } matrix.fromList(datas); return matrix;

1 0

r3247 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: models/export simulator
by chatellier＠users.labs.libre-entreprise.org April 15, 2011

April 15, 2011

Author: chatellier Date: 2011-04-15 16:05:13 +0000 (Fri, 15 Apr 2011) New Revision: 3247 Log: Remove deprecated stuff Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java 2011-04-15 14:27:25 UTC (rev 3246) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java 2011-04-15 16:05:13 UTC (rev 3247) @@ -1,108 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * 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 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, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.ui.models.export; - -import java.util.List; - -import javax.swing.DefaultListModel; - -import fr.ifremer.isisfish.ui.models.common.StringListModel; - -/** - * Model pour la liste des noms d'exports. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - * - * @deprecated use {@link StringListModel} - */ -public class ExportNameListModel extends DefaultListModel { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4070846632975105788L; - - /** Analyze plan names. */ - protected List<String> exportNames; - - /** - * Empty constructor. - */ - public ExportNameListModel() { - this(null); - } - - /** - * Constructor with export list. - * - * @param exportNames exports Names - */ - public ExportNameListModel(List<String> exportNames) { - super(); - setExportNames(exportNames); - } - - /** - * Get exports names. - * - * @return the analyze plan names - */ - public List<String> getExportNames() { - return exportNames; - } - - /** - * Set analyze plan names. - * - * @param exportNames the exports names to set - */ - public void setExportNames(List<String> exportNames) { - this.exportNames = exportNames; - } - - /* - * @see javax.swing.ListModel#getElementAt(int) - */ - @Override - public Object getElementAt(int index) { - return exportNames.get(index); - } - - /* - * @see javax.swing.ListModel#getSize() - */ - @Override - public int getSize() { - int size = 0; - - if (exportNames != null) { - size = exportNames.size(); - } - return size; - } -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-04-15 14:27:25 UTC (rev 3246) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-04-15 16:05:13 UTC (rev 3247) @@ -25,7 +25,7 @@ <Table> <import> fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.models.export.ExportNameListModel; + fr.ifremer.isisfish.ui.models.common.StringListModel; javax.swing.event.ListSelectionEvent; java.util.LinkedList </import> @@ -54,7 +54,7 @@ // userExports = intersection(userExports,availableExports) userExports.retainAll(availableExports); - ExportNameListModel exportModel = new ExportNameListModel(availableExports); + StringListModel exportModel = new StringListModel(availableExports); listSimulExportChoose.setModel(exportModel); for (String userExport : userExports) {

1 0

r3246 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org April 15, 2011

April 15, 2011

Author: chatellier Date: 2011-04-15 14:27:25 +0000 (Fri, 15 Apr 2011) New Revision: 3246 Log: Udpate jaxx, eugene, topia, nuiton-utils, i18n Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-04-14 09:25:34 UTC (rev 3245) +++ isis-fish/branches/3.3.1/pom.xml 2011-04-15 14:27:25 UTC (rev 3246) @@ -493,11 +493,11 @@ <license.licenseName>gpl_v2</license.licenseName>  - <jaxxVersion>2.4.1-SNAPSHOT</jaxxVersion> - <eugeneVersion>2.3.2</eugeneVersion> - <topiaVersion>2.5.3-SNAPSHOT</topiaVersion> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> - <nuitonI18nVersion>2.3.1</nuitonI18nVersion> + <jaxxVersion>2.4.1</jaxxVersion> + <eugeneVersion>2.3.3</eugeneVersion> + <topiaVersion>2.5.3</topiaVersion> + <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> <jrstPluginVersion>1.2</jrstPluginVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion>

1 0

r3245 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result
by chatellier＠users.labs.libre-entreprise.org April 14, 2011

April 14, 2011

Author: chatellier Date: 2011-04-14 09:25:34 +0000 (Thu, 14 Apr 2011) New Revision: 3245 Log: Use nuiton-matrix 2.2 api Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-04-11 08:37:15 UTC (rev 3244) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-04-14 09:25:34 UTC (rev 3245) @@ -46,7 +46,7 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; -import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; +import org.nuiton.math.matrix.viewer.renderer.MatrixPanelRenderer; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; @@ -196,7 +196,7 @@ matrixViewerPanel.addMatrixRenderer(new MatrixSummaryRenderer(simulation, resultStorage, resultSimulationFrame.topiaContext), true); matrixViewerPanel.addMatrixRenderer(new MatrixChartRenderer()); matrixViewerPanel.addMatrixRenderer(new MatrixMapRenderer(fisheryRegion)); - matrixViewerPanel.addMatrixRenderer(new MatrixInfoTableRenderer()); + matrixViewerPanel.addMatrixRenderer(new MatrixPanelRenderer()); matrixViewerPanel.addMatrixFilter(new ResultMatrixFilter(resultStorage)); // init available results list

1 0

r3244 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 08:37:15 +0000 (Mon, 11 Apr 2011) New Revision: 3244 Log: Update mavenpom4labs to 2.5.3. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-04-11 08:37:12 UTC (rev 3243) +++ isis-fish/trunk/pom.xml 2011-04-11 08:37:15 UTC (rev 3244) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3243 - isis-fish/branches/3.3.1
by tchemit＠users.labs.libre-entreprise.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 08:37:12 +0000 (Mon, 11 Apr 2011) New Revision: 3243 Log: Update mavenpom4labs to 2.5.3. Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-04-08 16:34:33 UTC (rev 3242) +++ isis-fish/branches/3.3.1/pom.xml 2011-04-11 08:37:12 UTC (rev 3243) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3242 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/datastore/update java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/util resources/i18n
by chatellier＠users.labs.libre-entreprise.org April 8, 2011

April 8, 2011

Author: chatellier Date: 2011-04-08 16:34:33 +0000 (Fri, 08 Apr 2011) New Revision: 3242 Log: Fix equation editor layout and code Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-04-08 16:34:33 UTC (rev 3242) @@ -359,7 +359,7 @@ // frame.getEquationEditorPane().setEquation(eq); frame.setEquation(eq.getCategory(), eq.getName(), eq.getJavaInterface(), eq.getContent()); frame.setVisible(true); - if (frame.isOk()) { + if (frame.isResultOk()) { eq.setContent(frame.getEditor().getText()); } context.commitTransaction(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-04-08 16:34:33 UTC (rev 3242) @@ -23,8 +23,11 @@ #L% --> <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" - width="400" height="400" layout="{new BorderLayout()}"> + width="400" height="400" layout="{new BorderLayout()}" + modalityType="{Dialog.ModalityType.APPLICATION_MODAL}"> + <Boolean id="resultOk" javaBean="false" /> + <import> fr.ifremer.isisfish.util.CompileHelper; fr.ifremer.isisfish.util.EvaluatorHelper; @@ -41,55 +44,37 @@ </import> <script><![CDATA[ -boolean ok = false; Class javaInterface = null; protected void $afterCompleteSetup() { - setModalityType(Dialog.ModalityType.APPLICATION_MODAL); - doc.setEditable(false); - doc.setEditorKit(new HTMLEditorKit()); - doc.addHyperlinkListener(createHyperLinkListener()); - - editor.setAskIfNotSaved(false); - - checkWindow.setEditable(false); - split.setDividerLocation(0.8); } -public boolean isOk() { - return ok; -} - public void setEquation(String category, String name, Class javaInterface, String content) throws Exception { this.javaInterface = javaInterface; getDoc().setText(CompileHelper.extractDoc(category, name, javaInterface)); getEditor().open(FileUtil.getTempFile(content, ".java")); } -public HyperlinkListener createHyperLinkListener() { - return new HyperlinkListener() { - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - if (e instanceof HTMLFrameHyperlinkEvent) { - ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( - (HTMLFrameHyperlinkEvent)e); +public void docEditorHyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (e instanceof HTMLFrameHyperlinkEvent) { + ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( + (HTMLFrameHyperlinkEvent)e); + } else { + try { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(e.getURL().toURI()); } else { - try { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { - Desktop.getDesktop().browse(e.getURL().toURI()); - } else { - doc.setPage(e.getURL()); - } - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Error for : " + e.getURL(), ex); - } - } + doc.setPage(e.getURL()); } + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Error for : " + e.getURL(), ex); + } } } - }; + } } public void check() { @@ -108,10 +93,10 @@ out.flush(); if (compileResult != 0) { checkWindow.setText(result.toString()); - checkWindow.setBackground(Color.red); + checkWindow.setBackground(Color.RED); } else { checkWindow.setText("Compilation Ok"); - checkWindow.setBackground(Color.white); + checkWindow.setBackground(Color.WHITE); } } catch(Exception e){ @@ -123,19 +108,20 @@ <Table constraints="BorderLayout.CENTER"> <row> - <cell columns='4' weighty="1" fill='both'> + <cell columns='3' weighty="1" fill='both'> <JScrollPane> - <JEditorPane id="doc" /> + <JEditorPane id="doc" editable="false" editorKit="{new HTMLEditorKit()}" + onHyperlinkUpdate="docEditorHyperlinkUpdate(event)" /> </JScrollPane> </cell> </row> - <row columns='4' weighty="5" fill='both'> + <row columns='3' weightx="1" weighty="5" fill='both'> <cell> <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'> - <org.nuiton.widget.editor.Editor id="editor" /> + <org.nuiton.widget.editor.Editor id="editor" askIfNotSaved="false" /> <JScrollPane> - <JEditorPane id="checkWindow" /> + <JTextArea id="checkWindow" editable="false" /> </JScrollPane> </JSplitPane> </cell> @@ -144,10 +130,10 @@ <cell> <JButton text='isisfish.common.check' onActionPerformed='check()' /> </cell> - <cell> - <JButton id='okButton' text='isisfish.common.ok' onActionPerformed='ok=true; setVisible(false)' /> + <cell weightx="1" fill="none" anchor="east"> + <JButton id='okButton' text='isisfish.common.ok' onActionPerformed='setResultOk(true); setVisible(false)' /> </cell> - <cell> + <cell anchor="east"> <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed='setVisible(false)' /> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-08 16:34:33 UTC (rev 3242) @@ -304,17 +304,17 @@ return null; } - public Object openEditor(InputOneEquationUI ui, String category, String name, Class javaInterface, + public Object openEditor(InputOneEquationUI ui, String category, String name, Class<?> javaInterface, String content, Editor editor) { if (log.isTraceEnabled()) { log.trace("openEditor"); } try { - EquationEditorPaneUI pane = new EquationEditorPaneUI(); + EquationEditorPaneUI pane = new EquationEditorPaneUI(ui); pane.setEquation(category, name, javaInterface, content); pane.setLocationRelativeTo(ui); - pane.setVisible(true); - if (pane.isOk() && editor != null) { + pane.setVisible(true); // blocking call + if (pane.isResultOk() && editor != null) { editor.setText(pane.getEditor().getText()); } pane.dispose(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-04-08 16:34:33 UTC (rev 3242) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -98,8 +98,8 @@ * @param fqn le nom complet de la classe a charger * @return la classe souhaité ou null si la class n'est pas trouvée */ - public static Class loadClass(String fqn) { - Class result = null; + public static Class<?> loadClass(String fqn) { + Class<?> result = null; try { ClassLoader cl = IsisFish.config.getScriptClassLoader(); result = cl.loadClass(fqn); @@ -112,7 +112,7 @@ public static Object newInstance(String fqn) { Object result = null; try { - Class clazz = loadClass(fqn); + Class<?> clazz = loadClass(fqn); if (clazz != null) { result = clazz.newInstance(); @@ -310,19 +310,19 @@ } /** - * Extract documentation from interface (Equation) + * Extract documentation from interface (Equation). + * * @param category * @param name * @param javaInterface * @return doc */ public static String extractDoc(String category, String name, - Class javaInterface) { - String content = ""; - content = "<p>Equation : " + Class<?> javaInterface) { + String content = "<p>Equation : " + createHREF(javaInterface.getName(), category) + " - " + name + "</p>"; - content += "<h3>Parameter: name and type</h3>"; + content += "<h3>" + _("isisfish.editor.parametersnameandtypes") + " :</h3>"; Method[] methods = javaInterface.getDeclaredMethods(); Method interfaceMethod = methods[0]; @@ -336,7 +336,7 @@ stringTypes = argTypes.value(); } else { stringTypes = new String[names.length]; - Class[] types = interfaceMethod.getParameterTypes(); + Class<?>[] types = interfaceMethod.getParameterTypes(); for (int i = 0; i < types.length; i++) { stringTypes[i] = types[i].getName(); } @@ -344,29 +344,35 @@ for (int i = 0; i < names.length; i++) { content += "<li>" + names[i] + " : " + createHREF(stringTypes[i]); - // if (i+1<names.length) { - // content += "\n"; - // } } - try { - FileUtil.writeString(new File("/tmp/testDoc.html"), content); - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("TODO untreated error", eee); - } - } return content; } - private static String createHREF(String type, String... texts) { - String ref = IsisFish.config.getJavadocURL() - + type.replaceAll("\\.", "/") + ".html"; + /** + * Create a html link to isis javadoc. + * + * @param type class type + * @param texts link display text + * @return + */ + protected static String createHREF(String type, String... texts) { + + // si pas de text, on affiche le type String text = type; if (texts.length > 0) { text = texts[0]; } - String result = "<a href='" + ref + "'>" + text + "</a>"; + + String result = null; + if (type.startsWith("fr.ifremer.isisfish")) { + String ref = IsisFish.config.getJavadocURL() + type.replaceAll("\\.", "/") + ".html"; + result = "<a href='" + ref + "'>" + text + "</a>"; + } else { + // n'affiche pas de lien pour les types + // genre "double" qui ne sont pas dans la javadoc d'isisfish + result = text; + } return result; } Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 16:34:33 UTC (rev 3242) @@ -212,6 +212,7 @@ isisfish.dataResult.export.csv=Export to CSV isisfish.dataResult.label=Value isisfish.date.toString=%1$s %2$s +isisfish.editor.parametersnameandtypes=Parameters (name and type) isisfish.effortDescription.crewFoodCost=Crew food cost isisfish.effortDescription.crewShareRate=Crew share rate isisfish.effortDescription.crewSize=Crew size Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 16:01:10 UTC (rev 3241) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 16:34:33 UTC (rev 3242) @@ -212,6 +212,7 @@ isisfish.dataResult.export.csv=Exporter en CSV isisfish.dataResult.label=Valeur isisfish.date.toString=%1$s %2$s +isisfish.editor.parametersnameandtypes=Param\u00E8tres (nom et type) isisfish.effortDescription.crewFoodCost=Co\u00FBt de l'alimentation pour l'\u00E9quipage isisfish.effortDescription.crewShareRate=Taux de partage de l'\u00E9quipage isisfish.effortDescription.crewSize=Taille de l'\u00E9quipage

1 0

r3241 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org April 8, 2011

April 8, 2011

Author: chatellier Date: 2011-04-08 16:01:10 +0000 (Fri, 08 Apr 2011) New Revision: 3241 Log: Add doc Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2011-04-08 15:10:39 UTC (rev 3240) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2011-04-08 16:01:10 UTC (rev 3241) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -31,7 +31,9 @@ import java.lang.annotation.Target; /** - * ArgTypes.java + * Annotation utilisée pour specifier le type des parametres. + * + * Pour etre plus explicit que "List" en renseignant "List<Zone>" par exemple. * * Created: 4 juil. 2006 12:40:46 * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2011-04-08 15:10:39 UTC (rev 3240) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2011-04-08 16:01:10 UTC (rev 3241) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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 @@ -31,7 +31,8 @@ import java.lang.annotation.Target; /** - * Args.java + * Annotation pour specifier le nom des arguments car il est impossible + * de les avoir par introspection. * * Created: 4 juil. 2006 12:40:46 *

1 0

r3240 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/ui/input/check resources/i18n
by chatellier＠users.labs.libre-entreprise.org April 8, 2011

April 8, 2011

Author: chatellier Date: 2011-04-08 15:10:39 +0000 (Fri, 08 Apr 2011) New Revision: 3240 Log: Fix NPE when RecruitmentDistribution is not defined Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-08 15:10:39 UTC (rev 3240) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, 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 @@ -352,8 +352,10 @@ check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); - // FIXME chatellier 20110221 NPE pop.getRecruitmentDistribution() - if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { + if (pop.getRecruitmentDistribution() == null) { + result.addWarning(pop, _("isisfish.error.missing.distribution.recruitment")); + } + else if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); } } Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-08 15:10:39 UTC (rev 3240) @@ -312,6 +312,7 @@ isisfish.error.log.foundAppender=\=could not found log appender %1$s for category %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative +isisfish.error.missing.distribution.recruitment=Missing recruitment distribution equation isisfish.error.no.matrix=No matrix for \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=No sector defined Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 14:26:03 UTC (rev 3239) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-08 15:10:39 UTC (rev 3240) @@ -312,6 +312,7 @@ isisfish.error.log.foundAppender=n'a pas trouve l'appender %1$s pour la categorie %2$s isisfish.error.matrix.more.2d=Matrice de plus de 2 dimensions\!\!\nS\u00E9lectionnez moins d'\u00E9l\u00E9ments ou utilisez l'op\u00E9rateur somme. isisfish.error.migration.negative=Migration negative +isisfish.error.missing.distribution.recruitment=Equation de distribution de recrutement manquante isisfish.error.no.matrix=Pas de matrice pour \: %s isisfish.error.no.null.time.step=Error, the time step should not be null isisfish.error.no.sector=il n'y a pas de secteur de d\u00E9finit

1 0