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

r2072 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 13:50:08 +0000 (Mon, 06 Apr 2009) New Revision: 2072 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Readd default value as argument for getValueAndCompute Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:47:18 UTC (rev 2071) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:50:08 UTC (rev 2072) @@ -165,15 +165,16 @@ protected JButton getActionButton(int i){ return actions.get(i); } -protected void valid(int i){ +protected void valid(int i) { String variableName = datas.get(i).getVariableName(); String[] lines = editor.getEditor().getText().split("\n"); String result = ""; - for (String line : lines){ - Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*).*\\;$"); + for (String line : lines) { + Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { - line = matcher.group(1) + "context.getValueAndCompute(\"" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "\");"; + String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName; + line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; } result += line + "\n"; }

1 0

r2071 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: sletellier Date: 2009-04-06 13:47:18 +0000 (Mon, 06 Apr 2009) New Revision: 2071 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx Log: Bug double JScrollPane fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-06 13:30:17 UTC (rev 2070) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-06 13:47:18 UTC (rev 2071) @@ -45,9 +45,9 @@ <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='both' weightx='1' weighty='1'> - <JScrollPane> +  <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </JScrollPane> +  </cell> </row> <row>

1 0

r2070 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 13:30:17 +0000 (Mon, 06 Apr 2009) New Revision: 2070 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: #1810 : Serait-il possible d'afficher un message dans la case target factor de la table reprenant les differentes associations espece-saison du mtier. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-04-06 13:30:17 UTC (rev 2070) @@ -660,16 +660,17 @@ return null; } - public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquation, boolean primaryCatch) { - if (log.isTraceEnabled()) { - log.trace("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquation); + public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquationName, String targetFactorEquationContent, boolean primaryCatch) { + if (log.isDebugEnabled()) { + log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier.getTopiaContext()); TargetSpecies targetSpecies = dao.create(); targetSpecies.setSpecies(species); - targetSpecies.getTargetFactorEquation().setContent(targetFactorEquation); + targetSpecies.getTargetFactorEquation().setName(targetFactorEquationName); + targetSpecies.getTargetFactorEquation().setContent(targetFactorEquationContent); targetSpecies.setPrimaryCatch(primaryCatch); m.addSpeciesTargetSpecies(targetSpecies); } catch (Exception eee) { @@ -680,8 +681,8 @@ } public Object removeTargetSpecies(MetierSeasonInfo m, TargetSpecies targetSpecies) { - if (log.isTraceEnabled()) { - log.trace("removeTargetSpecies called: " + targetSpecies); + if (log.isDebugEnabled()) { + log.debug("removeTargetSpecies called: " + targetSpecies); } try { if (targetSpecies != null) { @@ -697,8 +698,8 @@ // SetOfVessels public void addEffortDescription(SetOfVessels setOfVessels, Metier metier) { - if (log.isTraceEnabled()) { - log.trace("addEffortDescription called: " + setOfVessels + " metier: " + metier); + if (log.isDebugEnabled()) { + log.debug("addEffortDescription called: " + setOfVessels + " metier: " + metier); } try { EffortDescriptionDAO effortDescriptionPS = IsisFishDAOHelper.getEffortDescriptionDAO(metier.getTopiaContext()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-06 13:30:17 UTC (rev 2070) @@ -132,59 +132,61 @@ return result; } }; - if (getMetierInfo() != null){ + if (getMetierInfo() != null) { Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)getMetierInfo()).getSpeciesTargetSpecies(); - if (targetSpecies != null){ - ArrayList <GenericCell> species = new ArrayList <GenericCell>(); - ArrayList <Equation> equations = new ArrayList <Equation>(); - ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); - for (TargetSpecies t : targetSpecies){ + if (targetSpecies != null) { + java.util.List<GenericCell> species = new ArrayList <GenericCell>(); + java.util.List<Equation> equations = new ArrayList <Equation>(); + java.util.List<Boolean> primaryCatch = new ArrayList <Boolean>(); + for (TargetSpecies t : targetSpecies) { Species s = t.getSpecies(); Equation e = t.getTargetFactorEquation(); Boolean b = t.getPrimaryCatch(); - species.add(new GenericCell(s.getName(),s,Species.class)); + species.add(new GenericCell(s.getName(), s, Species.class)); equations.add(e); primaryCatch.add(b); } - model.addColumn("Species", species.toArray()); - model.addColumn("Target factor", equations.toArray()); - model.addColumn("Main species for the metier", primaryCatch.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.species"), species.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.targetFactor"), equations.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.mainSpecies"), primaryCatch.toArray()); } tableTargetSpecies.setModel(model); EquationTableEditor cellEditor = new EquationTableEditor(); tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); } } -protected void add(){ +protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (getMetierInfo() != null && species != null){ + if (getMetierInfo() != null && species != null) { + Formule selectedFormule = (Formule)targetFactor.getCombo().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), (MetierSeasonInfo)getMetierInfo(), (Species)species, + selectedFormule.getName(), targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); } } -protected void remove(){ - if (isMetierSeasonSelected()){ +protected void remove() { + if (isMetierSeasonSelected()) { Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray(); Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; - if (o != null){ + if (o != null) { TargetSpecies ts = (TargetSpecies)o; getAction().removeTargetSpecies(getMetierInfo(), ts); setTableTargetSpeciesModel(); } } } -protected void targetSpeciesChanged(){ +protected void targetSpeciesChanged() { setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); setTableTargetSpeciesModel(); setAddButton(); } -protected void setAddButton(){ +protected void setAddButton() { add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected()); } ]]></script> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-06 13:30:17 UTC (rev 2070) @@ -611,7 +611,8 @@ isisfish.metierSeasonInfoSpecies.mainSpecies=Main species for the metier isisfish.metierSeasonInfoSpecies.selectSeason=Select a season isisfish.metierSeasonInfoSpecies.selectSpecies=Select a species -isisfish.metierSeasonInfoSpecies.targetFactor=TargetFactor +isisfish.metierSeasonInfoSpecies.species=Species +isisfish.metierSeasonInfoSpecies.targetFactor=Target factor isisfish.metierSeasonInfoSpecies.title=Catchable species isisfish.metierSeasonInfoZone.comments=Comments isisfish.metierSeasonInfoZone.season=Season Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-06 13:30:17 UTC (rev 2070) @@ -611,6 +611,7 @@ isisfish.metierSeasonInfoSpecies.mainSpecies=Esp\u00E8ces principales pour le m\u00E9tier isisfish.metierSeasonInfoSpecies.selectSeason=S\u00E9lectionnez une saison isisfish.metierSeasonInfoSpecies.selectSpecies=Choix de l'esp\u00E8ce +isisfish.metierSeasonInfoSpecies.species=Esp\u00E8ce isisfish.metierSeasonInfoSpecies.targetFactor=Facteur cible isisfish.metierSeasonInfoSpecies.title=Esp\u00E8ces capturables isisfish.metierSeasonInfoZone.comments=Commentaires

1 0

r2069 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 08:39:21 +0000 (Mon, 06 Apr 2009) New Revision: 2069 Modified: isis-fish/trunk/pom.xml Log: Update h2 to 1.1.110. Hex data bug is now fixed Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-04-06 08:32:01 UTC (rev 2068) +++ isis-fish/trunk/pom.xml 2009-04-06 08:39:21 UTC (rev 2069) @@ -217,11 +217,10 @@ </dependency>  -  <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.108</version> + <version>1.1.110</version> <scope>compile</scope> </dependency>

1 0

r2068 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 08:32:01 +0000 (Mon, 06 Apr 2009) New Revision: 2068 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix "september" > "septembre" Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-03 15:20:46 UTC (rev 2067) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-06 08:32:01 UTC (rev 2068) @@ -629,7 +629,7 @@ isisfish.month.may=mai isisfish.month.november=novembre isisfish.month.october=octobre -isisfish.month.september=september +isisfish.month.september=septembre isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s' isisfish.params.clearFilter=Reset filtre isisfish.params.description=Description

1 0

r2067 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/datastore java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget/renderer resources/i18n
by chatellier＠users.labs.libre-entreprise.org 03 Apr '09

03 Apr '09

Author: chatellier Date: 2009-04-03 15:20:46 +0000 (Fri, 03 Apr 2009) New Revision: 2067 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add tooltip on sensitivity UIs Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2009-04-03 15:20:46 UTC (rev 2067) @@ -154,8 +154,14 @@ * @see Docable */ public Doc getFieldDoc(String fieldName) { - throw new IsisFishRuntimeException(_("isisfish.error.not.found.class" - + "support Docable#getFieldDoc(String) method %1$s", this)); + Doc result=null; + try { + Class klazz = getCodeClass(); + result = DocHelper.getFieldDoc(klazz,fieldName); + } catch (Exception e) { + log.warn(_("isisfish.error.not.found.field",fieldName,this)); + } + return result; } /** @@ -167,11 +173,69 @@ * @see Docable */ public String getDescription() { - throw new IsisFishRuntimeException(_("isisfish.error.not.support.class" - + "Docable#getDescription() method %1$s", this)); + String result = null; + try { + Export export = getNewExportInstance(); + if (export != null) { + result = export.getDescription(); + } + } catch (Exception e) { + log.warn(_("isisfish.error.not.found.description",this)); + } + return result; } /** + * @param paramName the name of the param to inspect + * @return the doc associated with the param, + * (says the field PARAM_PREFIX+fieldName) + */ + public Doc getParamDoc(String paramName) { + Doc doc; + doc = getFieldDoc(PARAM_PREFIX + paramName); + return doc; + } + + /** + * Permet de recuperer les parametres de l'export. + * + * @return Une map contenant le nom du parametre et son type + * @throws IsisFishException s'il est impossible de retourner une map + * convenable + */ + public Map<String, Class<?>> getParameterNames() throws IsisFishException { + Map<String, Class<?>> result = null; + // On essai de recuperer les paramètres depuis la classe compilé + // si c possible + try { + if (0 == compile(false, null)) { + Export export = getNewExportInstance(); + result = ExportStorage.getParameterNames(export); + } + } catch (Exception eee) { + log.info(_("isisfish.error.compiled.parameter"), eee); + } + // si on ne reussi pas avec la classe compilé on essai en parsant le + // source + if (result == null) { + try { + //String code = getContent(); + log.fatal("FIXME a faire recherche des parametre dans le source"); + throw new IsisFishException(_("isisfish.error.source.parameter")); + // TODO implanter la recherche des parametres. + // Se sont les attributs commencant par 'param_' et ils doivent + // etre public non static, non transient. + // ex: public Date param_Date. + // Lorsqu'on ajoute un champs dans la map il ne faut pas mettre + // le prefix param. + } catch (Exception eee) { + throw new IsisFishException(_("isisfish.error.source.parameter"), eee); + } + } + return result; + } + + /** * Recherche par introspection tous les parametres de la classe * commencant par {@link #PARAM_PREFIX}. * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-03 15:20:46 UTC (rev 2067) @@ -32,6 +32,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import jaxx.runtime.swing.Item; + import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; @@ -42,6 +43,9 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.IsisFishException; + import fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory; + import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer; + import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer; protected SimulAction getSimulAction() { return getContextValue(SimulAction.class); @@ -54,6 +58,8 @@ items.add(new Item(s, s, s, false)); } fieldSensitivityCalculatorSelect.setItems(items); + // add list tooltip renderer + //fieldSensitivityCalculatorSelect.setCellRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createRuleDescriptionsModel(getSimulAction().getSensitivityNames()))); return fieldSensitivityCalculatorSelect.getModel(); } @@ -78,7 +84,8 @@ } protected void setSensitivityCalculatorParamsModel() { - Map<String, Class<?>> values = getSimulAction().getSensitivityParameterNames((String)fieldSensitivityCalculatorSelect.getSelectedItem()); + String sensitivityName = (String)fieldSensitivityCalculatorSelect.getSelectedItem(); + Map<String, Class<?>> values = getSimulAction().getSensitivityParameterNames(sensitivityName); setSensitivityCalculatorParamsTableModel(values, simulSensitivityCalculatorParam); simulSensitivityCalculatorParam.getModel().addTableModelListener(new TableModelListener() { @Override @@ -89,6 +96,7 @@ getContextValue(SimulAction.class).setSensitivityCalculatorParameterValue(data.getName(), model.getValueAt(row, 1)); } }); + simulSensitivityCalculatorParam.getColumnModel().getColumn(0).setCellRenderer(new SimpleToolTipTableColumnRenderer(ToolTipListModelFactory.createSensitivityParamsModel(sensitivityName))); } protected void setSensitivityCalculatorParamsTableModel(Map<String, Class<?>> values, JTable table) { @@ -164,6 +172,7 @@ protected DefaultComboBoxModel getExportTableModel() { java.util.List<String> exportNames = getSimulAction().getSensitivityExportNames(); DefaultComboBoxModel model = new DefaultComboBoxModel(exportNames.toArray()); + // TODO add tooltip model for this combo return model; } @@ -177,7 +186,8 @@ * Fill export parameters names and values in table. */ protected void setExportParams() { - Map<String, Class<?>> values = getSimulAction().getSensitivityExportParameterNames(getSelectedExport()); + SensitivityExport export = getSelectedExport(); + Map<String, Class<?>> values = getSimulAction().getSensitivityExportParameterNames(export); setSensitivityExportParamsTableModel(values, exportParamsTable); exportParamsTable.getModel().addTableModelListener(new TableModelListener() { @@ -189,6 +199,7 @@ getContextValue(SimulAction.class).setSensitivityExportParameterValue(getSelectedExport(), (String)data.getName(), model.getValueAt(row, 1)); } }); + exportParamsTable.getColumnModel().getColumn(0).setCellRenderer(new SimpleToolTipTableColumnRenderer(ToolTipListModelFactory.createExportParamsModel(ExportStorage.getName(export)))); } /** @@ -254,11 +265,14 @@ } protected void setExportListModel() { + java.util.List<SensitivityExport> exports = getSimulAction().getSensitivityExportList(); DefaultListModel model = new DefaultListModel(); - for (SensitivityExport s : getSimulAction().getSensitivityExports()){ + + for (SensitivityExport s : exports) { model.addElement(new GenericCell(s.getExportFilename(), s, s.getClass())); } exportList.setModel(model); + exportList.setCellRenderer(new SimpleToolTipComboBoxRenderer(ToolTipListModelFactory.createExportDescriptionsModel2(exports, clearExportsButton, exportList))); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-03 15:20:46 UTC (rev 2067) @@ -318,8 +318,8 @@ properties.add(propertie); cells.add(value); } - model.addColumn("Name", cells.toArray()); - model.addColumn("Value", properties.toArray()); + model.addColumn(_("isisfish.common.name"), cells.toArray()); + model.addColumn(_("isisfish.common.value"), properties.toArray()); } simulParamsRules.setModel(model); ParameterColumnEditor cellEditor = new ParameterColumnEditor(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-03 15:20:46 UTC (rev 2067) @@ -83,6 +83,7 @@ import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; + /** * SimulAction. * @@ -707,10 +708,6 @@ return result; } - public Collection<SensitivityExport> getSensitivityExports() { - return sensitivityExports.keySet(); - } - public List<SensitivityExport> getSensitivityExportList() { List<SensitivityExport> result = new ArrayList<SensitivityExport>(); for (Map.Entry<SensitivityExport, String> entry : sensitivityExports Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-03 15:20:46 UTC (rev 2067) @@ -38,6 +38,8 @@ import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; +import fr.ifremer.isisfish.datastore.SensitivityStorage; +import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.ui.widget.renderer.ToolTipListModel; @@ -69,8 +71,7 @@ * @param names Result script field names * @return the model builded */ - static public ToolTipListModel createResultFieldsModel( - List<String> names) { + public static ToolTipListModel createResultFieldsModel(List<String> names) { List<String> texts = new ArrayList<String>(); List<String> toolTips = new ArrayList<String>(); @@ -116,8 +117,7 @@ * @param names Export names to use * @return the model builded */ - public static ToolTipListModel createExportClassDocsModel( - List<String> names) { + public static ToolTipListModel createExportClassDocsModel(List<String> names) { List<String> texts = new ArrayList<String>(); List<String> toolTips = new ArrayList<String>(); @@ -270,7 +270,6 @@ * @param names AnalysePlan names to use * @return the model builded */ - @SuppressWarnings({"unchecked"}) public static ToolTipListModel createAnalysePlanDescriptionsModel( List<String> names) { @@ -315,7 +314,6 @@ * @param list list containing the renderer * @return the model builded */ - @SuppressWarnings({"unchecked"}) public static ToolTipListModel createAnalysePlanDescriptionsModel2( List<AnalysePlan> plans, JButton clearButton, JList list) { @@ -353,7 +351,7 @@ * the param in the AnalysePlan</li> * </ul> * - * @param analysePlans the selected analyse plan (we only use the first one) + * @param name the selected analyze plan name * @return the model builded */ public static ToolTipListModel createAnalysePlanParamsModel(String name) { @@ -381,4 +379,119 @@ } return new ToolTipListModel(texts, toolTips); } + + /** + * Build a new {@link ToolTipListModel} for params of a given {link SensitivityCalculator} : + * <ul> + * <li>text : the name fo the param fo the AnalysePlan</li> + * <li>tooltip : the nicely printed version of the @Doc associated to + * the param in the {link SensitivityCalculator}</li> + * </ul> + * + * @param sensitivityName the sensitivity calculator name + * @return the model builded + */ + public static ToolTipListModel createSensitivityParamsModel(String sensitivityName) { + + List<String> texts = new ArrayList<String>(); + List<String> toolTips = new ArrayList<String>(); + if (!StringUtils.isEmpty(sensitivityName)) { + try { + SensitivityStorage storage = + SensitivityStorage.getSensitivity(sensitivityName); + Map<String, Class<?>> mapParams = storage.getParameterNames(); + + if (!mapParams.isEmpty()) { + for (String paramName : mapParams.keySet()) { + Doc fieldDoc = storage.getParamDoc(paramName); + texts.add(paramName); + toolTips.add(DocHelper.asString(fieldDoc)); + } + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.obtain.field.sensitivitycalculator", sensitivityName), eee); + } + } + } + return new ToolTipListModel(texts, toolTips); + } + + /** + * Build a new {@link ToolTipListModel} for params of a given {@link Export} : + * <ul> + * <li>text : the name fo the param fo the AnalysePlan</li> + * <li>tooltip : the nicely printed version of the @Doc associated to + * the param in the AnalysePlan</li> + * </ul> + * + * @param exportName the selected export name + * @return the model builded + */ + public static ToolTipListModel createExportParamsModel(String exportName) { + + List<String> texts = new ArrayList<String>(); + List<String> toolTips = new ArrayList<String>(); + if (!StringUtils.isEmpty(exportName)) { + try { + ExportStorage storage = + ExportStorage.getExport(exportName); + Map<String, Class<?>> mapParams = storage.getParameterNames(); + + if (!mapParams.isEmpty()) { + for (String paramName : mapParams.keySet()) { + Doc fieldDoc = storage.getParamDoc(paramName); + texts.add(paramName); + toolTips.add(DocHelper.asString(fieldDoc)); + } + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.obtain.field.export", exportName), eee); + } + } + } + return new ToolTipListModel(texts, toolTips); + } + + /** + * Build a new {@link ToolTipListModel} for descriptions of given + * {@link Export} : + * <ul> + * <li>text : the name of the AnalysePlan</li> + * <li>tooltip : the description of the AnalysePlan</li> + * </ul> + * + * @param exports export to use + * @param clearButton clear button linked to list + * @param list list containing the renderer + * @return the model builded + */ + public static ToolTipListModel createExportDescriptionsModel2( + List<? extends Export> exports, JButton clearButton, JList list) { + + List<String> texts = new ArrayList<String>(); + List<String> toolTips = new ArrayList<String>(); + + if (!exports.isEmpty()) { + try { + // we are dealing with Export objects + for (Export export : exports) { + String name = ExportStorage.getName(export); + ExportStorage storage = ExportStorage.getExport(name); + String description = storage.getDescription(); + texts.add(name); + toolTips.add(description); + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.obtain.analyseplan"), eee); + } + } + } + ToolTipListModel listModel = new ToolTipListModel(texts, toolTips); + // should check if there is an already listener ? + SimulatorListeners.initButtonClearIfListNotEmpty(clearButton, list.getModel()); + return listModel; + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java 2009-04-03 15:20:46 UTC (rev 2067) @@ -19,8 +19,8 @@ package fr.ifremer.isisfish.ui.widget.renderer; -import java.awt.Color; import java.awt.Component; + import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java 2009-04-03 15:20:46 UTC (rev 2067) @@ -19,7 +19,6 @@ package fr.ifremer.isisfish.ui.widget.renderer; -import java.awt.Color; import java.awt.Component; import javax.swing.JLabel; Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-03 15:20:46 UTC (rev 2067) @@ -309,6 +309,8 @@ isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s +isisfish.error.obtain.field.export=Can't obtain field @Doc for Export %1$s +isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %1$s isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-03 12:30:29 UTC (rev 2066) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-03 15:20:46 UTC (rev 2067) @@ -309,6 +309,8 @@ isisfish.error.obtain.doc.rule=Can't obtain description for a Rule class isisfish.error.obtain.field=Can't obtain field @Doc for Rule %1$s isisfish.error.obtain.field.analyseplan=Can't obtain field @Doc for AnalysePlan %1$s +isisfish.error.obtain.field.export=Can't obtain field @Doc for Export %1$s +isisfish.error.obtain.field.sensitivitycalculator=Can't obtain field @Doc for Calculator %1$s isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison isisfish.error.parse.date=Can't parse date %1$s

1 0

r2066 - isis-fish/trunk/src/main/resources/templates/script
by chatellier＠users.labs.libre-entreprise.org 03 Apr '09

03 Apr '09

Author: chatellier Date: 2009-04-03 12:30:29 +0000 (Fri, 03 Apr 2009) New Revision: 2066 Modified: isis-fish/trunk/src/main/resources/templates/script/script.ftl isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl Log: Add @Doc on templates Modified: isis-fish/trunk/src/main/resources/templates/script/script.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-04-03 10:24:10 UTC (rev 2065) +++ isis-fish/trunk/src/main/resources/templates/script/script.ftl 2009-04-03 12:30:29 UTC (rev 2066) @@ -21,7 +21,7 @@ public class ${name} { /** to use log facility, just put in your code: log.info("..."); */ - private static Log log = LogFactory.getLog(${name}.class); + private static Log log = LogFactory.getLog(${name}.class); // add your method here Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-04-03 10:24:10 UTC (rev 2065) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-04-03 12:30:29 UTC (rev 2066) @@ -27,10 +27,11 @@ * Last update: $Date: ${date?date?string.long} $ * by : $Author: ${author} $ */ + at Doc("TODO Doc for ${name} SensitivityCalculator") public class ${name} implements SensitivityCalculator { /** to use log facility, just put in your code: log.info("..."); */ - private static Log log = LogFactory.getLog(${name}.class); + private static Log log = LogFactory.getLog(${name}.class); /** * Return calculator description.

1 0

r2065 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget/renderer
by chatellier＠users.labs.libre-entreprise.org 03 Apr '09

03 Apr '09

Author: chatellier Date: 2009-04-03 10:24:10 +0000 (Fri, 03 Apr 2009) New Revision: 2065 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java Log: Remove unused code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-03 10:21:13 UTC (rev 2064) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-03 10:24:10 UTC (rev 2065) @@ -174,7 +174,7 @@ // that is not filled, when coming in getListCellRendererComponent // we must also give to model the objects of the model... // TODO Fix this - return new ToolTipListModel(texts, toolTips, names); + return new ToolTipListModel(texts, toolTips); } /** @@ -278,7 +278,7 @@ List<String> toolTips = new ArrayList<String>(); if (names.isEmpty()) { - return new ToolTipListModel(texts, toolTips, names); + return new ToolTipListModel(texts, toolTips); } try { @@ -299,7 +299,7 @@ // that is not filled, when coming in getListCellRendererComponent // we must also give to model the objects of the model... // TODO Fix this - return new ToolTipListModel(texts, toolTips, names); + return new ToolTipListModel(texts, toolTips); } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java 2009-04-03 10:21:13 UTC (rev 2064) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java 2009-04-03 10:24:10 UTC (rev 2065) @@ -32,23 +32,14 @@ public class ToolTipListModel { /** cache of text */ - protected List objects; - - /** cache of text */ protected List<String> texts; /** cache of tooltip */ protected List<String> tooltips; public ToolTipListModel(List<String> texts, List<String> tooltips) { - this(texts, tooltips, null); - } - - public ToolTipListModel(List<String> texts, List<String> tooltips, - List objects) { this.texts = texts; this.tooltips = tooltips; - this.objects = objects; } public String getText(int index) { @@ -60,12 +51,4 @@ return tooltips == null || index < 0 || tooltips.size() <= index ? null : tooltips.get(index); } - - public int getIndex(Object value) { - int result = -1; - if (objects != null) { - result = objects.indexOf(value); - } - return result; - } }

1 0

r2064 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: ui/simulator ui/widget/renderer util
by chatellier＠users.labs.libre-entreprise.org 03 Apr '09

03 Apr '09

Author: chatellier Date: 2009-04-03 10:21:13 +0000 (Fri, 03 Apr 2009) New Revision: 2064 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java Log: Fix already in place tooltip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-02 16:43:31 UTC (rev 2063) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ToolTipListModelFactory.java 2009-04-03 10:21:13 UTC (rev 2064) @@ -19,6 +19,21 @@ package fr.ifremer.isisfish.ui.simulator; +import static org.codelutin.i18n.I18n._; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.swing.JButton; +import javax.swing.JList; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.RuleStorage; @@ -29,23 +44,13 @@ import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.util.DocHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n.*; - -import javax.swing.JButton; -import javax.swing.JList; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - /** * This is a factory of {@link ToolTipListModel} used in simulator ui * * @author chemit + * @version $Revision$ + * + * Mise a jour: $Date$ */ public class ToolTipListModelFactory { @@ -219,23 +224,24 @@ * the param in the Rule</li> * </ul> * - * @param rules the selected rules (we only use the first one) + * @param ruleName the selected rule name (we only use the first one) * @return the model builded */ - public static ToolTipListModel createRuleParamsModel(String rules) { - System.out.println("createRuleParamsModel for rules : " + rules); + public static ToolTipListModel createRuleParamsModel(String ruleName) { + + if (log.isDebugEnabled()) { + log.debug("createRuleParamsModel for rules : " + ruleName); + } List<String> texts = new ArrayList<String>(); List<String> toolTips = new ArrayList<String>(); - if (rules == null || rules.equals("")) { + if (StringUtils.isEmpty(ruleName)) { return new ToolTipListModel(texts, toolTips); } - String name = RuleStorage.getName(rules); try { - - RuleStorage storage = RuleStorage.getRule(name); + RuleStorage storage = RuleStorage.getRule(ruleName); Map<String, Class> mapParams = storage.getParameterNames(); if (!mapParams.isEmpty()) { @@ -247,7 +253,7 @@ } } catch (Exception eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.obtain.field", name), eee); + log.warn(_("isisfish.error.obtain.field", ruleName), eee); } } return new ToolTipListModel(texts, toolTips); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java 2009-04-02 16:43:31 UTC (rev 2063) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipComboBoxRenderer.java 2009-04-03 10:21:13 UTC (rev 2064) @@ -1,12 +1,32 @@ +/* *##% + * Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cedric Pineau, 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.renderer; +import java.awt.Color; import java.awt.Component; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; /** - * Simple implementation of {@link ToolTipTableColumnRenderer} renderer + * Simple implementation of {@link ListCellRenderer} renderer * with a cache to store text and tooltip to be displayed. * * @@ -14,21 +34,25 @@ * * Internal cache will be based on two list (one for text, and one for doc) * - * This is a swixat extends, so just for swixat... * * @author chemit - * @see ToolTipListRenderer * @see ToolTipListModel */ -public class SimpleToolTipComboBoxRenderer extends JLabel implements ListCellRenderer { +public class SimpleToolTipComboBoxRenderer extends JLabel implements + ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6435245208150840312L; + /** the model to use */ protected ToolTipListModel model; - public SimpleToolTipComboBoxRenderer(ToolTipListModel model){ + public SimpleToolTipComboBoxRenderer(ToolTipListModel model) { this.model = model; } + /** - * set the model to use + * Set the model to use. * * @param model the mode to use */ @@ -36,30 +60,21 @@ this.model = model; } - /** - * @param value model contrete value - * @param index index of the row - * @return the text to display (this is a pre-computed value) - */ - public String getText(Object value, int index) { - return model == null ? null : model.getText(index); - } - - /** - * @param value model concret object - * @param index index of the row - * @param text the text to be displayed - * @return the tooltip to display (this is a pre-computed value) - */ - public String getToolTip(Object value, int index, String text) { - return model == null ? null : model.getToolTipText(index); - } - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { String toolTip = model.getToolTipText(index); setToolTipText(toolTip); setText(value.toString()); + if(isSelected) { + setBackground(list.getSelectionBackground()); + setForeground(list.getSelectionForeground()); + super.setOpaque(true); // background won't work + } + else { + setBackground(list.getBackground()); + setForeground(list.getForeground()); + } return this; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java 2009-04-02 16:43:31 UTC (rev 2063) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/SimpleToolTipTableColumnRenderer.java 2009-04-03 10:21:13 UTC (rev 2064) @@ -1,13 +1,33 @@ +/* *##% + * Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cedric Pineau, 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.renderer; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import java.awt.Color; import java.awt.Component; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; /** - * Simple implementation of {@link ToolTipTableColumnRenderer} renderer + * Simple implementation of {@link TableCellRenderer} renderer * with a cache to store text and tooltip to be displayed. * * @@ -15,19 +35,23 @@ * * Internal cache will be based on two list (one for text, and one for doc) * - * This is a swixat extends, so just for swixat... * * @author chemit - * @see ToolTipListRenderer * @see ToolTipListModel */ -public class SimpleToolTipTableColumnRenderer extends JLabel implements TableCellRenderer { - /** the model to use */ +public class SimpleToolTipTableColumnRenderer extends JLabel implements + TableCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = 8016432041908541106L; + + /** The model to use */ protected ToolTipListModel model; - public SimpleToolTipTableColumnRenderer(ToolTipListModel model){ + public SimpleToolTipTableColumnRenderer(ToolTipListModel model) { this.model = model; } + /** * set the model to use * @@ -37,30 +61,22 @@ this.model = model; } - /** - * @param value model contrete value - * @param index index of the row - * @return the text to display (this is a pre-computed value) - */ - public String getText(Object value, int index) { - return model == null ? null : model.getText(index); - } - - /** - * @param value model concret object - * @param index index of the row - * @param text the text to be displayed - * @return the tooltip to display (this is a pre-computed value) - */ - public String getToolTip(Object value, int index, String text) { - return model == null ? null : model.getToolTipText(index); - } - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - String toolTip = model.getToolTipText(column); + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + String toolTip = model.getToolTipText(row); setToolTipText(toolTip); setText(value.toString()); + if(isSelected) { + setBackground(table.getSelectionBackground()); + setForeground(table.getSelectionForeground()); + super.setOpaque(true); // background won't work + } + else { + setBackground(table.getBackground()); + setForeground(table.getForeground()); + } + return this; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java 2009-04-02 16:43:31 UTC (rev 2063) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/renderer/ToolTipListModel.java 2009-04-03 10:21:13 UTC (rev 2064) @@ -1,3 +1,22 @@ +/* *##% + * Copyright (C) 2005 - 2009 + * Ifremer, Code Lutin, Cedric Pineau, 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.renderer; import java.util.List; @@ -2,2 +21,10 @@ +/** + * ToolTipListModel. + * + * @author chemit + * @version $Revision$ + * + * Mise a jour: $Date$ + */ public class ToolTipListModel { @@ -13,29 +40,31 @@ /** cache of tooltip */ protected List<String> tooltips; - public ToolTipListModel(List<String> texts, List<String> tooltips) { - this(texts,tooltips,null); + this(texts, tooltips, null); } - public ToolTipListModel(List<String> texts, List<String> tooltips, List objects) { + public ToolTipListModel(List<String> texts, List<String> tooltips, + List objects) { this.texts = texts; this.tooltips = tooltips; - this.objects=objects; + this.objects = objects; } public String getText(int index) { - return texts == null || index < 0 || texts.size() <= index ? null : texts.get(index); + return texts == null || index < 0 || texts.size() <= index ? null + : texts.get(index); } public String getToolTipText(int index) { - return tooltips == null || index < 0 || tooltips.size() <= index ? null : tooltips.get(index); + return tooltips == null || index < 0 || tooltips.size() <= index ? null + : tooltips.get(index); } public int getIndex(Object value) { int result = -1; if (objects != null) { - result = objects.indexOf(value); + result = objects.indexOf(value); } return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2009-04-02 16:43:31 UTC (rev 2063) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2009-04-03 10:21:13 UTC (rev 2064) @@ -1,3 +1,22 @@ +/* *##% + * Copyright (C) 2007 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, 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.util; import static org.codelutin.i18n.I18n._; @@ -57,8 +76,8 @@ f = klazz == null ? null : klazz.getField(fieldName); } catch (NoSuchFieldException e) { // should never appear - log.warn(_("isisfish.error.not.found.field.class", - fieldName, klazz)); + log.warn(_("isisfish.error.not.found.field.class", fieldName, + klazz)); //throw new IsisFishRuntimeException(e); } return f == null ? null : f.getAnnotation(Doc.class); @@ -102,10 +121,10 @@ */ public static String asString(Doc doc) { StringBuilder sb = new StringBuilder(); - if (doc == null) return ""; - if (!"".equals(doc.value())) { - sb.append('\'').append(doc.value()).append('\''); + if (doc == null) { + return ""; } + sb.append(doc.value()); boolean more = false; StringBuilder sb2 = new StringBuilder(); if (!"".equals(doc.author())) { @@ -120,10 +139,10 @@ sb2.append(", version: ").append(doc.version()); more = true; } - if (more) + if (more) { sb.append(" <").append(sb2.toString().substring(2)).append(">"); + } return sb.toString(); } - }

1 0

r2063 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 02 Apr '09

02 Apr '09

Author: chatellier Date: 2009-04-02 16:43:31 +0000 (Thu, 02 Apr 2009) New Revision: 2063 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Execute le rechargement des simulations dans un thread pour ne pas empecher l'UI de se charger. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-04-02 16:42:11 UTC (rev 2062) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-04-02 16:43:31 UTC (rev 2063) @@ -141,13 +141,19 @@ * * @param service SimulationService */ - public void reloadConfig(SimulationService service) { + public void reloadConfig(final SimulationService service) { if (monitorFile.canRead()) { try { properties.load(new FileInputStream(monitorFile)); - restartSimulationProgression(service); + // in a thead + // don't temporize UI loading + new Thread() { + public void run() { + restartSimulationProgression(service); + } + }.start(); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't reload monitor file", e);

1 0