Author: sletellier Date: 2008-11-21 15:55:19 +0000 (Fri, 21 Nov 2008) New Revision: 1617 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/Action.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.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/SensWizardPannelsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Suppression de commentaires inutils Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-11-21 15:55:19 UTC (rev 1617) @@ -78,7 +78,6 @@ import org.codelutin.util.VersionNumber; //import org.swixml.SwingEngine; import static javax.swing.JOptionPane.showOptionDialog; -import fr.ifremer.isisfish.ui.WelcomeAction; import fr.ifremer.isisfish.ui.WelcomeUI; /** @@ -383,7 +382,6 @@ // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.EXIT_ON_CLOSE); // add context - welcome.setContextValue(new WelcomeAction()); welcome.setVisible(true); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -46,15 +46,4 @@ <org.codelutin.widget.StatusBar/> </cell> </row> -</Table> -<!-- Fixme : ActionMonitor - <ActionMonitor postThreadCommand="xpath:setVisible($stopCommand, 'false')" - progressStartTime="5" messageTime="7" - messageDisplayer="$labelStatus" progressDisplayer="$progressStatus"/> - --> - - - -<!-- - <org.codelutin.widget.MemoryStatus/> ---> \ No newline at end of file +</Table> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeAction.java 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeAction.java 2008-11-21 15:55:19 UTC (rev 1617) @@ -1,28 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -/** - * - * @author letellier - */ -package fr.ifremer.isisfish.ui; - -public class WelcomeAction { - - public WelcomeAction(){ - - } - protected void updateVCS() { - - } - protected void showConfig() { - } - protected void showConfigVCS() { - } - protected void help() { - } - protected void aboutUI() {}; - -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -50,9 +50,6 @@ </tab> <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> <fr.ifremer.isisfish.ui.result.ResultView/> -<!-- - constructorParams='new ResultAction()' ---> </tab> <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'> <fr.ifremer.isisfish.ui.input.InputUI constructorParams='new InputAction()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -196,12 +196,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierSeasonChoice" onActionPerformed='refresh(false)'/> -<!-- -firstNull="true" -origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" -actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonChoice/selectedItem)" -<ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> ---> </cell> </row> <row> @@ -210,21 +204,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JPanel id='displayMetierSeason' layout='{new BorderLayout()}'/> - <!--fr.ifremer.isisfish.ui.widget.IntervalPanel id="displayMetierSeason"/--> - -<!-- Fixme : SeasonIntervalPanel - <SeasonIntervalPanel constraints='"displayMetierSeason"' id="displayMetierSeason" - origin="$MetierSeasonInfo"> - <PropertyChangeEvents onChange="Update" propertyName="first"> - <UpdateOrigin source="$displayMetierSeason/model/first" - target="$MetierSeasonInfo/firstMonth"/> - </PropertyChangeEvents> - <PropertyChangeEvents onChange="Update" propertyName="last"> - <UpdateOrigin source="$displayMetierSeason/model/last" - target="$MetierSeasonInfo/lastMonth"/> - </PropertyChangeEvents> - </SeasonIntervalPanel> ---> </cell> </row> <row> @@ -233,13 +212,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="metierZones" onValueChanged='zonesChanged()'> -<!-- Fixme : ListModel and ListSelectionEvents -origin="$MetierSeasonInfo/zone" renderer="name" -<ListModel origin="$FisheryRegion/zone"/> -<ListSelectionEvents onValueChanged="Update($metierZones/selectedValues)"/> ---> - </JList> + <JList id="metierZones" onValueChanged='zonesChanged()'/> </JScrollPane> </cell> </row> @@ -249,12 +222,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents -origin="$MetierSeasonInfo/seasonZoneComment" -<DocumentEvents onModified="Update($fieldMetierSeasonZoneComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldMetierSeasonZoneComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -98,12 +98,6 @@ <row> <cell columns='2' fill='both' weightx='1.0'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability'/> -<!-- Fixme : MatrixPanel and MatrixPanelEvents - <MatrixPanel constraints="fieldPopulationCapturability" id="fieldPopulationCapturability" - origin="copy($Population/capturability)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationCapturability/matrix), $Population/capturability)"/> - </MatrixPanel> ---> </cell> </row> <row> @@ -114,29 +108,16 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationCapturabilityComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents - origin="$Population/capturabilityComment" - <DocumentEvents onModified="Update($fieldPopulationCapturabilityComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldPopulationCapturabilityComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("Population", $Population);refreshView($inputCapturability)' ---> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("Population", $Population);refreshView($inputCapturability)' ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -202,9 +202,4 @@ </Table> </cell> </row> -</Table> -<!-- - <JTextField/> - <JTextField id="fieldPopulationGroupMinLength"/> - <JTextField id="fieldPopulationGroupMaxLength"/> ---> \ No newline at end of file +</Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -145,29 +145,16 @@ <row columns='4'> <cell fill='horizontal' weightx='1.0'> <JButton id="add" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- -actionCommand="input.InputPopulation.addEmigration($fieldPopulationMigrationEmigrationGroupChooser/selectedItem, $fieldPopulationMigrationEmigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationEmigrationCoefficient/text)" ---> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable'/> -<!-- Fixme : MatrixPanel - - <MatrixPanel constraints="PopulationMigrationEmigrationTable" id="PopulationMigrationEmigrationTable" - origin="copy($PopulationSeasonInfo/emigrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationEMigrationTable/matrix), $PopulationSeasonInfo/emigrationMatrix)"/> - </MatrixPanel> ---> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -actionCommand="input.InputPopulation.removeEmigration($PopulationMigrationEmigrationTable)" ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -154,12 +154,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldPopulationReproductionEquation" onActionPerformed='equationChanged()'/> -<!-- Fixme : ComboBoxModel - firstNull="true" - origin="$Population/reproductionEquation" renderer="name" - actionCommand="update($fieldPopulationReproductionEquation/selectedItem/content, $fieldScriptPopulationReproductionEquation/text) -<ComboBoxModel origin="fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext,'Reproduction')" /> ---> </cell> </row> <row> @@ -168,17 +162,11 @@ <row> <cell fill='horizontal'> <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()'/> -<!-- -actionCommand="input.Input.saveEquationAsModel($Population/reproductionEquation);refreshView($fieldPopulationReproductionEquation)" ---> </cell> </row> <row> <cell fill='horizontal'> <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> -<!-- Fixme : editor, DocumentEvents -actionCommand='input.Input.openEditor($Population/reproductionEquation/category,$Population/reproductionEquation/name,$Population/reproductionEquation/javaInterface,$Population/reproductionEquation/content,$fieldScriptPopulationReproductionEquation)' ---> </cell> </row> <row> @@ -192,21 +180,10 @@ <JScrollPane> <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false"/> </JScrollPane> -<!-- -<editor constraints="fieldScriptPopulationReproductionEquation" askIfNotSaved="false" id="fieldScriptPopulationReproductionEquation" - origin="org.codelutin.util.FileUtil.getTempFile($Population/reproductionEquation/content, '.java')"> - <DocumentEvents onModified="update"> - <UpdateOrigin - target="setEquationReproductionEquation($Population, $fieldScriptPopulationReproductionEquation/text)"/> - </DocumentEvents> - </editor> - ---> </cell> </row> <row> <cell anchor='east'> -<!-- FIXME : I18n, ou multilabel --> <JLabel text="Month Gap BetweenRepro Recruitment"/> </cell> <cell fill='horizontal' weightx='1.0'> @@ -218,13 +195,7 @@ <JLabel text="isisfish.populationRecruitment.recruitmentDistribution"/> </cell> <cell fill='both' weightx='1.0'> - <JTable/> -<!-- Fixme : MatrixPanel - <MatrixPanel constraints="fieldPopulationRecruitmentDistribution" id="fieldPopulationRecruitmentDistribution"xx - origin="copy($Population/recruitmentDistribution)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationRecruitmentDistribution/matrix), $Population/recruitmentDistribution)"/> - </MatrixPanel> ---> + <JTable/> </cell> </row> <row> @@ -233,9 +204,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='create()'/> -<!-- - actionCommand="input.InputPopulation.createRecruitmentDistribution($Population)" ---> </cell> </row> <row> @@ -244,12 +212,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" onKeyTyped='commentChanged()'> -<!-- - origin="$Population/recruitmentComment" -<DocumentEvents onRemoveUpdate="Update($fieldPopulationRecruitmentComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldPopulationRecruitmentComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> @@ -262,17 +225,9 @@ <row> <cell fill='horizontal' weightx='0.5'> <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationRecruitment)' ---> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationRecruitment)' ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -86,7 +86,4 @@ </tab> </JTabbedPane> <JButton text="isisfish.input.continueGears" constraints='BorderLayout.SOUTH' onActionPerformed='goToGear()'/> -<!-- - actionCommand="UIHelper.setTreeSelection('Gears')" ---> </JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -169,42 +169,17 @@ <row> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="populationZonesPresence" onMouseClicked='presenceChanged()'> -<!-- Fixme : ListModel - origin="getPopulationZone($Population)" - renderer="name" - <ListModel origin="$FisheryRegion/zone"/> - <ListSelectionEvents - onValueChanged="Update($populationZonesPresence/selectedValues, $Population/populationZone, refreshViewPattern('fieldPopulationZones.*'))"/> ---> - </JList> + <JList id="populationZonesPresence" onMouseClicked='presenceChanged()'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesReproduction" onMouseClicked='reproductionChanged()'> -<!-- Fixme : ListModel - origin="getReproductionZone($Population)" - renderer="name" - <ListModel origin="getPopulationZone($Population)"/> - <ListSelectionEvents - onValueChanged="Update($fieldPopulationZonesReproduction/selectedValues, $Population/reproductionZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> - ---> - </JList> + <JList id="fieldPopulationZonesReproduction" onMouseClicked='reproductionChanged()'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesRecruitment" onMouseClicked='recruitementChanged()'> -<!-- Fixme : ListModel - origin="getRecruitmentZone($Population)" - renderer="name" -<ListModel origin="getPopulationZone($Population)"/> - <ListSelectionEvents - onValueChanged="Update($fieldPopulationZonesRecruitment/selectedValues, $Population/recruitmentZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> ---> - </JList> + <JList id="fieldPopulationZonesRecruitment" onMouseClicked='recruitementChanged()'/> </JScrollPane> </cell> </row> @@ -216,14 +191,6 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru'/> - <!-- Fixme : MatrixPanel - <MatrixPanel constraints='"fieldPopulationMappingZoneReproZoneRecru"' - id="fieldPopulationMappingZoneReproZoneRecru" - origin="copy($Population/mappingZoneReproZoneRecru)"> - <MatrixPanelEvents - onMatrixChanged="Update(copy($fieldPopulationMappingZoneReproZoneRecru/matrix), $Population/mappingZoneReproZoneRecru)"/> - </MatrixPanel> ---> </cell> </row> <row> @@ -232,20 +199,11 @@ <row> <cell fill='horizontal' weightx='0.5'> <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($fieldPopulationMappingZoneReproZoneRecru);refreshView($inputPopulationZones)' ---> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> - -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationZones)' ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -173,10 +173,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSelectivityPopulation"/> -<!-- Fixme : ComboBoxModel -renderer="name" firstNull="true" -<ComboBoxModel origin="$FisheryRegion/species/population" iterate="true"/> ---> </cell> </row> <row> @@ -185,11 +181,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSelectivityEquation" onActionPerformed='equationChanged()'/> -<!-- Fixme : ComboBoxModel - renderer="name" firstNull="true" - actionCommand="update($fieldSelectivityEquation/selectedItem/content, $fieldSelectivityScript/text)" - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Selectivity")'/> ---> </cell> </row> <row> @@ -198,17 +189,11 @@ <row> <cell fill='horizontal'> <JButton id='saveModel' text="isisfish.common.saveModel" onActionPerformed='saveAsModel()'/> -<!-- - actionCommand='input.Input.saveAsModel("Selectivity", "Java", $fieldSelectivityScript/text);refreshView($fieldSelectivityEquation)' ---> </cell> </row> <row> <cell fill='horizontal'> <JButton id='openEditor' text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> -<!-- - actionCommand='input.Input.openEditor("Selectivity","new","fr.ifremer.isisfish.equation.SelectivityEquation",$fieldSelectivityScript/text,$fieldSelectivityScript)' ---> </cell> </row> <row> @@ -233,24 +218,12 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="buttonAddSelectivity" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- - origin="$Gear" - actionCommand="input.InputGear.addSelectivity($Gear, $fieldSelectivityPopulation/selectedItem, $fieldSelectivityScript/text)" ---> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JTable id="selectivityTable"> -<!-- - <tableModel origin="$Gear/populationSelectivity"> - <column title="Population" property="population"/> - <column title="Equation" property="equation" editable="true"> - <tableColumnEditor><EquationTableEditor/></tableColumnEditor> - </column> - </tableModel> ---> </JTable> </JScrollPane> </cell> @@ -258,26 +231,14 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="buttonSelectivityRemove" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- - origin="$Gear/populationSelectivity" - actionCommand="input.InputGear.removeSelectivity($Gear, getPopulationSelectivity($Gear)[$selectivityTable/selectedRow + 1])" ---> </cell> </row> <row> <cell fill='horizontal' weightx='1.0'> <JButton id='save' text="isisfish.common.save" onActionPerformed='save()' enabled='false'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("Gear", $Gear);refreshView($inputSelectivity)' ---> </cell> <cell fill='horizontal' weightx='1.0'> <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()' enabled='false'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputSelectivity)' ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -217,10 +217,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldSetOfVesselsName" onKeyTyped='nameChanged()'/> -<!-- Fixmee : DocumentEvents - origin="$SetOfVessels/name" -<DocumentEvents onModified="Update($fieldSetOfVesselsName/text)"/> ---> </cell> </row> <row> @@ -229,11 +225,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()'/> -<!-- Fixme : ComboBoxModel - origin="$SetOfVessels/port" renderer="name" firstNull="true" - actionCommand="update($fieldSetOfVesselsPort/selectedItem, $SetOfVessels/port)" - <ComboBoxModel origin="$FisheryRegion/port"/> ---> </cell> </row> <row> @@ -242,11 +233,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()'/> -<!-- Fixme : ComboBoxModel - origin="$SetOfVessels/vesselType" renderer="name" firstNull="true" - actionCommand="update($fieldSetOfVesselsVesselType/selectedItem, $SetOfVessels/vesselType)" -<ComboBoxModel origin="$FisheryRegion/vesselType"/> ---> </cell> </row> <row> @@ -255,11 +241,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldSetOfVesselsNumberOfVessels" onKeyTyped='numberOfVesselsChanged()'/> - -<!-- - origin="$SetOfVessels/numberOfVessels" - <DocumentEvents onModified="Update($fieldSetOfVesselsNumberOfVessels/text)"/> ---> </cell> </row> <row> @@ -268,11 +249,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldSetOfVesselsFixedCosts" onKeyTyped='fixedCostsChanged()'/> - -<!-- - origin="$SetOfVessels/fixedCosts" -<DocumentEvents onModified="Update($fieldSetOfVesselsFixedCosts/text)"/> ---> </cell> </row> <row> @@ -289,9 +265,6 @@ <row> <cell fill='horizontal'> <JButton text="isisfish.common.saveModel" onActionPerformed='saveAsModel()'/> -<!-- - actionCommand='input.Input.saveEquationAsModel($SetOfVessels/technicalEfficiencyEquation);refreshView($fieldSetOfVesselsTechnicalEfficiency)' ---> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -55,8 +55,4 @@ <tab title='{_("isisfish.effortDescription.title")}'><EffortDescriptionUI id='effortDescriptionUI' constructorParams='getContextValue(InputAction.class)'/></tab> </JTabbedPane> <JButton text="isisfish.input.continueStrategies" constraints='BorderLayout.SOUTH' onActionPerformed='goToStrategies()'/> -<!-- - - actionCommand="UIHelper.setTreeSelection('Strategies')" ---> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -47,10 +47,4 @@ ]]></script> <tab title='{_("isisfish.strategy.title")}'><StrategyTabUI id='strategyTabUI' constructorParams='getContextValue(InputAction.class)'/></tab> <tab title='{_("isisfish.strategyMonthInfo.title")}'><StrategyMonthInfoUI id='strategyMonthInfoUI' constructorParams='getContextValue(InputAction.class)'/></tab> -<!-- -isisfish.strategy.title -isisfish.strategyMonthInfo.title - <xpanel xml="input/Strategy.xml" id="inputStrategy"/> - <xpanel xml="input/StrategyMonthInfo.xml" id="inputStrategyMonthInfo"/> ---> </JTabbedPane> Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/Action.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/Action.java 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/Action.java 2008-11-21 15:55:19 UTC (rev 1617) @@ -1,1150 +0,0 @@ -///* *##% -// * Copyright (C) 2005 -// * 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. -// *##%*/ -// -///* * -// * File.java -// * -// * Created: 18 août 2005 15:07:36 CEST -// * -// * @author Grégoire DESSARD <dessard at codelutin.com> -// * @version $Revision$ -// * -// * Last update: $Date$ -// * by : $Author$ -// */ -// -//package fr.ifremer.isisfish.ui.script; -// -//import fr.ifremer.isisfish.IsisFish; -//import fr.ifremer.isisfish.datastore.AnalysePlanStorage; -//import fr.ifremer.isisfish.datastore.CodeSourceStorage; -//import fr.ifremer.isisfish.datastore.ExportStorage; -//import fr.ifremer.isisfish.datastore.FormuleStorage; -//import fr.ifremer.isisfish.datastore.JavaSourceStorage; -//import fr.ifremer.isisfish.datastore.RuleStorage; -//import fr.ifremer.isisfish.datastore.ScriptStorage; -//import fr.ifremer.isisfish.datastore.SimulatorStorage; -//import static fr.ifremer.isisfish.equation.Language.JAVA; -//import fr.ifremer.isisfish.ui.UIHelper; -////import fr.ifremer.isisfish.ui.ScriptActionHelper; -////import fr.ifremer.isisfish.versionning.vcsSvn.SVNMigrateHelper; -////import org.codelutin.vcs.VCSState; -////import org.codelutin.vcs.VCSAction; -////import org.codelutin.vcs.VCSFileState; -////import org.codelutin.vcs.VCSFileStateManager; -////import org.codelutin.vcs.VCSHelper; -////import fr.ifremer.isisfish.versionning.ui.VCSUIHelper; -//import org.apache.commons.logging.Log; -//import static org.apache.commons.logging.LogFactory.getLog; -//import static org.codelutin.i18n.I18nf._; -////import org.swixat.databinding.JTreeModel; -////import org.swixat.databinding.JTreeNode; -////import org.swixat.databinding.TreeNodeWrapper; -////import org.swixat.framework.AbstractFrame; -////import org.swixat.framework.OutputView; -////import org.swixat.model.Context; -// -//import javax.swing.JOptionPane; -//import javax.swing.JTree; -//import javax.swing.tree.TreePath; -//import java.io.ByteArrayOutputStream; -//import java.io.File; -//import java.io.FileFilter; -//import java.io.PrintStream; -//import java.io.PrintWriter; -//import java.io.StringWriter; -//import java.lang.reflect.Method; -//import java.text.MessageFormat; -//import java.text.SimpleDateFormat; -//import java.util.ArrayList; -//import java.util.Date; -//import java.util.List; -//import org.codelutin.util.FileUtil; -// -///** -// * @author dessard -// * @author tchemit -// */ -//public class Action { -// -// /** Clef du stockage dans le context de scriptStorage */ -// private static final String SCRIPT_STORAGE = "ScriptStorage"; -// /** Clef du stockage dans le context de scriptType */ -// private static final String SCRIPT_TYPE = "ScriptType"; -// /** Clef du stockage dans le log de la derniere action */ -// private static final String ACTION_LOG = "ActionLog"; -// -// private static final String CAN_COMMIT = "canCommit"; -// private static final String CAN_UPDATE = "canUpdate"; -// private static final String CAN_DIFF = "canDiff"; -// private static final String CAN_DELETE= "canDelete"; -// -// private static final String VCS_STATE = "VCSState"; -// public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm"); -// -// //public static Object opened(Context uiContext, AbstractFrame frame) { -// public static Object opened(Context uiContext) { -// -// // updateVCSContext(uiContext,null,-1); -// -// // TODO compute if this action is allowed or not, this permit -// // to disable some action in ui -// uiContext.setData(CAN_COMMIT, false); -// uiContext.setData(CAN_UPDATE, false); -// uiContext.setData(CAN_DELETE, false); -// uiContext.setData(CAN_DIFF, false); -// -// return null; -// } -// -// public static Object loadScript(Context uiContext, AbstractFrame frame, -// JTree tree, String scriptType, String filename) { -// log.info("loadScript called [" + scriptType + "/" + filename + "]"); -// -// int pathCount = tree.getSelectionPath().getPathCount(); -// ScriptMapping mapping = guessMapping(tree); -// -// CodeSourceStorage script = null; -// -// try { -// if (mapping == null || pathCount < 3 || filename == null) { -// scriptType = null; -// return null; -// } -// -// switch (mapping) { -// case EquationModel: -// if (pathCount < 4) return null; -// TreePath path = tree.getSelectionPath(); -// TreeNodeWrapper categoryNode = (TreeNodeWrapper) path.getPathComponent(2); -// String category = (String) categoryNode.getUserObject(); -// script = FormuleStorage.getFormule(category, filename); -// break; -// case Rule: -// script = RuleStorage.getRule(filename); -// break; -// case AnalysePlan: -// script = AnalysePlanStorage.getAnalysePlan(filename); -// break; -// case Export: -// script = ExportStorage.getExport(filename); -// break; -// case Script: -// script = ScriptStorage.getScript(filename); -// break; -// case Simulator: -// script = SimulatorStorage.getSimulator(filename); -// break; -// default: -// log.fatal("ScriptType unknown: " + scriptType); -// } -// -// //frame.setInfoText(_("isisfish.message.load.finished")); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.load",filename, eee.getMessage()),eee); -// -// } finally { -// //TC We must delete log area content each time we load a new script -// //TC and also delete editor view -// uiContext.setData(ACTION_LOG, ""); -// uiContext.setData(SCRIPT_STORAGE, script); -// uiContext.setData(SCRIPT_TYPE, scriptType); -// -// // FIXME a remettre en place -// // updateVCSContext(uiContext,script,script==null?-1:script.getFile().lastModified()); -// -// frame.refreshView("scriptJedit"); -// frame.refreshView("actionLogArea"); -// frame.refreshView("buttonBar"); -// frame.refreshView("scriptMenuBar"); -// } -// return null; -// } -// -//// //TODO this method should be call when a evetn occurs in editor to compute -//// // TODO new filte state -//// public static void updateVCSState(Context uiContext, CodeSourceStorage script,String content) { -//// VCSFileState state = (VCSFileState) uiContext.getData(VCS_STATE); -//// if (state==null) { -//// return; -//// } -//// //TODO finish it -//// log.info("state "+state); -//// } -// -//// private static void updateVCSContext(Context uiContext, CodeSourceStorage script,long oldTilestamp) { -//// Boolean canCommit=false; -//// Boolean canUpdate=false; -//// Boolean canDelete=false; -//// Boolean canDiff=false; -//// boolean write=false; -//// if (script!=null && VCSHelper.isConnected()) { -//// write = VCSHelper.hasWriteAccess(); -//// VCSFileState state = VCSFileStateManager.getState(oldTilestamp, script.getFile()); -//// uiContext.setData(VCS_STATE, state); -//// VCSState vcsState = state.getState(); -//// canCommit = write && vcsState != VCSState.OUT_OF_DATE && vcsState != VCSState.OUT_OF_DATE_AND_MODIFIED; -//// //canCommit = write && vcsState.authorizeAction(VCSAction.COMMIT,VCSAction.ADD); -//// canDelete = write && vcsState != VCSState.UNVERSIONNED; -//// //canDelete = write && vcsState!= VCSState.UNVERSIONNED && vcsState.authorizeAction(VCSAction.DELETE); -//// canUpdate = vcsState != VCSState.UNVERSIONNED && (vcsState == VCSState.OUT_OF_DATE || vcsState != VCSState.OUT_OF_DATE_AND_MODIFIED); -//// //canUpdate= vcsState.authorizeAction(VCSAction.UPDATE,VCSAction.OVERWRITE_AND_UPDATE,VCSAction.REVERT); -//// canDiff = vcsState.authorizeAction(VCSAction.DIFF); -//// log.info(vcsState); -//// } -//// log.info("can write " + (write)); -//// log.info("can commit " + (canCommit)); -//// log.info("can update " + (canUpdate)); -//// log.info("can delete " + (canDelete)); -//// log.info("can diff "+(canDiff)); -//// -//// -//// uiContext.setData(CAN_COMMIT, canCommit); -//// uiContext.setData(CAN_UPDATE, canUpdate); -//// uiContext.setData(CAN_DELETE, canDelete); -//// uiContext.setData(CAN_DIFF, canDiff); -//// } -// -// /** -// * Creer un nouveau script, ici un script peut-etre un Script, un Simulator, -// * un Export. -// * -// * @param uiContext TODO -// * @param frame TODO -// * @param scriptType le type que l'on souhaite Script, Simulator, -// * ou Export. -// * @param jmodel TODO -// * @param tree TODO -// * @return TODO -// */ -// public static Object newScript(Context uiContext, AbstractFrame frame, -// JTree tree, JTreeModel jmodel, -// String scriptType) { -// log.info("newScript called [" + scriptType + "] " + uiContext); -// -// String filename=null; -// Exception e; -// try { -// filename = JOptionPane.showInputDialog(_("isisfish.message.new.filename")); -// -// if (filename == null) { -// //TC Fix bug when you cancel dialog, filename is null -// // just keep action -// return null; -// } -// // Vérifie qu'il n'y pas de caractères spéciaux. Seul les caractre -// // de a à z (majuscule ou minuscule) ainsi que les nombres sont -// // autorisés. + pour signifier qu'il doit y avoir -// // au moins 1 caractère. -// String realFilename; -// String category; -// ScriptMapping mapping = ScriptMapping.valueOf(scriptType); -// if (mapping == null) { -// e = new RuntimeException("ScriptType unknown: " + scriptType); -// return returnError(_("isisfish.error.script.create",filename, e.getMessage()),e); -// } -// -// int pos = filename.lastIndexOf('/'); -// if (pos != -1) { -// if (mapping!= ScriptMapping.EquationModel) { -// // interdit pour le moment ? -// String message = _("isisfish.error.invalid.file.name", filename); -// e = new RuntimeException(message); -// return returnError(_("isisfish.error.script.create",filename, e.getMessage()),e); -// } -// // il y a un sous type à traiter -// if (pos == filename.length() - 1) { -// String message = _("isisfish.error.invalid.file.name", filename); -// e = new RuntimeException(message); -// return returnError(_("isisfish.error.script.create",filename, e.getMessage()),e); -// } -// realFilename = filename.substring(filename.lastIndexOf('/') + 1); -// category = filename.substring(0, filename.lastIndexOf('/')); -// } else { -// realFilename = filename; -// category = ""; -// } -// if (!realFilename.matches("[A-Z0-9_][a-zA-Z0-9_]*")) { -// String message = _("isisfish.error.invalid.file.name", filename); -// e = new RuntimeException(message); -// return returnError(_("isisfish.error.script.create",filename, e.getMessage()),e); -// } -// //TODO do test on category -// CodeSourceStorage script = null; -// String template; -// TreeNodeWrapper parentNode = null; -// -// template = mapping.getDefaultContent(); -// switch (mapping) { -// case EquationModel: -// if (!category.isEmpty()) { -// // on utilise la category passée dans le nom -// parentNode = (TreeNodeWrapper) jmodel.getNode(category); -// if (parentNode == null) { -// parentNode = (TreeNodeWrapper) jmodel.getNode(scriptType); -// JTreeNode jparentNode = parentNode.getWrapped(); -// JTreeNode jnode = (JTreeNode) jparentNode.getComponent(0); -// jnode.setName(category); -// parentNode.addNode(jnode, category); -// parentNode = (TreeNodeWrapper) jmodel.getNode(category); -// UIHelper.setTreeSelection(tree, jmodel, category); -// } -// } else { -// // on utilise la category dans la navigation -// TreePath path = tree.getSelectionPath(); -// if (path.getPath().length < 2) { -// // fatal error no category found, and was required -// String message = _("isisfish.error.invalid.category.name", filename); -// e = new RuntimeException(message); -// return returnError(_("isisfish.error.script.create", filename, e.getMessage()), e); -// } -// TreeNodeWrapper categotyNode = (TreeNodeWrapper) path.getPathComponent(2); -// parentNode = categotyNode; -// category = String.valueOf(categotyNode.getUserObject()); -// } -// -// script = FormuleStorage.createFormule(category, realFilename, JAVA); -// break; -// case AnalysePlan: -// script = AnalysePlanStorage.getAnalysePlan(filename); -// break; -// case Export: -// script = ExportStorage.getExport(filename); -// break; -// case Rule: -// script = RuleStorage.getRule(filename); -// break; -// case Script: -// script = ScriptStorage.getScript(filename); -// break; -// case Simulator: -// script = SimulatorStorage.getSimulator(filename); -// break; -// default: -// log.fatal("ScriptType unknown: " + scriptType); -// } -// -// if (script.exists()) { -// // Message d'erreur si le fichier existe en local. -// String message = _("isisfish.error.file.already.exists", filename); -// e = new RuntimeException(message); -// return returnError(_("isisfish.error.script.create",filename, e.getMessage()),e); -// } -// -// // add default script content -// String content = MessageFormat.format(template, -// category.isEmpty() ? "" : '.' + category.replaceAll("\\/", "."), -// realFilename, -// new Date(), -// IsisFish.config.getUserName(), -// IsisFish.config.getUserMail()); -// script.setContent(content); -// // ajout du nouveau script dans l'arbre -// if (parentNode == null) { -// parentNode = (TreeNodeWrapper) jmodel.getNode(scriptType); -// } -// if (parentNode != null) { -// JTreeNode jparentNode = parentNode.getWrapped(); -// JTreeNode jnode = (JTreeNode) jparentNode.getComponent(0); -// parentNode.addNode(jnode, script.getName()); -// } -// // selection du nouveau noeud, ce qui appel la methode load -// UIHelper.setTreeSelection(tree, jmodel, script.getName()); -// -//// uiContext.setData(SCRIPT_STORAGE, script); -//// uiContext.setData(SCRIPT_TYPE, scriptType); -//// frame.refreshView("scriptJedit"); -//// frame.refreshView("buttonBar"); -//// frame.refreshView("scriptMenuBar"); -// frame.setInfoText(_("isisfish.message.creation.done", script.getName())); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.create",filename, eee.getMessage()),eee); -// } -// return null; -// -// } -// -// -// public static Object saveScript(Context uiContext, AbstractFrame frame, -// CodeSourceStorage script, String content) { -// log.info("saveScript called [" + script.getName() + "] " + uiContext); -// try { -// script.setContent(content); -// frame.setInfoText(_("isisfish.message.save.finished")); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.save", script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// public static Object deleteScript(Context uiContext, AbstractFrame frame, -// JTree tree, CodeSourceStorage script, -// boolean remote) { -// log.debug("deleteScript called"); -// ScriptMapping mapping = guessMapping(tree); -// if (mapping == null) { -// return null; -// } -// try { -// int resp = JOptionPane.showConfirmDialog(frame.getRootComponent(),_("isisfish.message.confirm.remove.script" , script.getName())); -// //TODO desactive editor -// //TODO Review this because after delete fi file saw previously -// //TODO modified, it ask if we want to save, and then we have -// //TODO again the file in panel but not in tree panel ? -// if (resp == JOptionPane.YES_OPTION) { -// -// script.delete(remote); -// if (script.getFile().exists()) { -// RuntimeException exception = new RuntimeException("file could not be deleted"); -// return returnError(_("isisfish.error.script.delete",script.getFile(), exception.getMessage()), exception); -// } -// uiContext.setData(SCRIPT_STORAGE, null); -// -// frame.refreshView(); -// frame.setInfoText(_("isisfish.message.delete.finished")); -// } else { -// frame.setInfoText(_("isisfish.message.delete.canceled")); -// } -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.delete",script==null?null:script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// public static Object commitScript(Context uiContext, AbstractFrame frame, -// JTree tree, CodeSourceStorage script, -// String content) { -// log.debug("commitScript called for " + uiContext); -// -// ScriptMapping mapping = guessMapping(tree); -// if (mapping == null) { -// return null; -// } -// try { -// // save script before commit -// script.setContent(content); -// -// String msg = JOptionPane.showInputDialog(_("Indiquez vos modifications")); -// -//// String msg = VCSUIHelper.getCommitMessage(script.getFile(), true); -// if (msg == null) { -// frame.setInfoText(_("isisfish.message.commit.cancelled")); -// } else { -// script.commit(msg); -// script.reload(); -// frame.refreshView(); -// frame.setInfoText(_("isisfish.message.commit.finished")); -// } -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.commit",script==null?null:script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// -// //public static Object updateScript(Context uiContext, AbstractFrame frame, -// public static Object updateScript(Context uiContext, AbstractFrame frame, -// JTree tree, CodeSourceStorage script) { -// log.debug("updateScript called for " + uiContext); -// -// ScriptMapping mapping = guessMapping(tree); -// if (mapping == null) { -// return null; -// } -// //TODO Use VCS UI dialog -// //TODO Use FileState new mecanism to obtain state -// try { -// script.update(); -// script.reload(); -// frame.refreshView(); -// frame.setInfoText(_("isisfish.message.update.finished")); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.update",script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// public static Object diffScript(Context uiContext, AbstractFrame frame, -// JTree tree, CodeSourceStorage script, -// String content) { -// log.debug("commitScript called"); -//// TODO a refaire -// throw new UnsupportedOperationException("En reparation"); -//// ScriptMapping mapping = guessMapping(tree); -//// if (mapping == null) return null; -//// try { -//// long oldTilestamp = script.getFile().lastModified(); -//// // save script before commit -//// script.setContent(content); -//// -//// String diff; -//// VCSFileState state = VCSFileStateManager.getState(oldTilestamp,script.getFile()); -//// boolean canDiff = state.getState().authorizeAction(VCSAction.DIFF); -//// if (canDiff) { -//// diff = script.diff(); -//// } else { -//// diff = _("isisfish.message.no.diff" , script.getFile(),state.getState().libelle() ); -//// } -//// -//// frame.setInfoText(_("isisfish.message.diff.finished" , state.getState().libelle() )); -//// uiContext.setData(ACTION_LOG, diff); -//// frame.refreshView("actionLogArea"); -//// -//// } catch (Exception eee) { -//// return returnError(_("isisfish.error.script.diff",script==null?null:script.getFile(), eee.getMessage()),eee); -//// } -//// return null; -// } -// -// public static Object checkScript(Context uiContext, AbstractFrame frame, -// JavaSourceStorage script, String content) { -// log.debug("checkScript called"); -// try { -// // save script before commit -// script.setContent(content); -// -// StringWriter result = new StringWriter(); -// PrintWriter out = new PrintWriter(result); -// int compileResult; -// Exception e=null; -// try { -// compileResult = script.compile(false, out); -// } catch (Exception eee) { -// compileResult = -1; -// e=eee; -// } -// if (compileResult != 0) { -// out.flush(); -// uiContext.setData(ACTION_LOG, result.toString()); -// frame.refreshView("actionLogArea"); -// if (e==null) { -// e = new RuntimeException("there is some problem in script"); -// } -// return returnError(_("isisfish.error.script.evaluate",script.getFile(), e.getMessage()), e); -// } -// uiContext.setData(ACTION_LOG, "ok"); -// frame.refreshView("actionLogArea"); -// frame.setInfoText(_("isisfish.message.check.finished")); -// -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.check",script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// @SuppressWarnings("unchecked") -// public static Object evaluateScript(Context uiContext, AbstractFrame frame, -// JavaSourceStorage script, String content) { -// log.debug("evaluateScript called"); -// try { -// Object checkResult = checkScript(uiContext, frame, script, content); -// if (checkResult != null) { -// return checkResult; -// } -// -// ByteArrayOutputStream result = new ByteArrayOutputStream(); -// PrintStream out = new PrintStream(result); -// PrintStream err = new PrintStream(result); -// -// PrintStream oldOut = System.out; -// PrintStream oldErr = System.err; -// -// try { -// System.setOut(out); -// System.setErr(err); -// Class clazz = script.getCodeClass(); -// Method main = clazz.getMethod("main", String[].class); -// //noinspection RedundantArrayCreation -// main.invoke(null, new Object[]{new String[]{}}); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.evaluate", script.getFile(), eee.getMessage()), eee); -// } finally { -// System.setOut(oldOut); -// System.setErr(oldErr); -// uiContext.setData(ACTION_LOG, result.toString()); -// frame.refreshView("actionLogArea"); -// } -// frame.setInfoText(_("isisfish.message.evaluation.finished")); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.evaluate",script.getFile(), eee.getMessage()),eee); -// } -// return null; -// } -// -// /** -// * Import des scripts -// * -// * @param uiContext TODO -// * @param frame TODO -// * @param tree TODO -// * @param jmodel TODO -// * @param script TODO -// * @return null si tout est ok, sinon un Error -// */ -// public static Object importScript(Context uiContext, AbstractFrame frame,JTree tree,JTreeModel jmodel,CodeSourceStorage script) { -// log.debug("importScript " + uiContext + " : " + frame + ":" + tree); -// try { -// boolean fired = ScriptActionHelper.importScript(null, false, true, frame); -// if (!fired) { -// frame.setInfoText(_("isisfish.message.import.scripts.file.cancelled")); -// return null; -// } -// frame.setInfoText(_("isisfish.message.import.scripts.file.done")); -// frame.refreshView(); -// if (script!=null) { -// UIHelper.setTreeSelection(tree, jmodel, script.getName()); -// } -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.import", eee.getMessage()), eee); -// } -// return null; -// } -// -// public static Object returnError(String s, Exception eee) { -// log.error(s,eee); -// return new OutputView("Error.xml", "error", s); -// } -// -// -// /** -// * Exporte le(s) script(s) sélectionnés dans l'arbe. -// * <br>L'arbre doit avoir au moins un script de selectionne -// * -// * @param uiContext swixat context -// * @param frame swiaxt frame -// * @param tree tree contaings script -// * @return <code>null</code> if everything is ok, -// * an <code>OutputVie<</code> with an error to display otherwise -// */ -// public static Object exportScript(Context uiContext, AbstractFrame frame,JTree tree) { -// log.debug("exportScript " + uiContext); -// TreePath[] selectedPaths = tree.getSelectionPaths(); -// if (selectedPaths.length == 0) { -// return null; -// } -// // first step : acquire list of files required -// int prefixLength = IsisFish.config.getDatabaseDirectory().getAbsolutePath().length() + 1; -// List<String> listFiles = extractFiles(prefixLength, selectedPaths); -// if (listFiles.isEmpty()) { -// return null; -// } -// try { -// boolean fired = ScriptActionHelper.exportScript(null, listFiles, false, true, frame); -// String message; -// if (!fired) { -// message = _("isisfish.message.export.cancelled"); -// } else { -// message = _("isisfish.message.export.done"); -// } -// frame.setInfoText(message); -// } catch (Exception eee) { -// return returnError(_("isisfish.error.script.export", eee.getMessage()), eee); -// } -// return null; -// } -// -// protected static ScriptMapping guessMapping(JTree tree) throws IllegalArgumentException { -// int pathCount = tree.getSelectionPath().getPathCount(); -// -// if (pathCount < 2) { -// throw new IllegalArgumentException("no mapping found..."); -// } -// String scriptType = tree.getSelectionPath().getPath()[1].toString(); -// return ScriptMapping.valueOf(scriptType); -// } -// -// protected static List<String> extractFiles(int prefixLength,TreePath[] selectedPaths) { -// List<String> result = new ArrayList<String>(); -// List<File> dirFound = new ArrayList<File>(); -// List<File> dirWithFileFound = new ArrayList<File>(); -// -// for (TreePath selectedPath : selectedPaths) { -// -// TreeNodeWrapper node = (TreeNodeWrapper) selectedPath.getPathComponent(1); -// String moduleDisplayName = String.valueOf(node.getUserObject()); -// File file = ScriptMapping.valueOf(moduleDisplayName).getModule(); -// int nbPaths = selectedPath.getPathCount(); -// if (nbPaths > 2) -// for (int i = 2; i < nbPaths; i++) { -// node = (TreeNodeWrapper) selectedPath.getPathComponent(i); -// String pathName = String.valueOf(node.getUserObject()); -// file = new File(file, pathName); -// } -// if (file.isFile()) { -// File parentFile = file.getParentFile(); -// if (!dirFound.contains(parentFile)) dirFound.add(parentFile); -// dirWithFileFound.add(parentFile); -// result.add(file.getAbsolutePath().substring(prefixLength)); -// } else { -// // mark the file -// dirFound.add(file); -// } -// } -// -// // keep only user selected directories -// dirFound.removeAll(dirWithFileFound); -// dirWithFileFound.clear(); -// -// if (!dirFound.isEmpty()) { -// List<File> listF = new ArrayList<File>(); -// // there is some directories selected by user -// for (File dir : dirFound) { -// // take all files and directories in the dir -// // (without VCS and data dirs) -//// SVNMigrateHelper.grabbFiles(dir, excludeFilter, listF); -// -// -// // getFilteredElements use include file filter, we inverse excludeFilter -// FileFilter filter = new FileFilter() { -// FileFilter excludeFilter = getSCRIPT_FILE_FILTER(); -// public boolean accept(File pathname) { -// return !excludeFilter.accept(pathname); -// } -// }; -// listF.addAll(FileUtil.getFilteredElements(dir, filter, true)); -// } -// for (File file : listF) -// result.add(file.getAbsolutePath().substring(prefixLength)); -// listF.clear(); -// } -// dirFound.clear(); -// return result; -// } -// -// /** enum to encapsulate a script module */ -// enum ScriptMapping { -// -// Script(ScriptStorage.getScriptDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email -// */ -// "package scripts{0};\n" + -// "\n" + -// "import org.apache.commons.logging.Log;\n" + -// "import org.apache.commons.logging.LogFactory;\n" + -// "\n" + -// "import fr.ifremer.isisfish.util.Doc;\n" + -// "\n" + -// "import org.codelutin.math.matrix.*;\n" + -// "\n" + -// "import fr.ifremer.isisfish.entities.*;\n" + -// "\n" + -// "/**\n" + -// " * {0}.{1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update: $Date$\n" + -// //" * by : $Author$\n" + -// " */\n" + -// "public class {1} '{'\n" + -// "\n" + -// " /** to use log facility, just put in your code: log.info(\"...\"); */\n" + -// " static private Log log = LogFactory.getLog({1}.class);\n" + -// "\n" + -// " // add your method here\n" + -// "'}'\n"), -// -// Simulator(SimulatorStorage.getSimulatorDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email -// */ -// "package simulators{0};\n" + -// "\n" + -// "import org.apache.commons.logging.Log;\n" + -// "import org.apache.commons.logging.LogFactory;\n" + -// "\n" + -// "import org.codelutin.math.matrix.*;\n" + -// "\n" + -// "import fr.ifremer.isisfish.util.Doc;\n" + -// "import fr.ifremer.isisfish.entities.*;\n" + -// "import fr.ifremer.isisfish.simulator.Simulator;\n" + -// "import fr.ifremer.isisfish.simulator.SimulationContext;\n" + -// "\n" + -// "/**\n" + -// " * {1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update$\n" + -// //" * by : $Author$\n" + -// " */\n" + -// "public class {1} implements Simulator '{'\n" + -// "\n" + -// " /** to use log facility, just put in your code: log.info(\"...\"); */\n" + -// " static private Log log = LogFactory.getLog({1}.class);\n" + -// "\n" + -// " public void simulate(SimulationContext context) throws Exception '{'\n" + -// " // put your code here\n" + -// " '}'\n" + -// "\n" + -// "'}'\n"), -// Export(ExportStorage.getExportDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email -// */ -// "package exports{0};\n" + -// "\n" + -// "import org.apache.commons.logging.Log;\n" + -// "import org.apache.commons.logging.LogFactory;\n" + -// "\n" + -// "import java.io.Writer;\n" + -// "\n" + -// -// "import static org.codelutin.i18n.I18nf._;\n" + -// "import org.codelutin.math.matrix.*;\n" + -// "\n" + -// "import fr.ifremer.isisfish.util.Doc;\n" + -// "import fr.ifremer.isisfish.entities.*;\n" + -// "import fr.ifremer.isisfish.export.Export;\n" + -// "import fr.ifremer.isisfish.datastore.SimulationStorage;\n" + -// "import fr.ifremer.isisfish.datastore.ResultStorage;\n" + -// "\n" + -// "/**\n" + -// " * {1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update: $Date$\n" + -// //" * by : $Author$\n" + -// " */\n" + -// "public class {1} implements Export '{'\n" + -// "\n" + -// " /** to use log facility, just put in your code: log.info(\"...\"); */\n" + -// " static private Log log = LogFactory.getLog({1}.class);\n" + -// "\n" + -// " public String [] necessaryResult = '{'\n" + -// " // put here all necessary result for this rule\n" + -// " // example: \n" + -// " // ResultName.MATRIX_BIOMASS,\n" + -// " // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET,\n" + -// " '}';\n" + -// "\n" + -// " public String[] getNecessaryResult() '{'\n" + -// " return this.necessaryResult;\n" + -// " '}'\n" + -// "\n" + -// " public String getExportFilename() '{'\n" + -// " // remove _(...) if you don''t want translation on filename" + -// " return _(\"{0}\");\n" + -// " '}'\n" + -// "\n" + -// " public String getExtensionFilename() '{'\n" + -// " return \".csv\";\n" + -// " '}'\n" + -// "\n" + -// " public String getDescription() '{'\n" + -// " return _(\"TODO export description\");\n" + -// " '}'\n" + -// "\n" + -// " public void export(SimulationStorage simulation, Writer out) throws Exception '{'\n" + -// " // put your code here, and write export with: out.write(\"...\")\n" + -// " '}'\n" + -// "\n" + -// "'}'\n"), -// Rule(RuleStorage.getRuleDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email, -// * 5 = region name -// */ -// "package rules{0};\n" + -// "\n" + -// "import static org.codelutin.i18n.I18nf._;\n" + -// "\n" + -// "import org.apache.commons.logging.Log;\n" + -// "import org.apache.commons.logging.LogFactory;\n" + -// "\n" + -// "import scripts.ResultName;\n" + -// "\n" + -// "import java.io.Writer;\n" + -// "\n" + -// "import org.codelutin.math.matrix.*;\n" + -// "\n" + -// "import fr.ifremer.isisfish.util.Doc;\n" + -// "import fr.ifremer.isisfish.simulator.SimulationContext;\n" + -// "import fr.ifremer.isisfish.types.Date;\n" + -// "import fr.ifremer.isisfish.entities.*;\n" + -// "import fr.ifremer.isisfish.rule.AbstractRule;\n" + -// "import fr.ifremer.isisfish.datastore.SimulationStorage;\n" + -// "import fr.ifremer.isisfish.datastore.ResultStorage;\n" + -// "\n" + -// "/**\n" + -// " * {1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update: $Date$\n" + -// //" * by : $Author$\n" + -// " */\n" + -// "public class {1} extends AbstractRule '{'\n" + -// "\n" + -// " /** to use log facility, just put in your code: log.info(\"...\"); */\n" + -// " static private Log log = LogFactory.getLog({1}.class);\n" + -// "\n" + -// " public String [] necessaryResult = '{'\n" + -// " // put here all necessary result for this rule\n" + -// " // example: \n" + -// " // ResultName.MATRIX_BIOMASS,\n" + -// " // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET,\n" + -// " '}';\n" + -// "\n" + -// " public String[] getNecessaryResult() '{'\n" + -// " return this.necessaryResult;\n" + -// " '}'\n" + -// "\n" + -// " /**\n" + -// " * Permet d''afficher a l''utilisateur une aide sur la regle.\n" + -// " * @return L''aide ou la description de la regle\n" + -// " */\n" + -// " public String getDescription() throws Exception '{'\n" + -// " // TODO\n" + -// " return _(\"TODO description rule\");\n" + -// " '}'\n" + -// " \n" + -// " /**\n" + -// " * Appelé au démarrage de la simulation, cette méthode permet d''initialiser\n" + -// " * des valeurs\n" + -// " * @param simulation La simulation pour lequel on utilise cette regle\n" + -// " */\n" + -// " public void init(SimulationContext context) throws Exception '{'\n" + -// " // TODO\n" + -// " '}'\n" + -// " /**\n" + -// " * La condition qui doit etre vrai pour faire les actions\n" + -// " * @param simulation La simulation pour lequel on utilise cette regle\n" + -// " * @return vrai si on souhaite que les actions soit faites\n" + -// " */\n" + -// " public boolean condition(SimulationContext context, Date date, Metier metier) throws Exception '{'\n" + -// " // TODO\n" + -// " return false;\n" + -// " '}'\n" + -// " \n" + -// " /**\n" + -// " * Si la condition est vrai alors cette action est executée avant le pas\n" + -// " * de temps de la simulation.\n" + -// " * @param simulation La simulation pour lequel on utilise cette regle\n" + -// " */\n" + -// " public void preAction(SimulationContext context, Date date, Metier metier) throws Exception '{'\n" + -// " // TODO\n" + -// " '}'\n" + -// " \n" + -// " /**\n" + -// " * Si la condition est vrai alors cette action est executée apres le pas\n" + -// " * de temps de la simulation.\n" + -// " * @param simulation La simulation pour lequel on utilise cette regle\n" + -// " */\n" + -// " public void postAction(SimulationContext context, Date date, Metier metier) throws Exception '{'\n" + -// " // TODO\n" + -// " '}'\n" + -// "\n" + -// "'}'\n"), -// AnalysePlan(AnalysePlanStorage.getAnalysePlanDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email, -// * 5 = region name -// */ -// "package analyseplans{0};\n" + -// "\n" + -// "import static org.codelutin.i18n.I18nf._;\n" + -// "\n" + -// "import org.apache.commons.logging.Log;\n" + -// "import org.apache.commons.logging.LogFactory;\n" + -// "\n" + -// "import scripts.ResultName;\n" + -// "\n" + -// "import java.io.Writer;\n" + -// "\n" + -// "import org.codelutin.math.matrix.*;\n" + -// "import org.codelutin.util.*;\n" + -// "import org.codelutin.topia.*;\n" + -// "\n" + -// "import fr.ifremer.isisfish.util.Doc;\n" + -// "import fr.ifremer.isisfish.*;\n" + -// "import fr.ifremer.isisfish.simulator.SimulationContext;\n" + -// "import fr.ifremer.isisfish.types.Date;\n" + -// "import fr.ifremer.isisfish.entities.*;\n" + -// "import fr.ifremer.isisfish.simulator.AnalysePlan;\n" + -// "import fr.ifremer.isisfish.simulator.AnalysePlanContext;\n" + -// "import fr.ifremer.isisfish.simulator.SimulationParameter;\n" + -// "import fr.ifremer.isisfish.datastore.SimulationStorage;\n" + -// "import fr.ifremer.isisfish.datastore.ResultStorage;\n" + -// "\n" + -// "/**\n" + -// " * {1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update: $Date$\n" + -// //" * by : $Author$\n" + -// " */\n" + -// "public class {1} implements AnalysePlan '{'\n" + -// "\n" + -// " /** to use log facility, just put in your code: log.info(\"...\"); */\n" + -// " static private Log log = LogFactory.getLog({1}.class);\n" + -// "\n" + -// " public String [] necessaryResult = '{'\n" + -// " // put here all necessary result for this rule\n" + -// " // example: \n" + -// " // ResultName.MATRIX_BIOMASS,\n" + -// " // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET,\n" + -// " '}';\n" + -// "\n" + -// " public String[] getNecessaryResult() '{'\n" + -// " return this.necessaryResult;\n" + -// " '}'\n" + -// "\n" + -// " /**\n" + -// " * Permet d''afficher a l''utilisateur une aide sur le plan.\n" + -// " * @return L''aide ou la description du plan\n" + -// " */\n" + -// " public String getDescription() throws Exception '{'\n" + -// " // TODO\n" + -// " return _(\"TODO description plan\");\n" + -// " '}'\n" + -// " \n" + -// " /**\n" + -// " * Appelé au démarrage de la simulation, cette méthode permet d''initialiser\n" + -// " * des valeurs\n" + -// " * @param simulation La simulation pour lequel on utilise cette regle\n" + -// " */\n" + -// " public void init(AnalysePlanContext context) throws Exception '{'\n" + -// " // TODO\n" + -// " '}'\n" + -// " \n" + -// " /**\n" + -// " * Call before each simulation\n" + -// " * @param context plan context\n" + -// " * @param nextSimulation storage used for next simulation\n" + -// " * @return true if we must do next simulation, false to stop plan\n" + -// " * @throws Exception\n" + -// " */\n" + -// " public boolean next(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception '{'\n" + -// " return false; // TODO\n" + -// " '}'\n" + -// "\n" + -// "'}'\n"), -// EquationModel(FormuleStorage.getFormuleDirectory(), -// /** -// * 0 = package name, -// * 1 = class name, -// * 2 = current date, -// * 3 = author name, -// * 4 = author email -// */ -// "/**\n" + -// " * {1}.java\n" + -// " *\n" + -// " * Created: {2,date, long}\n" + -// " *\n" + -// " * @author {3} <{4}>\n" + -// //" * @version $Revision$\n" + -// " *\n" + -// //" * Last update: $7 $\n" + -// //" * by : $Author$\n" + -// //" */\n" + -// "\n" + -// "// put your code here\n" + -// "\n"); -// -// private File module; -// private String defaultContent; -// -// ScriptMapping(File module, String defaultContent) { -// this.module = module; -// this.defaultContent = defaultContent; -// } -// -// File getModule() { -// return module; -// } -// -// String getDefaultContent() { -// return defaultContent; -// } -// } -// -// /** @return an array of all script's modules names managed by this screen */ -// public static String[] getScriptTypesNames() { -// ScriptMapping[] values = ScriptMapping.values(); -// String[] result = new String[values.length]; -// for (int i = 0; i < result.length; i++) { -// result[i] = values[i].name(); -// } -// return result; -// } -// -// /** to use log facility, just put in your code: log.info(\"...\"); */ -// static private Log log = getLog(Action.class); -// -// public static FileFilter SCRIPT_FILE_FILTER; -// -// public static FileFilter getSCRIPT_FILE_FILTER() { -// if (SCRIPT_FILE_FILTER == null) { -// SCRIPT_FILE_FILTER = new ScriptFileFilter(IsisFish.vcs); -// } -// return SCRIPT_FILE_FILTER; -// } -// -// public static class ScriptFileFilter implements FileFilter { -// final FileFilter filter; -// -// public ScriptFileFilter(FileFilter filter) { -// this.filter = filter; -// } -// -// public boolean accept(File dir) { -// return !filter.accept(dir) || dir.getName().equals("data"); -// } -// } -//} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -24,11 +24,6 @@ </script> <Table anchor='center'> - <!--row fill='horizontal'> - <cell columns='2' weightx="1"> - <JLabel id='label' font-size='12' foreground='{new Color(051,102,225)}'/> - </cell> - </row--> <row weighty="2"> <cell columns='2' fill='both'> <JScrollPane id='table'> 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 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -390,7 +390,6 @@ </row> <row> <cell fill="horizontal"> -<!-- TODO : Render --> <JComboBox id="fieldSimulParamsMesuresSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRuleNames().toArray())}'/> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -16,28 +16,14 @@ <JPanel constraints='"valuesSensWizardLabelPanel"'> <JLabel constraints='"valuesSensWizardObjectLabel"' text="isisfish.sensWizardPanels.object"/> <JTextField constraints='"valuesSensWizardObjectField"' editable="false"/> -<!-- -origin="" ---> <JLabel constraints='"valuesSensWizardFieldLabel"' text="isisfish.sensWizardPanels.field"/> <JTextField constraints='"valuesSensWizardFieldField"' editable="false"/> -<!-- -origin="" ---> <JLabel constraints='"valuesSensWizardTypeLabel"' text="isisfish.sensWizardPanels.type"/> <JTextField constraints='"valuesSensWizardTypeField"' editable="false"/> -<!-- -origin="" ---> </JPanel> <JPanel constraints='"valuesSensWizardNewValuePanel"'> -<!-- -text="New Value" ---> - <JTextArea text="isisfish.common.blabla"/> <!-- TODO Peut dependre du type de l'obet --> -<!-- -origin="" ---> + <JTextArea text="isisfish.common.blabla"/> + <!-- TODO Peut dependre du type de l'obet --> </JPanel> <JButton constraints='"buttonValuesSensWizardAdd"' id="buttonValuesSensWizardAdd" text="isisfish.sensWizardPanels.add" actionCommand=""/> <JButton constraints='"buttonValuesSensWizardModify"' id="buttonValuesSensWizardModify" text="isisfish.sensWizardPanels.modify" actionCommand=""/> @@ -46,12 +32,7 @@ <JButton constraints='"buttonValuesSensWizardDown"' id="buttonValuesSensWizardDown" text="isisfish.sensWizardPanels.down" actionCommand=""/> <JButton constraints='"buttonValuesSensWizardClear"' id="buttonValuesSensWizardClear" text="isisfish.sensWizardPanels.clear" actionCommand=""/> <JScrollPane constraints='"fieldSensWizardList"'> - <JList id="listSensWizardList"> -<!-- Fixme : ListModel -origin="" SelectionMode="1" iterate="false" - <ListModel origin=""/> ---> - </JList> + <JList id="listSensWizardList"/> </JScrollPane> </JPanel> </tab> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -30,37 +30,13 @@ * by : $Author: sletellier $ */ --> -<JFrame id="sensWizard" visible="true" size='{new Dimension(400,400)}' title="isisfish.sensibilityWizard.title" - layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> -<!-- -bundle="org.codelutin.i18n.I18nBundleBridge" ---> - <script> - import org.codelutin.widget.XMLGridLayout; - </script> - <JPanel constraints='"sensWizardPanel"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> - <!--JPanel constraints='"sensWizardPanelContent"'--> -<!-- Fixme : WizardPanel - <WizardPanel id="wizpnl" constraints="sensWizardPanelContentPanel" xml="simulator/SensWizardPanels.xml" onChange="simulator.SensWizard.newTab($wizardPrev, $wizardNext, $wizardFinish, $wizardTabPane)"/> ---> - <!--/panel--> - <JPanel constraints='"sensWizardPanelButtons"'> +<JFrame id="sensWizard" visible="true" size='{new Dimension(400,400)}' title="isisfish.sensibilityWizard.title"> + <JPanel> + <JPanel> <JButton id="wizardPrev" text="isisfish.common.previous" enabled="false"/> -<!-- -actionCommand="prev" ---> <JButton id="wizardNext" text="isisfish.common.next"/> -<!-- -actionCommand="next" ---> <JButton id="wizardFinish" text="isisfish.common.finish" enabled="false"/> -<!-- -actionCommand="finishSensWizard" ---> <JButton text="isisfish.common.cancel"/> -<!-- -actionCommand="cancel" ---> </JPanel> </JPanel> </JFrame> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -31,10 +31,4 @@ */ --> <JPanel visible="true" size='{new Dimension(400,400)}' layout='{new BorderLayout()}'> - -<!-- -bundle="org.codelutin.i18n.I18nBundleBridge" -<xpanel xml="simulator/Queue.xml"/> ---> - </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-11-21 15:53:41 UTC (rev 1616) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-11-21 15:55:19 UTC (rev 1617) @@ -49,25 +49,6 @@ } ]]> </script> -<!-- - <JMenuBar> - <JMenu text="isisfish.simulation.menu.file"> - <JMenuItem name="miClose" text="isisfish.simulation.menu.close" accelerator="accClose"/> - </JMenu> - - <JMenu text="txtSimulation" mnemonic="mnSimulation"> - <JMenuItem name="miSimulate" text="txtSimulate" icon="imgSimulate" - mnemonic="mnSimulate" ActionCommand="simulate" accelerator="accSimulate"/> - <JMenuItem name="miQueue" text="txtQueue" icon="imgQueue" - mnemonic="mnQueue" ActionCommand="queue" accelerator="accQueue"/> - </JMenu> - - <JMenu text="isisfish.simulation.menu.help"> - <JMenuItem name="miAbout" text="isisfish.simulation.menu.about" accelerator="accAbout"/> - </JMenu> - </JMenuBar> ---> - <JTabbedPane id="simulTabs" constraints='BorderLayout.CENTER'> <tab id="paramsUITab" title='isisfish.params.title'><ParamsUI id="paramUI" constructorParams='getContextValue(SimulAction.class)'/></tab> <tab id="preScriptUITab" title='isisfish.preScript.title' enabled='false'><PreScriptsUI id="preScipt" constructorParams='getContextValue(SimulAction.class)'/></tab>