[Isis-fish-commits] r1544 - in isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui: . input script simulator

Author: sletellier Date: 2008-10-08 13:44:28 +0000 (Wed, 08 Oct 2008) New Revision: 1544 Removed: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/AboutFrame.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitor.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Error.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/context.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/ActionButton.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xgl isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueue.xml Log: Suppression swixat Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/AboutFrame.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/AboutFrame.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/AboutFrame.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<Frame id="aboutFrame" visible="true" size="250,180" title="isisfish.about.title" - layout="BorderLayout" Maximizable="false" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <panel constraints="BorderLayout.NORTH" layout="GridBagLayout"> - <label id="version" origin="fr.ifremer.isisfish.IsisConfig.getVERSION()"> - <gridbagconstraints id="gbc_1" insets="5,2,2,2" gridx="0" gridy="0" ipadx="5" ipady="5" fill="1" /> - </label> - <label text="isisfish.about.text"> - <gridbagconstraints use="gbc_1" gridx="0" gridy="1"/> - </label> - <label text="isisfish.about.site"> - <gridbagconstraints use="gbc_1" gridx="0" gridy="2"/> - </label> - <Button text="isisfish.common.ok" actionCommand="cancel"> - <gridbagconstraints use="gbc_1" gridx="0" gridy="3"/> - </Button> - </panel> -</Frame> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitor.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitor.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitor.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Frame visible="true" size="400,400" title="isisfish.monitor.title" - layout="BorderLayout" Maximizable="true" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <ApplicationMonitor - smtpServer="fr.ifremer.isisfish.IsisConfig.getSmtpServer()" - emailFrom="fr.ifremer.isisfish.IsisConfig.getUserMail()" - emailTo="fr.ifremer.isisfish.IsisConfig.BUG_REPORT_EMAIL" - /> - -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Error.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Error.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Error.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Frame id="errorFrame" visible="true" size="250,180" title="isisfish.error.title" - layout="BorderLayout" Maximizable="false" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <ContextDataSource id="error" context="current" source="error"/> - - <label constraints="BorderLayout.NORTH" horizontalAlignment="CENTER" - text="isisfish.error.text"/> - <multilabel constraints="BorderLayout.CENTER" origin="$error"/> - <Button constraints="Button.SOUTH" text="isisfish.common.ok" actionCommand="Cancel"/> - -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,14 +0,0 @@ -<layout> - <table> - <tr> - <td>labelExitComment</td> - </tr> - <tr> - <td fill="BOTH" height="20%">fieldExitComment</td> - </tr> - <tr> - <td colspan="2"></td> - <td>buttonExitOK</td> - </tr> - </table> -</layout> \ No newline at end of file Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Exit.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<frame id="exitComment" Name="isisfish.exit.title" visible="true" Size="400,100" title="isisfish.exit.title" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/Exit.xgl)" Resizable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <label constraints="labelExitComment" text="isisfish.exit.text"/> - - <textarea constraints="fieldExitComment" id="fieldExitComment" /> - - <button constraints="buttonExitOK" id="buttonExitOK" text="isisfish.common.ok" - actionCommand="Saisie.saveCommentAndExit($fieldExitComment/text)"/> - -</frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,12 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" width="25%">progressStatus</td> - <td fill="Both" width="100%">labelStatus</td> - <td fill="Both" width="5%">stopCommand</td> - <td fill="Both" width="5%">memoryStatus</td> - <td fill="Both" width="5%">vcs</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBar.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,20 +0,0 @@ -<panel border="LoweredBevelBorder" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/StatusBar.xgl)"> - - <ActionMonitor postThreadCommand="xpath:setVisible($stopCommand, 'false')" - progressStartTime="5" messageTime="7" - messageDisplayer="$labelStatus" progressDisplayer="$progressStatus"/> - - <progressbar id="progressStatus" constraints="progressStatus"/> - - <label id="labelStatus" constraints="labelStatus"/> - - <button id="stopCommand" actionCommand="stopCommand" - visible="false" text="isisfish.common.stop" ToolTipText="Stop the process" - Margin="0,0,0,0" border="EmptyBorder" constraints="stopCommand"/> - - <MemoryStatus constraints="memoryStatus"/> - - <VCSConnectionState constraints="vcs"/> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,13 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" width="100%">simul</td> - <td fill="Both" width="100%">result</td> - <td fill="Both" width="100%">input</td> - <td fill="Both" width="100%">script</td> - <td fill="Both" width="100%">rule</td> - <td fill="Both" width="100%">region</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/Welcome.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Frame id="welcome" visible="true" size="315,114" title="isisfish.welcome.title" - layout="BorderLayout" Resizable="true" Closable="true" Location="0,23" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <WindowEvents id="events" onClosing="exit" /> - - <menubar> - <menu text="isisfish.welcome.menu.file" mnemonic="mnFile"> - <menuitem text="isisfish.welcome.menu.synchro" icon="imgSync" mnemonic="mnSync" - ActionCommand="thread:Welcome.updateVCS()" Accelerator="accSync"/> - <separator/> - <menuitem text="isisfish.welcome.menu.close" icon="imgClose" mnemonic="mnClose" - ActionCommand="close" Accelerator="accClose"/> - </menu> - <menu text="isisfish.welcome.menu.frame" mnemonic="mnFrame"> - <menuitem text="isisfish.welcome.menu.simulation" icon="imgSimul" mnemonic="mnSimul" - ActionCommand="OutputView('simulator/Simul.xml')" Accelerator="accSimul"/> - <menuitem text="isisfish.welcome.menu.result" icon="imgResult" mnemonic="mnResult" - ActionCommand="Welcome.openResultView()" Accelerator="accResult"/> - <menuitem text="isisfish.welcome.menu.input" icon="imgInput" mnemonic="mnInput" - ActionCommand="Welcome.openInputView()" Accelerator="accInput"/> - <menuitem text="isisfish.welcome.menu.script" icon="imgScript" mnemonic="mnScript" - ActionCommand="OutputView('script/Script.xml')" Accelerator="accScript"/> - <separator/> - <menuitem text="isisfish.welcome.menu.queue" icon="imgSimulQueue" mnemonic="mnSimulQueue" - ActionCommand="OutputView('simulator/SimulQueue.xml')" Accelerator="accSimulQueue"/> - <separator/> - <menu text="isisfish.welcome.menu.configuration" icon="imgConfig" mnemonic="mnConfig"> - <menuitem text="isisfish.welcome.menu.configuration" icon="imgConfig" mnemonic="mnConfig" ActionCommand="Welcome.showConfig()" Accelerator="accConfig"/> - <menuitem text="isisfish.welcome.menu.vcs.configuration" icon="imgVCSConfig" mnemonic="mnVCSConfig" ActionCommand="fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch()" Accelerator="accVCSConfig"/> - </menu> - </menu> - <menu text="isisfish.welcome.menu.help" mnemonic="mnHelp"> - <menuitem text="isisfish.welcome.menu.help" icon="imgHelp" mnemonic="mnHelp" - ActionCommand="help" Accelerator="accHelp"/> - <separator/> - <menuitem text="isisfish.welcome.menu.monitor" icon="imgLogMonitor" mnemonic="mnLogMonitor" - ActionCommand="OutputView('ApplicationMonitor.xml')" Accelerator="accLogMonitor"/> - <separator/> - <menuitem text="isisfish.welcome.menu.about" icon="imgAbout" mnemonic="mnAbout" - ActionCommand="about" Accelerator="accAbout"/> - </menu> - </menubar> - - <panel layout="XMLGridLayout(fr/ifremer/isisfish/ui/Welcome.xgl)"> - <button icon="images/simulation.jpg" border="EmptyBorder(6,6,6,6)" background="white" - toolTipText="txtSimul" ActionCommand="OutputView('simulator/Simul.xml')" constraints="simul"/> - <button icon="images/calc.jpg" border="EmptyBorder(6,6,6,6)" background="white" - toolTipText="txtResult" ActionCommand="Welcome.openResultView()" constraints="result"/> - <button icon="images/book.jpg" border="EmptyBorder(6,6,6,6)" background="white" - toolTipText="txtInput" ActionCommand="Welcome.openInputView()" constraints="input"/> - <button icon="images/bookPage.jpg" border="EmptyBorder(6,6,6,6)" background="white" - toolTipText="txtScript" ActionCommand="OutputView('script/Script.xml')" constraints="script"/> - </panel> - - <xpanel constraints="BorderLayout.SOUTH" xml="StatusBar.xml"/> - -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/context.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/context.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> - -<!--suppress ALL --> -<beans> -<!-- *** APPLICATION-SPECIFIC PARAMETERS *** --> - <bean id="application" class="org.swixat.framework.Application"> - <property name="title"><value>Isis-fish</value></property> - <property name="baseDir"><value>fr/ifremer/isisfish/ui/</value></property> - <property name="initialFrame"> - <value>Welcome.xml</value></property> - <property name="desktopPane"><value>desktop</value></property> - <property name="scriptManager"><ref bean="scriptManager"/></property> - </bean> - - <!-- Commands --> - <bean id="about" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>AboutFrame.xml</value></property> - </bean> - <bean id="simulSensWizard" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>simulator/SensWizard.xml</value></property> - </bean> - <bean id="exit" class="org.swixat.commands.CommandBinder"> - <property name="type"><value>fr.ifremer.isisfish.swix.action.ExitCommand</value></property> - <property name="output"><value>Exit.xml</value></property> - </bean> - <bean id="recruitmentDistributionNew" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>RecruitmentDistributionNew.xml</value></property> - </bean> - - <!-- Gestion des scripts --> - <bean id="scriptDelete" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>script/ScriptDelete.xml</value></property> - </bean> - - <!-- Gestion des règles --> - <bean id="ruleNew" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>rule/RuleNew.xml</value></property> - </bean> - <bean id="ruleDelete" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>rule/RuleDelete.xml</value></property> - </bean> - <bean id="ruleCommit" class="org.swixat.commands.CommandBinder"> - <property name="output"><value>rule/RuleCommit.xml</value></property> - </bean> - -<!-- *** END APPLICATION-SPECIFIC PARAMETERS *** --> - <!-- Scripting features --> - <bean id="scriptManager" class="org.swixat.script.ScriptManager"> - <property name="scriptEngine"> - <value>org.swixat.script.BeanShellScripting</value> - </property> - <property name="evals"> - <!-- Initial script code to evaluate --> - <list> - <value>import org.swixat.framework.OutputView;</value> - <value>import fr.ifremer.isisfish.IsisFishContext;</value> - <!--<value>add here your own statements</value>--> - </list> - </property> - </bean> - - <!-- TagLibrary extensions --> - <bean id="newTags" class="org.swixat.framework.TagLibraryExt"> - <property name="newTags"> - <map> - <!-- Les composants ajoutés pour isis --> - <!-- panel --> - <entry key="VCSConnectionState"><value>fr.ifremer.isisfish.ui.widget.VCSConnectionState</value></entry> - <entry key="Queue"><value>fr.ifremer.isisfish.ui.simulator.Queue</value></entry> - <entry key="MatrixPanel"><value>org.codelutin.math.matrix.gui.MatrixPanelEditor</value></entry> - <entry key="OpenMapToolPanel"><value>fr.ifremer.isisfish.map.OpenMapToolPanel</value></entry> - <entry key="SeasonIntervalPanel"><value>fr.ifremer.isisfish.ui.widget.IntervalPanel</value></entry> - <entry key="HidablePanel"><value>fr.ifremer.isisfish.ui.widget.HidablePanel</value></entry> - <!-- event --> - <entry key="OpenMapEvents"><value>fr.ifremer.isisfish.swix.OpenMapEvents</value></entry> - <entry key="TopiaEntityEvents"><value>fr.ifremer.isisfish.swix.TopiaEntityEvents</value></entry> - <entry key="MatrixPanelEvents"><value>fr.ifremer.isisfish.swix.MatrixPanelEvents</value></entry> - <!-- editor --> - <entry key="editor"><value>org.codelutin.widget.editor.Editor</value></entry> - <entry key="EquationTableEditor"><value>fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor</value></entry> - <entry key="ParameterColumnEditor"><value>fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor</value></entry> - <!-- renderer --> - <entry key="SimpleToolTipListRenderer"><value>fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipListRenderer</value></entry> - <entry key="SimpleToolTipComboBoxRenderer"><value>fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer</value></entry> - <entry key="SimpleToolTipTableColumnRenderer"><value>fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer</value></entry> - <!-- textArea --> - <entry key="ScriptPanel"><value>javax.swing.JTextArea</value></entry> - <entry key="SeasonPanel"><value>javax.swing.JTextArea</value></entry> - <entry key="JEditTextArea"><value>javax.swing.JTextArea</value></entry> - <!-- other --> - <entry key="StrategyMonthPanel"><value>javax.swing.JTextField</value></entry> - <entry key="OpenMapToolSet"><value>com.bbn.openmap.gui.OMToolSet</value></entry> - <entry key="OpenMap"><value>fr.ifremer.isisfish.map.IsisMapBean</value></entry> - <entry key="StatusBar"><value>org.codelutin.widget.StatusBar</value></entry> - <entry key="ApplicationMonitor"><value>org.codelutin.widget.ApplicationMonitor</value></entry> - </map> - </property> - </bean> - - <!-- Swing components SetterFactories --> - <bean id="SetterFactory" class="org.swixat.databinding.SetterFactory"> - <property name="propertySetters"> - <map> - <!-- Les composants ajoutés pour isis --> - <!-- panel --> - <entry key="fr.ifremer.isisfish.ui.widget.IntervalPanel"><value>fr.ifremer.isisfish.swix.SeasonIntervalPanelPropertySetter</value></entry> - <entry key="fr.ifremer.isisfish.ui.widget.HidablePanel"><value>fr.ifremer.isisfish.swix.HidablePanelPropertySetter</value></entry> - <!-- editor --> - <entry key="org.codelutin.widget.editor.Editor"><value>fr.ifremer.isisfish.swix.EditorPropertySetter</value></entry> - <entry key="fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor"><value>fr.ifremer.isisfish.ui.widget.setter.ParameterColumnEditorPS</value></entry> - <!-- renderer --> - <entry key="fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipListRenderer"><value>fr.ifremer.isisfish.ui.widget.setter.WithToolTipListModelPS</value></entry> - <entry key="fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRenderer"><value>fr.ifremer.isisfish.ui.widget.setter.WithToolTipListModelPS</value></entry> - <entry key="fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipTableColumnRenderer"><value>fr.ifremer.isisfish.ui.widget.setter.WithToolTipListModelPS</value></entry> - <!-- other --> - <entry key="com.bbn.openmap.gui.OMToolSet"><value>fr.ifremer.isisfish.swix.OpenMapToolSetPropertySetter</value></entry> - <entry key="fr.ifremer.isisfish.map.IsisMapBean"><value>fr.ifremer.isisfish.swix.OpenMapPropertySetter</value></entry> - <entry key="org.codelutin.math.matrix.gui.MatrixPanelEditor"><value>fr.ifremer.isisfish.swix.MatrixPanelPropertySetter</value></entry> - </map> - </property> - </bean> -</beans> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/ActionButton.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/ActionButton.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/ActionButton.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,14 +0,0 @@ -<layout> - <table cellspacing="2"> - <tr> - <td fill="Both" width="50%">buttonSave</td> - <td fill="Both" width="50%">buttonCancel</td> - <td fill="Both" width="50%">buttonCheck</td> - </tr> - <tr> - <td fill="Both" width="50%">buttonCreate</td> - <td fill="Both" width="50%">buttonRemove</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,58 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center" colspan="2" width="100%"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelCell</td> - </tr> - <tr> - <td class="field" colspan="2">fieldCell</td> - </tr> - <tr> - <td class="label">labelCellName</td> - <td class="field">fieldCellName</td> - </tr> - <tr> - <td class="label">labelCellLatitude</td> - <td class="field">fieldCellLatitude</td> - </tr> - <tr> - <td class="label">labelCellLongitude</td> - <td class="field">fieldCellLongitude</td> - </tr> - <tr> - <td class="label">labelCellLand</td> - <td class="field">fieldCellLand</td> - </tr> - <tr> - <td class="labelTitle">labelCellComment</td> - </tr> - <tr> - <td class="field" height="25%" colspan="2" rowspan="3">fieldCellComment</td> - </tr> - <tr></tr> - <tr></tr> - <tr> - <td colspan="2" fill="Both" width="100%">panelCellButtonAction</td> - </tr> - -</table> - - - -<table cellspacing="5"> - <tr> -<!-- - <td fill="Both" width="50%">buttonCellSave</td> - <td fill="Both" width="50%">buttonCellCancel</td> ---> - <td fill="Both" width="33%">buttonCellSave</td> - <td fill="Both" width="33%">buttonCellCancel</td> - </tr> -</table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Cell.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.cell.title" constraints="inputCell" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Cell.xgl)"> - - <ContextDataSource id="Cell" context="current" source="Cell"/> - - <!-- Widget --> - - <combobox constraints="fieldCell" id="fieldCell" origin="$Cell" renderer="name" - actionCommand='UIHelper.setTreeSelection($tree, $treeModel, $fieldCell/selectedItem)'> - <ComboBoxModel origin="$FisheryRegion/cell"/> - </combobox> - - <label constraints="labelCellName" text="isisfish.cell.name"/> - <textfield constraints="fieldCellName" id="fieldCellName" origin="$Cell/name"> - <DocumentEvents onModified="Update($fieldCellName/text)"/> - </textfield> - - <label constraints="labelCellLatitude" text="isisfish.cell.latitude"/> - <textfield constraints="fieldCellLatitude" id="fieldCellLatitude" - origin="$Cell/latitude" editable="false"/> - - <label constraints="labelCellLongitude" text="isisfish.cell.longitude"/> - <textfield constraints="fieldCellLongitude" id="fieldCellLongitude" - origin="$Cell/longitude" editable="false"/> - - <label constraints="labelCellLand" text="isisfish.cell.land"/> - <checkbox constraints="fieldCellLand" id="fieldCellLand" origin="$Cell/land"> - <ItemEvents onStateChanged="Update($fieldCellLand/selected)"/> - </checkbox> - - <label constraints="labelCellComment" text="isisfish.cell.comments"/> - <scrollPane constraints="fieldCellComment"> - <textarea id="fieldCellComment" origin="$Cell/comment"> - <DocumentEvents onModified="Update($fieldCellComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelCellButtonAction" constraints="panelCellButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Cell", $Cell);refreshView($inputCell)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Cell", $Cell);refreshView($inputCell)'/> - </panel> -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,85 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" fill="Both" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="field" colspan="3" height="25%">fieldEffortDescriptionMetierScrollPane</td> - </tr> - <tr> - <td class="labelTitle" fill="Both" width="33%">buttonEffortDescriptionAdd</td> - <td class="field" colspan="2"></td> - </tr> - <tr> - <td class="labelTitle" fill="Both" width="33%">fieldEffortDescriptionEffortDescriptionScrollPane</td> - <td class="field" colspan="2" width="67%">panelEffortDescriptionEffortDesciption</td> - </tr> - <tr> - <td colspan="3">buttonStrategy</td> - </tr> - - </table> - - <table cellspacing="2" width="100%"> - <tr> - <td class="label">labelEffortDescriptionFishingOperation</td> - <td class="field">fieldEffortDescriptionFishingOperation</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionFishingOperationDuration</td> - <td class="field">fieldEffortDescriptionFishingOperationDuration</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionGearsNumberPerOperation</td> - <td class="field">fieldEffortDescriptionGearsNumberPerOperation</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionCrewSize</td> - <td class="field">fieldEffortDescriptionCrewSize</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionUnitCostOfFishing</td> - <td class="field">fieldEffortDescriptionUnitCostOfFishing</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionFixedCrewSalary</td> - <td class="field">fieldEffortDescriptionFixedCrewSalary</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionCrewFoodCost</td> - <td class="field">fieldEffortDescriptionCrewFoodCost</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionCrewShareRate</td> - <td class="field">fieldEffortDescriptionCrewShareRate</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionRepairAndMaintenanceGearCost</td> - <td class="field">fieldEffortDescriptionRepairAndMaintenanceGearCost</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionLandingCosts</td> - <td class="field">fieldEffortDescriptionLandingCosts</td> - </tr> - <tr> - <td class="label">labelEffortDescriptionOtherRunningCost</td> - <td class="field">fieldEffortDescriptionOtherRunningCost</td> - </tr> - <tr> - <td class="field" colspan="2">panelEffortDescriptionButtonAction</td> - </tr> - - </table> - - <table cellspacing="2"> - <tr> - <td fill="Both" class="field">buttonSave</td> - <td fill="Both" class="field">buttonCancel</td> - <td fill="Both" class="field">buttonRemove</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescription.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.effortDescription.title" constraints="inputEffortDescription" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/EffortDescription.xgl)"> - - <ContextDataSource id="EffortDescription" context="current" source="EffortDescription"/> - - <scrollPane constraints="fieldEffortDescriptionMetierScrollPane"> - <list id="fieldEffortDescriptionMetierList" selectionMode="0" renderer="name"> - <ListModel origin="$FisheryRegion/metier"/> - <ListSelectionEvents onValueChanged="refreshViewPattern('buttonEffortDescriptionAdd.*')"/> - </list> - </scrollPane> - - <button constraints="buttonEffortDescriptionAdd" id="buttonEffortDescriptionAdd" text="isisfish.common.add" - actionCommand="input.InputEffortDescription.addEffortDescription($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue)" - origin="not(getPossibleMetiers($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue))" - /> - - <scrollPane constraints="fieldEffortDescriptionEffortDescriptionScrollPane"> - <list id="fieldEffortDescriptionEffortDescriptionList" renderer="possibleMetiers/name" - selectionMode="0" origin="$EffortDescription"> - <ListModel origin="$SetOfVessels/possibleMetiers"/> - <ListSelectionEvents onValueChanged="input.Input.selectEntity('EffortDescription', $fieldEffortDescriptionEffortDescriptionList/selectedValue)"/> - </list> - </scrollPane> - - <panel constraints="panelEffortDescriptionEffortDesciption" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/EffortDescription.xgl)"> - - <label constraints="labelEffortDescriptionFishingOperation" text="isisfish.effortDescription.fishingOperation"/> - <textfield constraints="fieldEffortDescriptionFishingOperation" id="fieldEffortDescriptionFishingOperation" - origin="$EffortDescription/fishingOperation"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionFishingOperation/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionFishingOperationDuration" text="isisfish.effortDescription.fishingOperationDuration"/> - <textfield constraints="fieldEffortDescriptionFishingOperationDuration" id="fieldEffortDescriptionFishingOperationDuration" - origin="$EffortDescription/fishingOperationDuration/hour" tooltips="in hour"> - <DocumentEvents onModified="Update(3600 * $fieldEffortDescriptionFishingOperationDuration/text, $EffortDescription/fishingOperationDuration)"/> - </textfield> - - <label constraints="labelEffortDescriptionGearsNumberPerOperation" text="isisfish.effortDescription.gearsNumberPerOperation"/> - <textfield constraints="fieldEffortDescriptionGearsNumberPerOperation" id="fieldEffortDescriptionGearsNumberPerOperation" - origin="$EffortDescription/gearsNumberPerOperation"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionGearsNumberPerOperation/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionCrewSize" text="isisfish.effortDescription.crewSize"/> - <textfield constraints="fieldEffortDescriptionCrewSize" id="fieldEffortDescriptionCrewSize" - origin="$EffortDescription/crewSize"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewSize/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionUnitCostOfFishing" text="isisfish.effortDescription.unitCostOfFishing"/> - <textfield constraints="fieldEffortDescriptionUnitCostOfFishing" id="fieldEffortDescriptionUnitCostOfFishing" - origin="$EffortDescription/unitCostOfFishing"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionUnitCostOfFishing/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionFixedCrewSalary" text="isisfish.effortDescription.fixedCrewSalary"/> - <textfield constraints="fieldEffortDescriptionFixedCrewSalary" id="fieldEffortDescriptionFixedCrewSalary" - origin="$EffortDescription/fixedCrewSalary"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionFixedCrewSalary/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionCrewFoodCost" text="isisfish.effortDescription.crewFoodCost"/> - <textfield constraints="fieldEffortDescriptionCrewFoodCost" - id="fieldEffortDescriptionCrewFoodCost" - origin="$EffortDescription/crewFoodCost"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewFoodCost/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionCrewShareRate" text="isisfish.effortDescription.crewShareRate"/> - <textfield constraints="fieldEffortDescriptionCrewShareRate" - id="fieldEffortDescriptionCrewShareRate" - origin="$EffortDescription/crewShareRate"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewShareRate/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionRepairAndMaintenanceGearCost" text="isisfish.effortDescription.repairAndMaintenanceGearCost"/> - <textfield constraints="fieldEffortDescriptionRepairAndMaintenanceGearCost" id="fieldEffortDescriptionRepairAndMaintenanceGearCost" - origin="$EffortDescription/repairAndMaintenanceGearCost"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionRepairAndMaintenanceGearCost/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionLandingCosts" text="isisfish.effortDescription.landingCosts"/> - <textfield constraints="fieldEffortDescriptionLandingCosts" id="fieldEffortDescriptionLandingCosts" - origin="$EffortDescription/landingCosts"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionLandingCosts/text"/> - </DocumentEvents> - </textfield> - - <label constraints="labelEffortDescriptionOtherRunningCost" text="isisfish.effortDescription.otherRunningCost"/> - <textfield constraints="fieldEffortDescriptionOtherRunningCost" id="fieldEffortDescriptionOtherRunningCost" - origin="$EffortDescription/otherRunningCost"> - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionOtherRunningCost/text"/> - </DocumentEvents> - </textfield> - - <panel id="panelEffortDescriptionButtonAction" constraints="panelEffortDescriptionButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/EffortDescription.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$EffortDescription" - actionCommand="input.InputEffortDescription.remove($SetOfVessels, $EffortDescription)"/> - </panel> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,107 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center" colspan="2" width="100%"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelRegion</td> - </tr> - <tr> - <td class="field" colspan="2">fieldRegion</td> - </tr> - <tr> - <td class="labelTitle">labelLimit</td> - </tr> - <tr> - <td class="label">labelLatMin</td> - <td class="field">fieldLatMin</td> - </tr> - <tr> - <td class="label">labelLatMax</td> - <td class="field">fieldLatMax</td> - </tr> - <tr> - <td class="label">labelLongMin</td> - <td class="field">fieldLongMin</td> - </tr> - <tr> - <td class="label">labelLongMax</td> - <td class="field">fieldLongMax</td> - </tr> - <tr> - <td class="labelTitle">labelResolution</td> - </tr> - <tr> - <td class="label">labelLat</td> - <td class="field">fieldCellLengthLatitude</td> - </tr> - <tr> - <td class="label">labelLong</td> - <td class="field">fieldCellLengthLongitude</td> - </tr> - - <tr> - <td class="field" height="25%" colspan="2" rowspan="3">fieldMapfiles</td> - </tr> - <tr></tr> - <tr></tr> - <tr> - <td fill="Both" colspan="2" width="100%">panelButtonMap</td> - </tr> - <tr> - <td class="labelTitle">labelComment</td> - </tr> - <tr> - <td class="field" height="25%" colspan="2" rowspan="3">fieldComment</td> - </tr> - <tr></tr> - <tr></tr> - <tr> - <td class="labelTitle">labelCellFile1</td> - </tr> - <tr> - <td class="labelTitle">labelCellFile2</td> - </tr> - <tr> - <td colspan="2" fill="Both" width="100%">panelCellFile</td> - </tr> - <tr> - <td colspan="2" fill="Both" width="100%">panelRegionButtonAction</td> - </tr> - -</table> - - -<table cellspacing="1"> - <tr> - <td fill="Both" width="50%">buttonAddMap</td> - <td fill="Both" width="50%">buttonRemoveMap</td> - </tr> -</table> - - -<table cellspacing="1"> - <tr> - <td class="field">fieldCellFile</td> - <td>buttonCellFile</td> - </tr> -</table> - - -<table cellspacing="5"> - <tr> - <!-- - <td fill="Both" width="33%">buttonRegionSave</td> - <td fill="Both" width="33%">buttonRegionCancel</td> - <td fill="Both" width="33%">buttonRegionCheck</td> ---> - <td fill="Both" width="50%">buttonRegionSave</td> - <td fill="Both" width="50%">buttonRegionCancel</td> - <td fill="Both" width="50%">buttonRegionCheck</td> - </tr> -</table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegion.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.fisheryRegion.title" - constraints="inputFisheryRegion" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/FisheryRegion.xgl)"> - - <ContextDataSource id="FisheryRegion" context="current" source="FisheryRegion"/> - - <!-- Widget --> - - <label constraints="labelRegion" text="isisfish.fisheryRegion.name"/> - <textfield constraints="fieldRegion" id="fieldRegion" origin="$RegionStorage/name"> - <DocumentEvents id="updateRegion" onChangedUpdate="Update($fieldRegion/text)"/> - </textfield> - - <label constraints="labelLimit" text="isisfish.fisheryRegion.area"/> - <label constraints="labelLatMin" text="isisfish.fisheryRegion.latitude.min"/> - <textfield constraints="fieldLatMin" id="fieldLatMin" origin="$FisheryRegion/minLatitude"> - <DocumentEvents onModified="Update($fieldLatMin/text)"/> - </textfield> - - <label constraints="labelLatMax" text="isisfish.fisheryRegion.latitude.max"/> - <textfield constraints="fieldLatMax" id="fieldLatMax" origin="$FisheryRegion/maxLatitude"> - <DocumentEvents onModified="Update($fieldLatMax/text)"/> - </textfield> - - <label constraints="labelLongMin" text="isisfish.fisheryRegion.longitude.min"/> - <textfield constraints="fieldLongMin" id="fieldLongMin" origin="$FisheryRegion/minLongitude"> - <DocumentEvents onModified="Update($fieldLongMin/text)"/> - </textfield> - - <label constraints="labelLongMax" text="isisfish.fisheryRegion.longitude.max"/> - <textfield constraints="fieldLongMax" id="fieldLongMax" origin="$FisheryRegion/maxLongitude"> - <DocumentEvents onModified="Update($fieldLongMax/text)"/> - </textfield> - - <label constraints="labelResolution" text="isisfish.fisheryRegion.spatial"/> - <label constraints="labelLat" text="isisfish.fisheryRegion.latitude"/> - <textfield constraints="fieldCellLengthLatitude" id="fieldCellLengthLatitude" - origin="$FisheryRegion/cellLengthLatitude"> - <DocumentEvents onModified="Update($fieldCellLengthLatitude/text)"/> - </textfield> - - <label constraints="labelLong" text="isisfish.fisheryRegion.longitude"/> - <textfield constraints="fieldCellLengthLongitude" id="fieldCellLengthLongitude" - origin="$FisheryRegion/cellLengthLongitude"> - <DocumentEvents onModified="Update($fieldCellLengthLongitude/text)"/> - </textfield> - - <scrollPane constraints="fieldMapfiles"> - <list id="fieldMapfiles"> - <ListModel origin="$FisheryRegion/mapFileList"/> - </list> - </scrollPane> - - <panel constraints="panelButtonMap" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/FisheryRegion.xgl)"> - <button constraints="buttonAddMap" id="buttonAddMap" text="isisfish.fisheryRegion.addMap" - actionCommand="input.InputFisheryRegion.addMap($FisheryRegion, $fieldMapfiles)"/> - - <button constraints="buttonRemoveMap" id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap" - actionCommand="input.InputFisheryRegion.removeMap($FisheryRegion, $fieldMapfiles)"/> - </panel> - - <label constraints="labelComment" text="isisfish.fisheryRegion.comments"/> - <scrollPane constraints="fieldComment"> - <textarea id="fieldComment" origin="$FisheryRegion/comment"> - <DocumentEvents onModified="Update($fieldComment/text)"/> - </textarea> - </scrollPane> - - <label constraints="labelCellFile1" text="isisfish.fisheryRegion.selectFile"/> - <label constraints="labelCellFile2" text="isisfish.fisheryRegion.ofCells"/> - - <panel constraints="panelCellFile" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/FisheryRegion.xgl)"> - <textfield constraints="fieldCellFile" id="fieldCellFile"/> - <button constraints="buttonCellFile" id="buttonCellFile" text="isisfish.common.ellipsis" - actionCommand="input.InputFisheryRegion.loadCellFile($fieldCellFile)"/> - </panel> - - <panel id="panelRegionButtonAction" constraints="panelRegionButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='thread:input.InputFisheryRegion.save("FisheryRegion", $FisheryRegion);refreshView($inputFisheryRegion)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("FisheryRegion", $FisheryRegion);refreshView($inputFisheryRegion)'/> - - <button constraints="buttonCheck" text="isisfish.common.check" - actionCommand='thread:input.InputFisheryRegion.check($FisheryRegion)'/> - </panel> -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,46 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelGearName</td> - <td class="field" colspan="2">fieldGearName</td> - </tr> - <tr> - <td class="label">labelGearEffortUnit</td> - <td class="field" colspan="2">fieldGearEffortUnit</td> - </tr> - <tr> - <td class="label">labelGearStandardisationFactor</td> - <td class="field" colspan="2">fieldGearStandardisationFactor</td> - </tr> - <tr> - <td class="label">labelGearParamName</td> - <td class="field" colspan="2">fieldGearParamName</td> - </tr> - <tr> - <td class="label">labelGearParamPossibleValues</td> - <td class="field" width="25%">fieldGearParamType</td> - <td class="field" width="75%">fieldGearParamPossibleValue</td> - </tr> - <tr> - <td class="label" rowspan="3">labelGearComment</td> - <td class="field" height="20%" rowspan="3" colspan="2">fieldGearComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="3" width="100%">panelGearButtonAction</td> - </tr> - <tr> - <td colspan="3">buttonMetier</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Gear.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.gear.title" constraints="inputGear" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Gear.xgl)"> - - <ContextDataSource id="Gear" context="current" source="Gear"/> - - <label constraints="labelGearName" text="isisfish.gear.name"/> - <textfield constraints="fieldGearName" id="fieldGearName" origin="$Gear/name"> - <DocumentEvents onModified="Update($fieldGearName/text)"/> - </textfield> - - <label constraints="labelGearEffortUnit" text="isisfish.gear.effortUnit"/> - <textfield constraints="fieldGearEffortUnit" id="fieldGearEffortUnit" - origin="$Gear/effortUnit"> - <DocumentEvents onModified="Update($fieldGearEffortUnit/text)"/> - </textfield> - - <label constraints="labelGearStandardisationFactor" text="isisfish.gear.standardisationFactor"/> - <textfield constraints="fieldGearStandardisationFactor" id="fieldGearStandardisationFactor" - origin="$Gear/standardisationFactor"> - <DocumentEvents onModified="Update($fieldGearStandardisationFactor/text)"/> - </textfield> - - <label constraints="labelGearParamName" text="isisfish.gear.technicalParameter"/> - <textfield constraints="fieldGearParamName" id="fieldGearParamName" - origin="$Gear/parameterName"> - <DocumentEvents onModified="Update($fieldGearParamName/text)"/> - </textfield> - - <label constraints="labelGearParamPossibleValues" text="isisfish.gear.rangeValues"/> - <combobox constraints="fieldGearParamType" id="fieldGearParamType" - origin="$Gear/possibleValue/type" - firstNull="true" - actionCommand="update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)"> - <ComboBoxModel origin="fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()"/> - </combobox> - <textfield constraints="fieldGearParamPossibleValue" id="fieldGearParamPossibleValue" - origin="$Gear/possibleValue/values"> - <DocumentEvents onModified="Update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)"/> - </textfield> - - <label constraints="labelGearComment" text="isisfish.gear.comments"/> - <scrollPane constraints="fieldGearComment"> - <textarea id="fieldGearComment" origin="$Gear/comment"> - <DocumentEvents onModified="Update($fieldGearComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelGearButtonAction" constraints="panelGearButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Gear")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Gear", $Gear);refreshView($inputGear)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputGear)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Gear" - actionCommand="input.Input.remove($Gear)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,15 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" width="100%">fieldNewRegion</td> - <td fill="Both">buttonNewRegion</td> - </tr> - <tr> - <td fill="Both" colspan="2" width="100%">fieldCurrentRegion</td> - </tr> - <tr> - <td fill="Both" colspan="2" width="100%" height="100%">tree</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Input.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,341 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<Frame id="input" visible="true" size="700,500" title="isisfish.input.title" - layout="BorderLayout" Maximizable="true" Closable="true" Location="0,139" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <ContextDataSource id="EntityModified" context="current" source="EntityModified"/> - <ContextDataSource id="RegionStorage" context="current" source="RegionStorage"/> - <ContextDataSource id="TopiaContext" context="current" source="TopiaContext"/> - - <WindowEvents id="events" - onOpened="input.Input.initContext()" - onClosing="input.Input.saveCommentAndExit($RegionStorage)" /> - - <!-- - | permet de savoir si la region a ete modifiee ou non - +--> - <TopiaEntityEvents id="saveStateWatcher" origin="$TopiaContext" - entityModified="input.Input.setEntityModified()" - propertyChange="input.Input.setEntityModified()" - commit="input.Input.unsetEntityModified('true')" - rollback="input.Input.unsetEntityModified('false')" /> - - <menubar id="menu"> - <menu text="isisfish.input.menu.file" mnemonic="mnFile"> - <menuitem text="isisfish.input.menu.importRegion" icon="imgImport" mnemonic="mnImport" - ActionCommand="thread:input.Input.importRegion()" Accelerator="accNew"/> - <menuitem text="isisfish.input.menu.importRenameRegion" icon="imgImport" mnemonic="mnImport" - ActionCommand="thread:input.Input.importRegionAndRename()" Accelerator="accNew"/> - <menuitem text="isisfish.input.menu.importRegionV2" icon="imgImporter" mnemonic="mnImport" - ActionCommand="thread:input.Input.importV2Region()" Accelerator="accNew"/> - <menuitem text="isisfish.input.menu.importRegionSimulation" icon="imgImportFromSimulation" mnemonic="mnImportFromSimulation" - ActionCommand="thread:input.Input.importRegionFromSimulation($fieldCurrentRegion)" Accelerator="accImportFromSimulation"/> - <menuitem text="isisfish.input.menu.exportRegion" icon="imgExport" mnemonic="mnExport" - ActionCommand="thread:input.Input.exportRegion($RegionStorage)" Accelerator="accExport" - origin="$RegionStorage" /> - <menuitem text="isisfish.input.menu.copyRegion" icon="imgCopy" mnemonic="mnCopy" - ActionCommand="thread:input.Input.copyRegion($RegionStorage)" Accelerator="accCopy" - origin="$RegionStorage" /> - <separator/> - <menuitem name="miRemove" text="isisfish.input.menu.removeLocaly" icon="imgRemove" mnemonic="mnRemove" - ActionCommand="thread:input.Input.removeRegion($RegionStorage, 'false')" Accelerator="accRemove" - origin="$RegionStorage"/> - <separator/> - <menuitem name="miClose" text="isisfish.input.menu.close" icon="imgClose" mnemonic="mnClose" - ActionCommand="close" Accelerator="accOpen"/> - </menu> - <menu text="isisfish.input.menu.server" mnemonic="mnVCS"> - <menuitem text="isisfish.input.menu.addRegion" icon="imgAdd" mnemonic="mnAdd" - ActionCommand="thread:input.Input.commitRegionInCVS($RegionStorage)" Accelerator="accAdd" - origin="not(isOnRemote($RegionStorage))"/> - <menuitem text="isisfish.input.menu.commit" icon="imgCommitVCS" mnemonic="mnCommitVCS" - ActionCommand="thread:input.Input.commitRegionInCVS($RegionStorage)" Accelerator="accCommitVCS" - origin="isOnRemote($RegionStorage)" /> - <separator/> - <menuitem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" icon="imgRemove" mnemonic="mnRemove" - ActionCommand="thread:input.Input.removeRegion($RegionStorage, 'true')" Accelerator="accRemove" - origin="isOnRemote($RegionStorage)"/> - </menu> - <menu text="isisfish.input.menu.help" mnemonic="mnHelp"> - <menuitem name="miAbout" text="isisfish.input.menu.about" icon="imgAbout" mnemonic="mnAbout" - ActionCommand="about" Accelerator="accAbout"/> - </menu> - </menubar> - - <splitpane oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> - <panel layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Input.xgl)"> - <textfield constraints="fieldNewRegion" id="fieldNewRegion"> - <DocumentEvents onModified="refreshView($buttonNewRegion)"/> - </textfield> - - <button constraints="buttonNewRegion" id="buttonNewRegion" text="isisfish.input.newRegion" - origin="$fieldNewRegion/text != ''" - actionCommand="input.Input.newRegion($inputPane, $fieldCurrentRegion, $fieldNewRegion/text)"/> - - <combobox constraints="fieldCurrentRegion" id="fieldCurrentRegion" - origin="$RegionStorage/name" firstNull="true" - actionCommand="thread:input.Input.loadRegion($inputPane, $fieldCurrentRegion/selectedItem)"> - <ComboBoxModel origin="fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()"/> - </combobox> - - <panel constraints="tree" layout="BorderLayout"> - <hidablePanel id="treePanel" name="treePanel" origin="$RegionStorage" layout="BorderLayout"> - <scrollPane> - <tree id="tree" name="tree"> - <NestedTreeModel id="treeModel"> - <TreeNode id="rootTreeNode" origin="$FisheryRegion"> - <TreeNode id="cellsTreeNode" name="Cells" type="fr.ifremer.isisfish.entities.Cell"> - <TreeNode treeOrigin="../.." childsPropertyName="cell"/> - </TreeNode> - <TreeNode id="zonesTreeNode" name="Zones" type="fr.ifremer.isisfish.entities.Zone"> - <TreeNode id="zoneNode" treeOrigin="../.." childsPropertyName="zone"/> - </TreeNode> - <TreeNode name="Ports" type="fr.ifremer.isisfish.entities.Port"> - <TreeNode treeOrigin="../.." childsPropertyName="port"/> - </TreeNode> - <TreeNode name="Species" type="fr.ifremer.isisfish.entities.Species"> - <TreeNode treeOrigin="../.." childsPropertyName="species"> - <TreeNode name="Populations" type="fr.ifremer.isisfish.entities.Population"> - <TreeNode treeOrigin="../.." childsPropertyName="getPopulation(.)"/> - </TreeNode> - </TreeNode> - </TreeNode> - <TreeNode name="Gears" type="fr.ifremer.isisfish.entities.Gear"> - <TreeNode treeOrigin="../.." childsPropertyName="gear"/> - </TreeNode> - <TreeNode name="Metiers" type="fr.ifremer.isisfish.entities.Metier"> - <TreeNode treeOrigin="../.." childsPropertyName="metier"/> - </TreeNode> - <TreeNode name="TripTypes" type="fr.ifremer.isisfish.entities.TripType"> - <TreeNode treeOrigin="../.." childsPropertyName="tripType"/> - </TreeNode> - <TreeNode name="VesselTypes" type="fr.ifremer.isisfish.entities.VesselType"> - <TreeNode treeOrigin="../.." childsPropertyName="vesselType"/> - </TreeNode> - <TreeNode name="SetOfVessels" type="fr.ifremer.isisfish.entities.SetOfVessels"> - <TreeNode treeOrigin="../.." childsPropertyName="setOfVessels"/> - </TreeNode> - <TreeNode name="Strategies" type="fr.ifremer.isisfish.entities.Strategy"> - <TreeNode treeOrigin="../.." childsPropertyName="strategy"/> - </TreeNode> - </TreeNode> - </NestedTreeModel> - - <TreeSelectionEvents id="treeSelectionListener" - onValueChanged="input.Input.treeSelectionChanged($inputPane, $tree)"/> - - <TreeRenderer> - <DefaultTreeRenderer childsPropertyName="name"/> - <DefaultTreeRenderer type="java.lang.String"/> - </TreeRenderer> - - <!-- used to update Tree when IsisContext is modified --> - <TopiaEntityEvents id="updateTree" origin="$TopiaContext" - commit="input.Input.updateTreeEntityCommit($tree, $treeModel, $e/initialEvent)" - rollback="input.Input.updateTreeEntityRollback($tree, $treeModel, $e/initialEvent)" - entityRemoved="input.Input.updateTreeEntityRemoved($tree, $treeModel, $e/initialEvent)"/> - - </tree> - </scrollPane> - </hidablePanel> - </panel> - </panel> - <panel id="inputPane" layout="cardlayout"> - <label id="emptyPanel" constraints="emptyPanel" horizontalAlignment="0" - text="isisfish.input.selectNodeTree"/> - - <!-- - + FisheryRegion - +--> - <panel constraints="inputFisheryRegion" id="inputFisheryRegion" layout="BorderLayout"> - <splitpane id="FisheryRegionTab" name="FisheryRegion" - oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> - <xpanel xml="input/FisheryRegion.xml"/> - <panel id="fisheryRegionMapPanel" layout="BorderLayout"> - <OpenMapToolPanel constraints="BorderLayout.NORTH" id="fisheryRegionMapTool"> - <OpenMapToolSet id="fisheryRegionMapToolSet" origin="$fisheryRegionMap"/> - </OpenMapToolPanel> - <OpenMap id="fisheryRegionMap" origin="$FisheryRegion" - selectionMode="0"> - <OpenMapEvents id="fisheryRegionMapEvents" mouseMode="Nav"/> - </OpenMap> - </panel> - </splitpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueCells" - actionCommand="UIHelper.setTreeSelection('Cells')"/> - </panel> - - <!-- - + Cell - +--> - <panel constraints="inputCell" layout="BorderLayout"> - <splitpane id="CellTab" name="Cells" - oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> - <xpanel xml="input/Cell.xml" id="inputCell"/> - <panel id="cellMapPanel" layout="BorderLayout"> - <OpenMapToolPanel constraints="BorderLayout.NORTH" id="cellMapTool"> - <OpenMapToolSet id="cellMapToolSet" origin="$cellMap"/> - </OpenMapToolPanel> - <OpenMap constraints="BorderLayout.CENTER" id="cellMap" - origin="$FisheryRegion" selected="$Cell" selectionMode="1"> - <OpenMapEvents id="cellMapEvents" mouseMode="Select" - onMouseClicked="UIHelper.setTreeSelection($cellMap/selectedCells[1])"/> - </OpenMap> - </panel> - </splitpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueZones" - actionCommand="UIHelper.setTreeSelection('Zones')"/> - </panel> - - <!-- - + Zone - +--> - <panel constraints="inputZone" layout="BorderLayout"> - <splitpane id="ZoneTab" name="Zones" - oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> - <xpanel xml="input/Zone.xml" id="inputZone"/> - <panel id="zoneMapPanel" layout="BorderLayout"> - <OpenMapToolPanel constraints="BorderLayout.NORTH" id="zoneMapTool"> - <OpenMapToolSet id="zoneMapToolSet" origin="$zoneMap"/> - </OpenMapToolPanel> - <OpenMap id="zoneMap" origin="$FisheryRegion" selected="$Zone/cell" - selectionMode="2"> - <OpenMapEvents id="zoneMapEvents" mouseMode="Select" - onMouseClicked="Update($zoneMap/selectedCells, $Zone/cell, refreshView($zoneCells))"/> - </OpenMap> - </panel> - </splitpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continuePorts" - actionCommand="UIHelper.setTreeSelection('Ports')"/> - </panel> - - <!-- - + Port - +--> - <panel constraints="inputPort" layout="BorderLayout"> - <splitpane id="PortTab" name="Ports" - oneTouchExpandable="true" dividerLocation="270" orientation="VERTICAL"> - <xpanel xml="input/Port.xml" id="inputPort"/> - <panel id="portMapPanel" layout="BorderLayout"> - <OpenMapToolPanel constraints="BorderLayout.NORTH" id="portMapTool"> - <OpenMapToolSet id="portMapToolSet" origin="$portMap"/> - </OpenMapToolPanel> - <OpenMap id="portMap" origin="$FisheryRegion" selected="$Port/cell" - selectionMode="1"> - <OpenMapEvents id="portMapEvents" mouseMode="Select" - onMouseClicked="Update($portMap/selectedCells[1], $Port/cell, refreshView($portCell))"/> - </OpenMap> - </panel> - </splitpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueSpecies" - actionCommand="UIHelper.setTreeSelection('Species')"/> - </panel> - - <!-- - + Species - +--> - <panel id="SpeciesTab" constraints="inputSpecies" layout="BorderLayout"> - <xpanel id="inputSpecies" name="Species" xml="input/Species.xml"/> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continuePopulations" - actionCommand="UIHelper.setTreeSelectionFirstChild($Species)"/> - </panel> - - <!-- - + Population - +--> - <panel constraints="inputPopulation" layout="BorderLayout"> - <tabbedpane id="PopulationTab" name="Populations"> - <xpanel xml="input/PopulationBasics.xml" id="inputPopulationBasics"/> - <xpanel xml="input/PopulationGroup.xml" id="inputPopulationGroup"/> - <xpanel xml="input/PopulationEquation.xml" id="inputPopulationEquation"/> - <xpanel xml="input/PopulationZones.xml" id="inputPopulationZones"/> - <xpanel xml="input/PopulationSeasons.xml" id="inputPopulationSeasonInfo"/> - <xpanel xml="input/PopulationCapturability.xml" id="inputCapturability"/> - <xpanel xml="input/PopulationRecruitment.xml" id="inputPopulationRecruitment"/> - <xpanel xml="input/PopulationMigration.xml" id="inputMigration"/> - </tabbedpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueGears" - actionCommand="UIHelper.setTreeSelection('Gears')"/> - </panel> - - <!-- - + Gear - +--> - <panel constraints="inputGear" layout="BorderLayout"> - <tabbedpane id="GearTab" name="Gear"> - <xpanel xml="input/Gear.xml" id="inputGear"/> - <xpanel xml="input/Selectivity.xml" id="inputSelectivity"/> - </tabbedpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueMetiers" - actionCommand="UIHelper.setTreeSelection('Metiers')"/> - </panel> - - <!-- - + Metier - +--> - <panel constraints="inputMetier" layout="BorderLayout"> - <tabbedpane id="MetierTab" name="Metier" > - <xpanel xml="input/Metier.xml" id="inputMetier"/> - <xpanel xml="input/MetierSeasonInfoZone.xml" id="inputMetierSeasonInfoZone"/> - <xpanel xml="input/MetierSeasonInfoSpecies.xml" id="inputMetierSeasonInfoSpecies"/> - </tabbedpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueTripTypes" - actionCommand="UIHelper.setTreeSelection('TripTypes')"/> - </panel> - - <!-- - + TripType - +--> - <panel id="TripTypeTab" constraints="inputTripType" layout="BorderLayout"> - <xpanel xml="input/TripType.xml" id="inputTripType" name="TripType"/> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueVesselTypes" - actionCommand="UIHelper.setTreeSelection('VesselTypes')"/> - </panel> - - <!-- - + VesselType - +--> - <panel id="VesselTypeTab" constraints="inputVesselType" layout="BorderLayout"> - <xpanel xml="input/VesselType.xml" id="inputVesselType" name="VesselType"/> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueSetOfVessels" - actionCommand="UIHelper.setTreeSelection('SetOfVessels')"/> - </panel> - - <!-- - + SetOfVessels - +--> - <panel constraints="inputSetOfVessels" layout="BorderLayout"> - <tabbedpane id="SetOfVesselsTab" name="SetOfVessels"> - <xpanel xml="input/SetOfVessels.xml" id="inputSetOfVessels"/> - <xpanel xml="input/EffortDescription.xml" id="inputEffortDescription"/> - </tabbedpane> - - <button constraints="BorderLayout.SOUTH" text="isisfish.input.continueStrategies" - actionCommand="UIHelper.setTreeSelection('Strategies')"/> - </panel> - - <!-- - + Strategy - +--> - <tabbedpane constraints="inputStrategy" id="StrategyTab" name="Strategy" > - <xpanel xml="input/Strategy.xml" id="inputStrategy"/> - <xpanel xml="input/StrategyMonthInfo.xml" id="inputStrategyMonthInfo"/> - </tabbedpane> - - </panel> - </splitpane> - - <xpanel constraints="BorderLayout.SOUTH" xml="StatusBar.xml"/> - -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,37 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelMetierName</td> - <td class="field" colspan="2">fieldMetierName</td> - </tr> - <tr> - <td class="label">labelMetierGear</td> - <td class="field" colspan="2">fieldMetierGear</td> - </tr> - <tr> - <td class="label">labelMetierParam</td> - <td class="field" colspan="2">fieldMetierParam</td> - </tr> - <tr> - <td class="label" rowspan="3">labelMetierComment</td> - <td class="field" height="20%" rowspan="3" colspan="2">fieldMetierComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="3" width="100%">panelMetierButtonAction</td> - </tr> - <tr> - <td colspan="3">buttonStrategy</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Metier.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.metier.title" constraints="inputMetierCaract" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Metier.xgl)"> - - <ContextDataSource id="Metier" context="current" source="Metier"/> - - <label constraints="labelMetierName" text="isisfish.metier.name"/> - <textfield constraints="fieldMetierName" id="fieldMetierName" origin="$Metier/name"> - <DocumentEvents onModified="Update($fieldMetierName/text)"/> - </textfield> - - <label constraints="labelMetierGear" text="isisfish.common.gear"/> - <combobox constraints="fieldMetierGear" id="fieldMetierGear" - origin="$Metier/gear" renderer="name" firstNull="true" - actionCommand="update($fieldMetierGear/selectedItem, $Metier/gear)"> - <ComboBoxModel origin="$FisheryRegion/gear"/> - </combobox> - - <label constraints="labelMetierParam" text="isisfish.metier.rangeValues"/> - <textfield constraints="fieldMetierParam" id="fieldMetierParam" origin="$Metier/gearParameterValue"> - <DocumentEvents onModified="Update($fieldMetierParam/text)"/> - </textfield> - - <label constraints="labelMetierComment" text="isisfish.metier.comments"/> - <scrollPane constraints="fieldMetierComment"> - <textarea id="fieldMetierComment" origin="$Metier/comment"> - <DocumentEvents onModified="Update($fieldMetierComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelMetierButtonAction" constraints="panelMetierButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Metier")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Metier", $Metier);refreshView($inputMetier)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Metier", $Metier);refreshView($inputMetier)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Metier" - actionCommand="input.Input.remove($Metier)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,56 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelMetierSeasonInfo</td> - <td class="field" colspan="2">fieldMetierSeasonInfo</td> - </tr> - <tr> - <td class="label">labelTargetSpecies</td> - <td class="field" colspan="2">fieldTargetSpecies</td> - </tr> -<!-- - <tr> - <td class="label">labelTargetFactor</td> - <td class="field" colspan="2">fieldTargetFactor</td> - </tr> ---> - <tr> - <td class="label">labelTargetFactorEquation</td> - <td class="field" colspan="2">fieldTargetFactorEquation</td> - </tr> - <tr> - <td class="label">buttonTargetFactorSaveAsModel</td> - <td class="field" height="40%" colspan="2" rowspan="2">fieldTargetFactorScript</td> - </tr> - <tr><td class="label">buttonTargetFactorEquationEditor</td></tr> - <tr> - <td></td> - <td class="field" colspan="2">fieldPrimaryCatch</td> - </tr> - <tr> - <td fill="Both" colspan="3">buttonMetierSpeciesAddTargetSpecies</td> - </tr> - <tr> - <td fill="Both" colspan="3" height="80%">tableTargetSpecies</td> - </tr> - - <tr> - <td fill="Both" colspan="3">buttonMetierSpeciesRemoveTargetSpecies</td> - </tr> - - <tr> - <td fill="Both" colspan="3" width="100%">panelMetierSeasonInfoSpeciesButtonAction</td> - </tr> - <tr> - <td colspan="3">buttonStrategy</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.metierSeasonInfoSpecies.title" constraints="inputMetierSeasonInfoSpecies" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpecies.xgl)"> - - <label constraints="labelMetierSeasonInfo" text="isisfish.metierSeasonInfoSpecies.selectSeason"/> - <combobox constraints="fieldMetierSeasonInfo" id="fieldMetierSeasonInfo" - firstNull="true" - origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" - actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonInfo/selectedItem)"> - <ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> - </combobox> - - <label constraints="labelTargetSpecies" text="isisfish.metierSeasonInfoSpecies.selectSpecies"/> - <combobox constraints="fieldTargetSpecies" id="fieldTargetSpecies" - firstNull="true" renderer="name"> - <ComboBoxModel origin="$FisheryRegion/species"/> - </combobox> - - <!-- - | TargetFactor equation - +--> - <label constraints="labelTargetFactorEquation" text="isisfish.metierSeasonInfoSpecies.targetFactor"/> - - <combobox constraints="fieldTargetFactorEquation" id="fieldTargetFactorEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldTargetFactorEquation/selectedItem/content, $fieldTargetFactorScript/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "TargetFactor")'/> - </combobox> - - <!-- TODO change Java to $Langage/selectedItem when we can change language --> - <button constraints="buttonTargetFactorSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveAsModel("TargetFactor", "Java", $fieldTargetFactorScript/text);refreshView($fieldTargetFactorEquation)'/> - - <button constraints="buttonTargetFactorEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor("TargetFactor","new","fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation",$fieldTargetFactorScript/text,$fieldTargetFactorScript)'/> - - <scrollPane constraints="fieldTargetFactorScript"> - <editor id="fieldTargetFactorScript" askIfNotSaved="false" - origin="org.codelutin.util.FileUtil.getTempFile('', '.java')"> - </editor> - </scrollPane> - - <!-- - | PrimaryCatch - +--> - <checkbox constraints="fieldPrimaryCatch" id="fieldPrimaryCatch" - text="isisfish.metierSeasonInfoSpecies.mainSpecies"> - </checkbox> - - <!-- - | Add - +--> - <button constraints="buttonMetierSpeciesAddTargetSpecies" id="buttonMetierSpeciesAddTargetSpecies" - text="isisfish.common.add" actionCommand="input.InputMetier.addTargetSpecies($fieldMetierSeasonInfo/selectedItem, $fieldTargetSpecies/selectedItem, $fieldTargetFactorScript/text, $fieldPrimaryCatch/selected)"/> - - <scrollPane constraints="tableTargetSpecies"> - <table id="tableTargetSpecies"> - <tableModel origin="getSpeciesTargetSpecies($MetierSeasonInfo)"> - <column title="Species" property="species" renderer="name"/> - <column title="Target factor" property="targetFactorEquation" renderer="name" editable="true"> - <tableColumnEditor><EquationTableEditor/></tableColumnEditor> - </column> - <column title="Main species for the metier" property="primaryCatch" - type="boolean" editable="true"/> - </tableModel> - </table> - </scrollPane> - - <button constraints="buttonMetierSpeciesRemoveTargetSpecies" id="buttonMetierSpeciesRemoveTargetSpecies" - text="isisfish.common.remove" actionCommand="input.InputMetier.removeTargetSpecies(getSpeciesTargetSpecies($MetierSeasonInfo)[$tableTargetSpecies/selectedRow + 1])"/> - - <panel id="panelMetierSeasonInfoSpeciesButtonAction" constraints="panelMetierSeasonInfoSpeciesButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,39 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelMetierSeasonChoice</td> - <td class="field">fieldMetierSeasonChoice</td> - <td fill="Both">buttonMetierSeasonRemove</td> - <td fill="Both">buttonMetierSeasonCreate</td> - </tr> - <tr> - <td class="label">labelMetierSeason</td> - <td fill="Both" colspan="3">displayMetierSeason</td> - </tr> - <tr> - <td class="label">labelMetierZone</td> - <td class="field" colspan="3" height="80%">fieldMetierZone</td> - </tr> - <tr> - <td class="label" rowspan="3">labelMetierSeasonZoneComment</td> - <td class="field" height="20%" rowspan="3" colspan="3">fieldMetierSeasonZoneComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="4" width="100%">panelMetierSeasonInfoZoneButtonAction</td> - </tr> - <tr> - <td colspan="4">buttonStrategy</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.metierSeasonInfoZone.title" constraints="inputMetierSeasonInfoZone" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/MetierSeasonInfoZone.xgl)"> - - <ContextDataSource id="MetierSeasonInfo" context="current" source="MetierSeasonInfo"/> - - <label constraints="labelMetierSeasonChoice" text="isisfish.metierSeasonInfoZone.selectSeason"/> - <combobox constraints="fieldMetierSeasonChoice" id="fieldMetierSeasonChoice" - firstNull="true" - origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" - actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonChoice/selectedItem)"> - <ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> - </combobox> - - <label constraints="labelMetierSeason" text="isisfish.metierSeasonInfoZone.season"/> - <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> - - <label constraints="labelMetierZone" text="isisfish.common.zone"/> - <scrollPane constraints="fieldMetierZone"> - <list id="metierZones" origin="$MetierSeasonInfo/zone" renderer="name"> - <ListModel origin="$FisheryRegion/zone"/> - <ListSelectionEvents onValueChanged="Update($metierZones/selectedValues)"/> - </list> - </scrollPane> - - <label constraints="labelMetierSeasonZoneComment" text="isisfish.metierSeasonInfoZone.comments"/> - <scrollPane constraints="fieldMetierSeasonZoneComment"> - <textarea id="fieldMetierSeasonZoneComment" origin="$MetierSeasonInfo/seasonZoneComment"> - <DocumentEvents onModified="Update($fieldMetierSeasonZoneComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelMetierSeasonInfoZoneButtonAction" constraints="panelMetierSeasonInfoZoneButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.InputMetier.createSeasonInfo($Metier)'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoZone)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoZone)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$MetierSeasonInfo" - actionCommand="input.InputMetier.removeSeasonInfo($Metier, $MetierSeasonInfo)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,68 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" colspan="3" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelPopulationBasicsName</td> - <td class="field">fieldPopulationBasicsName</td> - </tr> - <tr> - <td class="label">labelPopulationBasicsGeographicID</td> - <td class="field">fieldPopulationBasicsGeographicID</td> - </tr> - <tr> - <td class="field" colspan="2">fieldPopulationBasicsDynamicAge</td> - <td class="field" colspan="2">fieldPopulationBasicsDynamicLength</td> - </tr> - <tr> - <td class="label">labelPopulationBasicsNbClasses</td> - <td class="field" colspan="1">fieldPopulationBasicsNbClasses</td> - <td class="field" colspan="2">buttonPopulationBasicsCreateClasses</td> - </tr> - <tr> - <td class="label">labelPopulationBasicsMatureClass</td> - <td class="field" colspan="1">fieldPopulationBasicsMatureClass</td> - <td class="field" colspan="2">fieldPopulationBasicsPlusGroup</td> - </tr> - <tr> - <td class="field" colspan="4">tableAgeLength</td> - </tr> - <tr> - <td class="label">labelPopulationBasicsGrowth</td> - <td class="field">fieldPopulationBasicsGrowth</td> - </tr> - <tr> - <td class="label">buttonPopulationBasicsGrowthSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationBasicsGrowth</td> - </tr> - <tr><td class="label">buttonPopulationBasicsGrowthEquationEditor</td></tr> - <tr></tr> - - <tr> - <td class="label">labelPopulationBasicsGrowthReverse</td> - <td class="field">fieldPopulationBasicsGrowthReverse</td> - </tr> - <tr> - <td class="label">buttonPopulationBasicsGrowthReverseSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationBasicsGrowthReverse</td> - </tr> - <tr><td class="label">buttonPopulationBasicsGrowthReverseEquationEditor</td></tr> - <tr></tr> - - <tr> - <td class="label" rowspan="3">labelPopulationBasicsComment</td> - <td class="field" height="20%" rowspan="3">fieldPopulationBasicsComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="4" width="100%">panelPopulationBasicsButtonAction</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasics.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationBasics.title" constraints="inputPopulationBasics" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationBasics.xgl)"> - - <ContextDataSource id="Population" context="current" source="Population"/> - - <label constraints="labelPopulationBasicsName" text="isisfish.populationBasics.name"/> - <textfield constraints="fieldPopulationBasicsName" id="fieldPopulationBasicsName" - origin="$Population/name"> - <DocumentEvents onModified="Update($fieldPopulationBasicsName/text)"/> - </textfield> - - <label constraints="labelPopulationBasicsGeographicID" text="isisfish.populationBasics.geographicID"/> - <textfield constraints="fieldPopulationBasicsGeographicID" id="fieldPopulationBasicsGeographicID" - origin="$Population/geographicId"> - <DocumentEvents onModified="Update($fieldPopulationBasicsGeographicID/text)"/> - </textfield> - - <!-- TODO radioButton dynamique en age / longueur --> - - <label constraints="labelPopulationBasicsNbClasses" text="isisfish.populationBasics.numberGroup"/> - <textfield constraints="fieldPopulationBasicsNbClasses" id="fieldPopulationBasicsNbClasses" - origin="sizePopulationGroup($Population)" editable="false"/> - - <button constraints="buttonPopulationBasicsCreateClasses" - id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" - actionCommand="input.InputPopulation.wizardGroupOpen($Population)"/> - - <label constraints="labelPopulationBasicsMatureClass" text="isisfish.populationBasics.maturityGroup"/> - <combobox constraints="fieldPopulationBasicsMatureClass" - id="fieldPopulationBasicsMatureClass" - firstNull="true" - origin="$Population/maturityGroup" renderer="concat(population/name, ' - ', id)" - actionCommand="update($fieldPopulationBasicsMatureClass/selectedItem, $Population/maturityGroup)"> - <ComboBoxModel origin="$Population/populationGroup"/> - </combobox> - - <checkbox constraints="fieldPopulationBasicsPlusGroup" id="fieldPopulationBasicsPlusGroup" - origin="$Population/plusGroup" text="isisfish.populationBasics.plusGroup"> - <MouseEvents onClicked="Update($fieldPopulationBasicsPlusGroup/selected)"/> - </checkbox> - - <table constraints="tableAgeLength" layDown="true"> - <tableModel origin="$Population/populationGroup"> - <column title="Age" property="age"/> - <column title="Length" property="length"/> - </tableModel> - </table> - - <label constraints="labelPopulationBasicsGrowth" text="isisfish.populationBasics.growth"/> - <combobox constraints="fieldPopulationBasicsGrowth" id="fieldPopulationBasicsGrowth" - origin="$Population/growth" renderer="name" firstNull="true" - actionCommand="update($fieldPopulationBasicsGrowth/selectedItem/content, $fieldScriptPopulationBasicsGrowth/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Growth")'/> - </combobox> - - <button constraints="buttonPopulationBasicsGrowthSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Population/growth);refreshView($fieldPopulationBasicsGrowth)'/> - - <button constraints="buttonPopulationBasicsGrowthEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/growth/category,$Population/growth/name,$Population/growth/javaInterface,$Population/growth/content,$fieldScriptPopulationBasicsGrowth)'/> - - <editor constraints="fieldScriptPopulationBasicsGrowth" askIfNotSaved="false" - id="fieldScriptPopulationBasicsGrowth" - origin="org.codelutin.util.FileUtil.getTempFile($Population/growth/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationGrowth($Population, $fieldScriptPopulationBasicsGrowth/text)"/> - </DocumentEvents> - </editor> - - <label constraints="labelPopulationBasicsGrowthReverse" text="isisfish.populationBasics.growthReverse"/> - <combobox constraints="fieldPopulationBasicsGrowthReverse" id="fieldPopulationBasicsGrowthReverse" - origin="$Population/growthReverse" renderer="name" firstNull="true" - actionCommand="update($fieldPopulationBasicsGrowthReverse/selectedItem/content, $fieldScriptPopulationBasicsGrowthReverse/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "GrowthReverse")'/> - </combobox> - - <button constraints="buttonPopulationBasicsGrowthReverseSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Population/growthReverse);refreshView($fieldPopulationBasicsGrowthReverse)'/> - - <button constraints="buttonPopulationBasicsGrowthReverseEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/growthReverse/category,$Population/growthReverse/name,$Population/growthReverse/javaInterface,$Population/growthReverse/content,$fieldScriptPopulationBasicsGrowthReverse)'/> - - <editor constraints="fieldScriptPopulationBasicsGrowthReverse" askIfNotSaved="false" id="fieldScriptPopulationBasicsGrowthReverse" origin="org.codelutin.util.FileUtil.getTempFile($Population/growthReverse/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationGrowthReverse($Population, $fieldScriptPopulationBasicsGrowthReverse/text)"/> - </DocumentEvents> - </editor> - - <label constraints="labelPopulationBasicsComment" text="isisfish.population.comments"/> - <scrollPane constraints="fieldPopulationBasicsComment"> - <textarea id="fieldPopulationBasicsComment" origin="$Population/comment"> - <DocumentEvents onModified="Update($fieldPopulationBasicsComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPopulationBasicsButtonAction" constraints="panelPopulationBasicsButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.InputPopulation.create()'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationBasics)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationBasics)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Population" - actionCommand="input.Input.remove($Population)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,29 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="50%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationCapturability</td> - </tr> - <tr> - <td class="field">fieldPopulationCapturability</td> - </tr> - <tr> - <td class="labelTitle">labelPopulationCapturabilityComment</td> - </tr> - <tr> - <td class="field" height="20%">fieldPopulationCapturabilityComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" width="100%">panelPopulationCapturabilityButtonAction</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturability.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.populationCapturability.title" constraints="inputPopulationCapturability" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationCapturability.xgl)"> - - <label constraints="labelPopulationCapturability" text="isisfish.populationCapturability.selectCoefficient"/> - - <MatrixPanel constraints="fieldPopulationCapturability" id="fieldPopulationCapturability" - origin="copy($Population/capturability)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationCapturability/matrix), $Population/capturability)"/> - </MatrixPanel> - - - <label constraints="labelPopulationCapturabilityComment" text="isisfish.populationCapturability.comments"/> - <scrollPane constraints="fieldPopulationCapturabilityComment"> - <textarea id="fieldPopulationCapturabilityComment" origin="$Population/capturabilityComment"> - <DocumentEvents onModified="Update($fieldPopulationCapturabilityComment/text)"/> - </textarea> - </scrollPane> - - - <panel id="panelPopulationCapturabilityButtonAction" constraints="panelPopulationCapturabilityButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($inputCapturability)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputCapturability)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,66 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" colspan="3" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - - <!-- - | - | NaturalDeathRate - | - +--> - - <tr> - <td class="label">labelPopulationNaturalDeathRate</td> - <td class="field">fieldPopulationNaturalDeathRate</td> - </tr> - <tr> - <td class="label">buttonPopulationNaturalDeathRateSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationNaturalDeathRate</td> - </tr> - <tr><td class="label">buttonPopulationNaturalDeathRateEquationEditor</td></tr> - <tr></tr> - - <!-- - | - | MeanWeight - | - +--> - - <tr> - <td class="label">labelPopulationMeanWeight</td> - <td class="field">fieldPopulationMeanWeight</td> - </tr> - <tr> - <td class="label">buttonPopulationMeanWeightSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationMeanWeight</td> - </tr> - <tr><td class="label">buttonPopulationMeanWeightEquationEditor</td></tr> - <tr></tr> - - <!-- - | - | Price - | - +--> - - <tr> - <td class="label">labelPopulationPrice</td> - <td class="field">fieldPopulationPrice</td> - </tr> - <tr> - <td class="label">buttonPopulationPriceSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationPrice</td> - </tr> - <tr><td class="label">buttonPopulationPriceEquationEditor</td></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="4" width="100%">panelPopulationEquationButtonAction</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquation.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.populationEquation.title" constraints="inputPopulationEquation" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationEquation.xgl)"> - - <!-- - | - | NaturalDeathRate - | - +--> - - <label constraints="labelPopulationNaturalDeathRate" text="isisfish.populationEquation.naturalDeathRate"/> - <combobox constraints="fieldPopulationNaturalDeathRate" id="fieldPopulationNaturalDeathRate" - origin="$Population/naturalDeathRate" renderer="name" firstNull="true" - actionCommand="update($fieldPopulationNaturalDeathRate/selectedItem/content, $fieldScriptPopulationNaturalDeathRate/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "NaturalDeathRate")'/> - </combobox> - - <button constraints="buttonPopulationNaturalDeathRateSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Population/naturalDeathRate);refreshView($fieldPopulationNaturalDeathRate)'/> - - <button constraints="buttonPopulationNaturalDeathRateEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/naturalDeathRate/category,$Population/naturalDeathRate/name,$Population/naturalDeathRate/javaInterface,$Population/naturalDeathRate/content,$fieldScriptPopulationNaturalDeathRate)'/> - - <editor constraints="fieldScriptPopulationNaturalDeathRate" askIfNotSaved="false" - id="fieldScriptPopulationNaturalDeathRate" - origin="org.codelutin.util.FileUtil.getTempFile($Population/naturalDeathRate/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationNaturalDeathRate($Population, $fieldScriptPopulationNaturalDeathRate/text)"/> - </DocumentEvents> - </editor> - - <!-- - | - | MeanWeight - | - +--> - - <label constraints="labelPopulationMeanWeight" text="isisfish.populationEquation.meanWeight"/> - <combobox constraints="fieldPopulationMeanWeight" id="fieldPopulationMeanWeight" - origin="$Population/meanWeight" renderer="name" firstNull="true" - actionCommand="update($fieldPopulationMeanWeight/selectedItem/content, $fieldScriptPopulationMeanWeight/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "MeanWeight")'/> - </combobox> - - <button constraints="buttonPopulationMeanWeightSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Population/meanWeight);refreshView($fieldPopulationMeanWeight)'/> - - <button constraints="buttonPopulationMeanWeightEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/meanWeight/category,$Population/meanWeight/name,$Population/meanWeight/javaInterface,$Population/meanWeight/content,$fieldScriptPopulationMeanWeight)'/> - - <editor constraints="fieldScriptPopulationMeanWeight" askIfNotSaved="false" - id="fieldScriptPopulationMeanWeight" - origin="org.codelutin.util.FileUtil.getTempFile($Population/meanWeight/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationMeanWeight($Population, $fieldScriptPopulationMeanWeight/text)"/> - </DocumentEvents> - </editor> - - <!-- - | - | Price - | - +--> - - <label constraints="labelPopulationPrice" text="isisfish.populationEquation.price"/> - <combobox constraints="fieldPopulationPrice" id="fieldPopulationPrice" - origin="$Population/price" renderer="name" firstNull="true" - actionCommand="update($fieldPopulationPrice/selectedItem/content, $fieldScriptPopulationPrice/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Price")'/> - </combobox> - - <button constraints="buttonPopulationPriceSaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Population/price);refreshView($fieldPopulationPrice)'/> - - <button constraints="buttonPopulationPriceEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/price/category,$Population/price/name,$Population/price/javaInterface,$Population/price/content,$fieldScriptPopulationPrice)'/> - - <editor constraints="fieldScriptPopulationPrice" askIfNotSaved="false" - id="fieldScriptPopulationPrice" - origin="org.codelutin.util.FileUtil.getTempFile($Population/price/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationPrice($Population, $fieldScriptPopulationPrice/text)"/> - </DocumentEvents> - </editor> - - <!-- - | - | Action button - | - +--> - - <panel id="panelPopulationEquationButtonAction" constraints="panelPopulationEquationButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationEquation)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationEquation)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,62 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelPopulationGroupPopulationGroup</td> - <td class="field" colspan="2">fieldPopulationGroupPopulationGroup</td> - </tr> - <tr> - <td class="label">labelPopulationGroupMeanWeight</td> - <td class="field" colspan="2">fieldPopulationGroupMeanWeight</td> - </tr> - <tr> - <td class="label">labelPopulationGroupPrice</td> - <td class="field" colspan="2">fieldPopulationGroupPrice</td> - </tr> - <tr> - <td class="label">labelPopulationGroupNaturalDeathRate</td> - <td class="field" colspan="2">fieldPopulationGroupNaturalDeathRate</td> - </tr> - <tr> - <td class="label">labelPopulationGroupReproductionRate</td> - <td class="field" colspan="2">fieldPopulationGroupReproductionRate</td> - </tr> - <tr> - <td class="label">labelPopulationGroupAge</td> - <td class="field" colspan="2">panelAge</td> - </tr> - <tr> - <td class="label">labelPopulationGroupLength</td> - <td class="field" colspan="2">panelLength</td> - </tr> - - <tr> - <td class="label" rowspan="3">labelPopulationGroupComment</td> - <td class="field" height="20%" rowspan="3" colspan="2">fieldPopulationGroupComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="3" width="100%">panelPopulationGroupButtonAction</td> - </tr> - </table> - - <table> - <tr> - <td class="field" colspan="2">fieldPopulationGroupAge</td> - <td class="field" colspan="2">fieldPopulationGroupAgeNotEditable</td> - </tr> - <tr> - <td class="field" colspan="2">fieldPopulationGroupLength</td> - <td class="field">fieldPopulationGroupMinLength</td> - <td class="field">fieldPopulationGroupMaxLength</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroup.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationGroup.title" constraints="inputPopulationGroup" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationGroup.xgl)"> - - <ContextDataSource id="PopulationGroup" context="current" source="PopulationGroup"/> - - <label constraints="labelPopulationGroupPopulationGroup" text="isisfish.common.populationGroup"/> - <combobox constraints="fieldPopulationGroupPopulationGroup" - id="fieldPopulationGroupPopulationGroup" renderer="concat(population/name, ' - ', id)" - origin="$PopulationGroup" firstNull="true" - actionCommand="input.Input.selectEntity('PopulationGroup', $fieldPopulationGroupPopulationGroup/selectedItem)"> - <ComboBoxModel origin="$Population/populationGroup"/> - </combobox> - - <label constraints="labelPopulationGroupMeanWeight" text="isisfish.populationGroup.meanWeigth"/> - <textfield constraints="fieldPopulationGroupMeanWeight" id="fieldPopulationGroupMeanWeight" - origin="$PopulationGroup/meanWeight" editable="false"/> - - <label constraints="labelPopulationGroupPrice" text="isisfish.populationGroup.price"/> - <textfield constraints="fieldPopulationGroupPrice" id="fieldPopulationGroupPrice" - origin="$PopulationGroup/price" editable="false"/> - - <label constraints="labelPopulationGroupNaturalDeathRate" text="isisfish.populationGroup.naturalDeathRate"/> - <matrixPanel constraints="fieldPopulationGroupNaturalDeathRate" - id="fieldPopulationGroupNaturalDeathRate" - origin="reduce(getSubMatrixOnSemantic($Population/naturalDeathRateMatrix, '0', util:array($PopulationGroup)))" /> - - <label constraints="labelPopulationGroupReproductionRate" text="isisfish.populationGroup.reproductionRate"/> - <textfield constraints="fieldPopulationGroupReproductionRate" id="fieldPopulationGroupReproductionRate" - origin="$PopulationGroup/reproductionRate"> - <DocumentEvents onModified="Update($fieldPopulationGroupReproductionRate/text)"/> - </textfield> - - <label constraints="labelPopulationGroupAge" text="isisfish.populationGroup.age"/> - <panel constraints="panelAge" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationGroup.xgl)"> - <!-- - | Pour les especes en age - +--> - <hidablePanel constraints="fieldPopulationGroupAge" layout="BorderLayout" - origin="$PopulationGroup/population/species/ageGroupType"> - <textfield constraints="fieldPopulationGroupAge" id="fieldPopulationGroupAge" - origin="$PopulationGroup/age"> - <DocumentEvents onModified="Update($fieldPopulationGroupAge/text)"/> - </textfield> - </hidablePanel> - <!-- - | Pour les especes en longueur - +--> - <hidablePanel constraints="fieldPopulationGroupAgeNotEditable" layout="BorderLayout" - origin="not(getAgeGroupType($PopulationGroup/population/species))"> - <textfield constraints="fieldPopulationGroupAge" - origin="$PopulationGroup/age" editable="false"/> - </hidablePanel> - </panel> - - <label constraints="labelPopulationGroupLength" text="isisfish.populationGroup.length"/> - <panel constraints="panelLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationGroup.xgl)"> - <!-- - | Pour les especes en age - +--> - <hidablePanel constraints="fieldPopulationGroupLength" layout="BorderLayout" - origin="$PopulationGroup/population/species/ageGroupType"> - <textfield constraints="fieldPopulationGroupLength" id="fieldPopulationGroupLength" - origin="$PopulationGroup/length" editable="false"/> - </hidablePanel> - <!-- - | Pour les especes en longueur - +--> - <hidablePanel constraints="fieldPopulationGroupMinLength" layout="BorderLayout" - origin="not(getAgeGroupType($PopulationGroup/population/species))"> - <textfield id="fieldPopulationGroupMinLength" - origin="$PopulationGroup/minLength" toolTipText="minimum length"> - <DocumentEvents onModified="Update($fieldPopulationGroupMinLength/text)"/> - </textfield> - </hidablePanel> - - <hidablePanel constraints="fieldPopulationGroupMaxLength" layout="BorderLayout" - origin="not(getAgeGroupType($PopulationGroup/population/species))"> - <textfield id="fieldPopulationGroupMaxLength" - origin="$PopulationGroup/maxLength" toolTipText="maximum length"> - <DocumentEvents onModified="Update($fieldPopulationGroupMaxLength/text)"/> - </textfield> - </hidablePanel> - </panel> - - <label constraints="labelPopulationGroupComment" text="isisfish.populationGroup.comments"/> - <scrollPane constraints="fieldPopulationGroupComment"> - <textarea id="fieldPopulationGroupComment" origin="$PopulationGroup/comment"> - <DocumentEvents onModified="Update($fieldPopulationGroupComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPopulationGroupButtonAction" constraints="panelPopulationGroupButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,43 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationMigrationSeasonChooser</td> - <td class="field">fieldPopulationMigrationSeasonChooser</td> - </tr> - <tr> - <td class="field">fieldUseEquationMigration</td> - </tr> - <tr> - <td class="labelTitle" fill="Both" height="100%" width="100%" colspan="2">hideablePanel</td> - </tr> - <tr> - <td class="labelTitle">labelPopulationMigrationComment</td> - <td class="field" height="20%">fieldPopulationMigrationComment</td> - </tr> - - <tr> - <td fill="Both" colspan="2" width="100%">panelPopulationMigrationButtonAction</td> - </tr> -</table> - -<table> - <tr> - <td fill="Both" height="100%" width="100%">fieldUseEquation</td> - <td fill="Both" height="100%" width="100%">fieldUseMatrix</td> - </tr> -</table> - -<table cellspacing="5"> - <tr> - <td fill="Both" width="100%">buttonPopulationMigrationSave</td> - <td fill="Both" width="100%">buttonPopulationMigrationCancel</td> - </tr> -</table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigration.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationMigration.title" constraints="inputPopulationMigration" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigration.xgl)"> - - <label constraints="labelPopulationMigrationSeasonChooser" text="isisfish.populationMigration.selectSeason"/> - <ComboBox constraints="fieldPopulationMigrationSeasonChooser" - id="fieldPopulationMigrationSeasonChooser" firstNull="true" - origin="getPopulationSeasonInfo($Population)" - actionCommand="input.Input.selectEntityAndRefresh('PopulationSeasonInfo', $fieldPopulationMigrationSeasonChooser/selectedItem, '(fieldUseEquationMigration|hideablePanel)')" /> - - <checkbox constraints="fieldUseEquationMigration" id="fieldUseEquationMigration" - origin="$PopulationSeasonInfo/useEquationMigration" text="isisfish.populationMigration.useEquation"> - <ItemEvents onStateChanged="Update($fieldUseEquationMigration/selected, $PopulationSeasonInfo/useEquationMigration, refreshView($hideablePanel))"/> - </checkbox> - - <panel id="hideablePanel" constraints="hideablePanel" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigration.xgl)"> - - <hidablePanel constraints="fieldUseEquation" layout="BorderLayout" - origin="getUseEquationMigration($PopulationSeasonInfo)"> - <xpanel xml="input/PopulationMigrationEquation.xml"/> - </hidablePanel> - - <hidablePanel constraints="fieldUseMatrix" layout="BorderLayout" - origin="not(getUseEquationMigration($PopulationSeasonInfo))"> - <tabbedpane id="PopulationMigrationTabbed" constraints="PopulationMigrationTabbed"> - <xpanel xml="input/PopulationMigrationMigration.xml"/> - <xpanel xml="input/PopulationMigrationImmigration.xml"/> - <xpanel xml="input/PopulationMigrationEmigration.xml"/> - </tabbedpane> - </hidablePanel> - - </panel> - - <label constraints="labelPopulationMigrationComment" text="isisfish.populationMigration.comments"/> - <scrollPane constraints="fieldPopulationMigrationComment"> - <textarea id="fieldPopulationMigrationComment" origin="$Population/migrationComment"> - <DocumentEvents onModified="Update($fieldPopulationMigrationComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPopulationMigrationButtonAction" constraints="panelPopulationMigrationButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigration.xgl)"> - - <button constraints="buttonPopulationMigrationSave" text="isisfish.common.save" - origin="$EntityModified" - actionCommand="input.Input.save('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)"/> - - <button constraints="buttonPopulationMigrationCancel" text="isisfish.common.cancel" - origin="$EntityModified" - actionCommand="input.Input.cancel('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)"/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,29 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationMigrationEmigrationGroupChooser</td> - <td class="field">fieldPopulationMigrationEmigrationGroupChooser</td> - <td class="labelTitle">labelPopulationMigrationEmigrationCoefficient</td> - <td class="field">fieldPopulationMigrationEmigrationCoefficient</td> - </tr> - <tr> - <td class="labelTitle">labelPopulationMigrationEmigrationDepartureZoneChooser</td> - <td class="field">fieldPopulationMigrationEmigrationDepartureZoneChooser</td> - </tr> - <tr> - <td colspan="4">buttonAdd</td> - </tr> - <tr> - <td class="field" height="100%" colspan="4">PopulationMigrationEmigrationTable</td> - </tr> - <tr> - <td colspan="4">buttonRemove</td> - </tr> -</table> -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationMigrationEmigration.title" constraints="inputPopulationMigrationEmigration" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigrationEmigration.xgl)"> - - <ContextDataSource id="Emigration" context="current" source="Emigration"/> - - <label constraints="labelPopulationMigrationEmigrationGroupChooser" text="isisfish.common.populationGroup"/> - <ComboBox constraints="fieldPopulationMigrationEmigrationGroupChooser" - id="fieldPopulationMigrationEmigrationGroupChooser" firstNull="true" - origin="getPopulationGroup($Population)" /> - - <label constraints="labelPopulationMigrationEmigrationCoefficient" - text="isisfish.populationMigrationEmigration.coefficient"/> - <textfield constraints="fieldPopulationMigrationEmigrationCoefficient" - id="fieldPopulationMigrationEmigrationCoefficient"/> - - <label constraints="labelPopulationMigrationEmigrationDepartureZoneChooser" - text="isisfish.populationMigrationEmigration.departureZone"/> - <ComboBox constraints="fieldPopulationMigrationEmigrationDepartureZoneChooser" - id="fieldPopulationMigrationEmigrationDepartureZoneChooser" - origin="getPopulationZone($Population)" firstNull="true" /> - - <button constraints="buttonAdd" id="buttonPopulationMigrationEmigrationAdd" - text="isisfish.common.add" - actionCommand="input.InputPopulation.addEmigration($fieldPopulationMigrationEmigrationGroupChooser/selectedItem, $fieldPopulationMigrationEmigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationEmigrationCoefficient/text)"/> - - <MatrixPanel constraints="PopulationMigrationEmigrationTable" id="PopulationMigrationEmigrationTable" - origin="copy($PopulationSeasonInfo/emigrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationEMigrationTable/matrix), $PopulationSeasonInfo/emigrationMatrix)"/> - </MatrixPanel> - - <button constraints="buttonRemove" - id="buttonPopulationMigrationEmigrationRemove" text="isisfish.common.remove" - actionCommand="input.InputPopulation.removeEmigration($PopulationMigrationEmigrationTable)"/> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,46 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" colspan="3" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <!-- Migration --> - <tr> - <td class="label">labelPopulationMigrationEquationMigration</td> - <td class="field">fieldPopulationMigrationEquationMigration</td> - </tr> - <tr> - <td class="label">buttonPopulationMigrationEquationMigrationSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationMigrationEquationMigration</td> - </tr> - <tr><td class="label">buttonPopulationMigrationEquationMigrationEquationEditor</td></tr> - <tr></tr> - - <!-- Emigration --> - <tr> - <td class="label">labelPopulationMigrationEquationEmigration</td> - <td class="field">fieldPopulationMigrationEquationEmigration</td> - </tr> - <tr> - <td class="label">buttonPopulationMigrationEquationEmigrationSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationMigrationEquationEmigration</td> - </tr> - <tr><td class="label">buttonPopulationMigrationEquationEmigrationEquationEditor</td></tr> - <tr></tr> - - <!-- Immigration --> - <tr> - <td class="label">labelPopulationMigrationEquationImmigration</td> - <td class="field">fieldPopulationMigrationEquationImmigration</td> - </tr> - <tr> - <td class="label">buttonPopulationMigrationEquationImmigrationSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationMigrationEquationImmigration</td> - </tr> - <tr><td class="label">buttonPopulationMigrationEquationImmigrationEquationEditor</td></tr> - <tr></tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationMigrationEquation.title" constraints="inputPopulationMigrationEquation" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl)"> - - <!-- - | Migration - + --> - <label constraints="labelPopulationMigrationEquationMigration" - text="isisfish.common.migration"/> - <combobox constraints="fieldPopulationMigrationEquationMigration" - id="fieldPopulationMigrationEquationMigration" - origin="$PopulationInfoSaison/migrationEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldPopulationMigrationEquationMigration/selectedItem/content, $fieldScriptPopulationMigrationEquationMigration/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Migration")'/> - </combobox> - - <button constraints="buttonPopulationMigrationEquationMigrationSaveAsModel" - text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/migrationEquation);refreshView($fieldPopulationMigrationEquationMigration)'/> - - <button constraints="buttonPopulationMigrationEquationMigrationEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($PopulationSeasonInfo/migrationEquation/category,$PopulationSeasonInfo/migrationEquation/name,$PopulationSeasonInfo/migrationEquation/javaInterface,$PopulationSeasonInfo/migrationEquation/content,$fieldScriptPopulationMigrationEquationMigration)'/> - - <scrollPane constraints="fieldScriptPopulationMigrationEquationMigration"> - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationMigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/migrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setMigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationMigration/text)"/> - </DocumentEvents> - </editor> - </scrollPane> - - <!-- - | Emigration - + --> - <label constraints="labelPopulationMigrationEquationEmigration" text="isisfish.common.emigration"/> - <combobox constraints="fieldPopulationMigrationEquationEmigration" - id="fieldPopulationMigrationEquationEmigration" - origin="$PopulationInfoSaison/emigrationEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldPopulationMigrationEquationEmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationEmigration/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Emigration")'/> - </combobox> - - <button constraints="buttonPopulationMigrationEquationEmigrationSaveAsModel" - text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/emigrationEquation);refreshView($fieldPopulationMigrationEquationEmigration)'/> - - <button constraints="buttonPopulationMigrationEquationEmigrationEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($PopulationSeasonInfo/emigrationEquation/category,$PopulationSeasonInfo/emigrationEquation/name,$PopulationSeasonInfo/emigrationEquation/javaInterface,$PopulationSeasonInfo/emigrationEquation/content,$fieldScriptPopulationMigrationEquationEmigration)'/> - - <scrollPane constraints="fieldScriptPopulationMigrationEquationEmigration"> - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationEmigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/emigrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationEmigration/text)"/> - </DocumentEvents> - </editor> - </scrollPane> - - <!-- - | Immigration - + --> - <label constraints="labelPopulationMigrationEquationImmigration" - text="isisfish.common.immigration"/> - <combobox constraints="fieldPopulationMigrationEquationImmigration" - id="fieldPopulationMigrationEquationImmigration" - origin="$PopulationInfoSaison/immigrationEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldPopulationMigrationEquationImmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationImmigration/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Immigration")'/> - </combobox> - - <button constraints="buttonPopulationMigrationEquationImmigrationSaveAsModel" - text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/immigrationEquation);refreshView($fieldPopulationMigrationEquationImmigration)'/> - - <button constraints="buttonPopulationMigrationEquationImmigrationEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($PopulationSeasonInfo/immigrationEquation/category,$PopulationSeasonInfo/immigrationEquation/name,$PopulationSeasonInfo/immigrationEquation/javaInterface,$PopulationSeasonInfo/immigrationEquation/content,$fieldScriptPopulationMigrationEquationImmigration)'/> - - <scrollPane constraints="fieldScriptPopulationMigrationEquationImmigration"> - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationImmigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/immigrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setImmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationImmigration/text)"/> - </DocumentEvents> - </editor> - </scrollPane> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,29 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationMigrationImmigrationGroupChooser</td> - <td class="field">fieldPopulationMigrationImmigrationGroupChooser</td> - <td class="labelTitle">labelPopulationMigrationImmigrationCoefficient</td> - <td class="field">fieldPopulationMigrationImmigrationCoefficient</td> - </tr> - <tr> - <td class="labelTitle">labelPopulationMigrationImmigrationArrivalZoneChooser</td> - <td class="field">fieldPopulationMigrationImmigrationArrivalZoneChooser</td> - </tr> - <tr> - <td colspan="4">buttonAdd</td> - </tr> - <tr> - <td class="field" height="100%" colspan="4">PopulationMigrationImmigrationTable</td> - </tr> - <tr> - <td colspan="4">buttonRemove</td> - </tr> -</table> -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationMigrationImmigration.title" constraints="inputPopulationMigrationImmigration" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigrationImmigration.xgl)"> - - <ContextDataSource id="Immigration" context="current" source="Immigration"/> - - <label constraints="labelPopulationMigrationImmigrationGroupChooser" text="isisfish.common.populationGroup"/> - <ComboBox constraints="fieldPopulationMigrationImmigrationGroupChooser" - id="fieldPopulationMigrationImmigrationGroupChooser" - origin="getPopulationGroup($Population)" firstNull="true" /> - - <label constraints="labelPopulationMigrationImmigrationCoefficient" text="isisfish.populationMigrationImmigration.coefficient"/> - <textfield constraints="fieldPopulationMigrationImmigrationCoefficient" id="fieldPopulationMigrationImmigrationCoefficient"/> - - <label constraints="labelPopulationMigrationImmigrationArrivalZoneChooser" text="isisfish.populationMigrationImmigration.arrivalZone"/> - <ComboBox constraints="fieldPopulationMigrationImmigrationArrivalZoneChooser" - id="fieldPopulationMigrationImmigrationArrivalZoneChooser" - origin="getPopulationZone($Population)" firstNull="true" /> - - <button constraints="buttonAdd" id="buttonPopulationMigrationImmigrationAdd" - text="isisfish.common.add" - actionCommand="input.InputPopulation.addImmigration($fieldPopulationMigrationImmigrationGroupChooser/selectedItem, $fieldPopulationMigrationImmigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationImmigrationCoefficient/text)"/> - - <MatrixPanel constraints="PopulationMigrationImmigrationTable" id="PopulationMigrationImmigrationTable" - origin="copy($PopulationSeasonInfo/immigrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationImmigrationTable/matrix), $PopulationSeasonInfo/immigrationMatrix)"/> - </MatrixPanel> - - <button constraints="buttonRemove" id="buttonPopulationImmigrationMigrationRemove" - text="isisfish.common.remove" - actionCommand="input.InputPopulation.removeImmigration($PopulationMigrationImmigrationTable)"/> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,31 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - -<table cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationMigrationMigrationGroupChooser</td> - <td class="field">fieldPopulationMigrationMigrationGroupChooser</td> - <td class="labelTitle">labelPopulationMigrationMigrationCoefficient</td> - <td class="field">fieldPopulationMigrationMigrationCoefficient</td> - </tr> - <tr> - <td class="labelTitle">labelPopulationMigrationMigrationDepartureZoneChooser</td> - <td class="field">fieldPopulationMigrationMigrationDepartureZoneChooser</td> - <td class="labelTitle">labelPopulationMigrationMigrationArrivalZoneChooser</td> - <td class="field">fieldPopulationMigrationMigrationArrivalZoneChooser</td> - </tr> - <tr> - <td colspan="4">buttonAdd</td> - </tr> - <tr> - <td class="field" height="100%" colspan="4">PopulationMigrationMigrationTable</td> - </tr> - <tr> - <td colspan="4">buttonRemove</td> - </tr> -</table> -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationMigrationMigration.title" constraints="inputPopulationMigrationMigration" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationMigrationMigration.xgl)"> - - <ContextDataSource id="Migration" context="current" source="Migration"/> - - <label constraints="labelPopulationMigrationMigrationGroupChooser" text="isisfish.common.populationGroup"/> - <ComboBox constraints="fieldPopulationMigrationMigrationGroupChooser" - id="fieldPopulationMigrationMigrationGroupChooser" - origin="getPopulationGroup($Population)" firstNull="true" /> - - <label constraints="labelPopulationMigrationMigrationCoefficient" text="isisfish.populationMigrationMigration.coefficient"/> - <textfield constraints="fieldPopulationMigrationMigrationCoefficient" - id="fieldPopulationMigrationMigrationCoefficient"/> - - <label constraints="labelPopulationMigrationMigrationDepartureZoneChooser" text="isisfish.populationMigrationMigration.departureZone"/> - <ComboBox constraints="fieldPopulationMigrationMigrationDepartureZoneChooser" - id="fieldPopulationMigrationMigrationDepartureZoneChooser" - origin="getPopulationZone($Population)" firstNull="true" /> - - <label constraints="labelPopulationMigrationMigrationArrivalZoneChooser" text="isisfish.populationMigrationMigration.arrivalZone"/> - <ComboBox constraints="fieldPopulationMigrationMigrationArrivalZoneChooser" - id="fieldPopulationMigrationMigrationArrivalZoneChooser" - origin="getPopulationZone($Population)" firstNull="true" /> - - <button constraints="buttonAdd" id="buttonPopulationMigrationMigrationAdd" text="isisfish.common.add" - actionCommand="input.InputPopulation.addMigration($fieldPopulationMigrationMigrationGroupChooser/selectedItem, $fieldPopulationMigrationMigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationMigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationMigrationCoefficient/text)"/> - - <MatrixPanel constraints="PopulationMigrationMigrationTable" id="PopulationMigrationMigrationTable" - origin="copy($PopulationSeasonInfo/migrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationMigrationTable/matrix), $PopulationSeasonInfo/migrationMatrix)"/> - </MatrixPanel> - - <button constraints="buttonRemove" id="buttonPopulationMigrationMigrationRemove" - text="isisfish.common.remove" - actionCommand="input.InputPopulation.removeMigration($PopulationMigrationMigrationTable)"/> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,47 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelPopulationReproductionEquation</td> - <td class="field">fieldPopulationReproductionEquation</td> - </tr> - <tr> - <td class="label">buttonPopulationReproductionEquationSaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptPopulationReproductionEquation</td> - </tr> - <tr><td class="label">buttonPopulationReproductionEquationEditor</td></tr> - <tr></tr> - <tr> - <td class="label">labelPopulationNaturalDeathBirth</td> - <td class="field">fieldPopulationNaturalDeathBirth</td> - </tr> - <tr> - <td class="label">labelPopulationMonthGapBetweenReproRecrutement</td> - <td class="field">fieldPopulationMonthGapBetweenReproRecrutement</td> - </tr> - <tr> - <td class="label">labelPopulationRecruitmentDistribution</td> - <td class="field">fieldPopulationRecruitmentDistribution</td> - </tr> - <tr> - <td class="label">blank</td> - <td class="field">buttonPopulationRecruitmentDistributionNew</td> - </tr> - <tr> - <td class="label" rowspan="3">labelPopulationRecruitmentComment</td> - <td class="field" height="20%" rowspan="3">fieldPopulationRecruitmentComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="3" width="100%">panelPopulationRecruitmentButtonAction</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitment.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationRecruitment.title" constraints="inputPopulationRecruitment" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationRecruitment.xgl)"> - - <label constraints="labelPopulationReproductionEquation" text="isisfish.populationRecruitment.reproductionEquation"/> - <combobox constraints="fieldPopulationReproductionEquation" - id="fieldPopulationReproductionEquation" firstNull="true" - origin="$Population/reproductionEquation" renderer="name" - actionCommand="update($fieldPopulationReproductionEquation/selectedItem/content, $fieldScriptPopulationReproductionEquation/text)"> - <ComboBoxModel origin="fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext,'Reproduction')" /> - </combobox> - - <button constraints="buttonPopulationReproductionEquationSaveAsModel" - text="isisfish.common.saveModel" - actionCommand="input.Input.saveEquationAsModel($Population/reproductionEquation);refreshView($fieldPopulationReproductionEquation)"/> - - <button constraints="buttonPopulationReproductionEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Population/reproductionEquation/category,$Population/reproductionEquation/name,$Population/reproductionEquation/javaInterface,$Population/reproductionEquation/content,$fieldScriptPopulationReproductionEquation)'/> - - <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> - -<!-- on utilise une equation maintenant - <label constraints="labelPopulationNaturalDeathBirth" text="Natural Death Birth"/> - <textfield constraints="fieldPopulationNaturalDeathBirth" id="fieldPopulationNaturalDeathBirth" - origin="$Population/naturalDeathBirth"> - <DocumentEvents onModified="Update($fieldPopulationNaturalDeathBirth/text)"/> - </textfield> ---> - - <multilabel constraints="labelPopulationMonthGapBetweenReproRecrutement">Month Gap BetweenRepro Recruitment</multilabel> - <textfield constraints="fieldPopulationMonthGapBetweenReproRecrutement" id="fieldPopulationMonthGapBetweenReproRecrutement" - origin="$Population/monthGapBetweenReproRecrutement"> - <DocumentEvents onModified="Update($fieldPopulationMonthGapBetweenReproRecrutement/text)"/> - </textfield> - - <label constraints="labelPopulationRecruitmentDistribution" text="isisfish.populationRecruitment.recruitmentDistribution"/> - <MatrixPanel constraints="fieldPopulationRecruitmentDistribution" id="fieldPopulationRecruitmentDistribution" - origin="copy($Population/recruitmentDistribution)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationRecruitmentDistribution/matrix), $Population/recruitmentDistribution)"/> - </MatrixPanel> - <button constraints="buttonPopulationRecruitmentDistributionNew" id="buttonPopulationRecruitmentDistributionNew" - text="isisfish.common.newMatrix" actionCommand="input.InputPopulation.createRecruitmentDistribution($Population)"/> - - <label constraints="labelPopulationRecruitmentComment" text="isisfish.populationRecruitment.comments"/> - <scrollPane constraints="fieldPopulationRecruitmentComment"> - <textarea id="fieldPopulationRecruitmentComment" origin="$Population/recruitmentComment"> - <DocumentEvents onRemoveUpdate="Update($fieldPopulationRecruitmentComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPopulationRecruitmentButtonAction" constraints="panelPopulationRecruitmentButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationRecruitment)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationRecruitment)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,54 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - <style id="fieldLabel" fill="Horizontal" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelPopulationSeasonInfoChooser</td> - <td class="field" colspan="3">fieldPopulationSeasonInfoChooser</td> - </tr> - <tr> - <td class="label">labelPopulationSeasonInterval</td> - <td class="field" colspan="3">fieldPopulationSeasonInterval</td> - </tr> - <tr> - <td class="label">blank</td> - <td class="field">fieldPopulationSeasonGroupChange</td> - </tr> - <tr> - <td class="label">labelPopulationSeasonGroupChangeLength</td> - <td class="field">fieldPopulationSeasonGroupChangeLength</td> - </tr> - <tr> - <td class="label">blank</td> - <td class="field">fieldPopulationSeasonReproduction</td> - </tr> - <tr> - <td class="label">labelPopulationSeasonReproductionDistribution</td> - <td class="field" colspan="3">fieldPopulationSeasonReproductionDistribution</td> - </tr> - <tr> - <td class="label">labelPopulationSeasonComment</td> - <td class="field" height="20%" colspan="3">fieldPopulationSeasonComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="2" width="100%">panelPopulationSeasonInfoButtonAction</td> - </tr> - </table> - - <table> - <tr><td class="field">labelPopulationSeasonGroupChangeLengthLabel</td></tr> - <tr><td class="field">labelPopulationSeasonGroupChangeLengthNoSpacialized</td></tr> - <tr><td class="field">labelPopulationSeasonGroupChangeLengthSpacialized</td></tr> - <tr><td class="field">labelPopulationSeasonGroupChangeLengthButtonCompute</td></tr> - <tr><td class="field">labelPopulationSeasonGroupChangeLengthButtonShow</td></tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasons.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.populationSeasons.title" constraints="inputPopulationSeasons" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl)"> - - <ContextDataSource id="PopulationSeasonInfo" context="current" source="PopulationSeasonInfo"/> - - <label constraints="labelPopulationSeasonInfoChooser" text="isisfish.populationSeasons.selectSeason"/> - <ComboBox constraints="fieldPopulationSeasonInfoChooser" firstNull="true" - id="fieldPopulationSeasonInfoChooser" origin="$PopulationSeasonInfo" - renderer="concat(firstMonth, '-', lastMonth)" - actionCommand="input.Input.selectEntity('PopulationSeasonInfo', $fieldPopulationSeasonInfoChooser/selectedItem)"> - <ComboBoxModel origin="getPopulationSeasonInfo($Population)"/> - </ComboBox> - - <label constraints="labelPopulationSeasonInterval" text="isisfish.common.season"/> - - <SeasonIntervalPanel constraints="fieldPopulationSeasonInterval" - id="fieldPopulationSeasonInterval" origin="$PopulationSeasonInfo"> - <PropertyChangeEvents onChange="Update" propertyName="first"> - <UpdateOrigin source="$fieldPopulationSeasonInterval/model/first" - target="$PopulationSeasonInfo/firstMonth"/> - </PropertyChangeEvents> - <PropertyChangeEvents onChange="Update" propertyName="last"> - <UpdateOrigin source="$fieldPopulationSeasonInterval/model/last" - target="$PopulationSeasonInfo/lastMonth"/> - </PropertyChangeEvents> - </SeasonIntervalPanel> - - <hidablePanel id="fieldPopulationSeasonGroupChangeHidable" - constraints="fieldPopulationSeasonGroupChange" - layout="BorderLayout" origin="$PopulationSeasonInfo/population/species/ageGroupType"> - - <checkbox id="fieldPopulationSeasonGroupChange" - origin="$PopulationSeasonInfo/groupChange" text="isisfish.populationSeasons.changeGroup"> - <ItemEvents onStateChanged="Update($fieldPopulationSeasonGroupChange/selected)"/> - </checkbox> - </hidablePanel> - - <hidablePanel id="labelPopulationSeasonGroupChangeLengthHidable" - constraints="labelPopulationSeasonGroupChangeLength" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationSeasons.xgl)" - origin="not(getAgeGroupType($PopulationSeasonInfo/population/species))"> - - <label constraints="labelPopulationSeasonGroupChangeLengthLabel" - text="isisfish.populationSeasons.changeGroup"/> - - <radioButton id="labelPopulationSeasonGroupChangeLengthNoSpacialized" - constraints="labelPopulationSeasonGroupChangeLengthNoSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" - origin="getSimpleLengthChangeMatrix($PopulationSeasonInfo)" - text="isisfish.populationSeasons.noSpacialized"> - <ItemEvents onStateChanged="Update($labelPopulationSeasonGroupChangeLengthNoSpacialized/selected, $PopulationSeasonInfo/simpleLengthChangeMatrix, input.InputPopulation.toggleSpacializedMatrixLengthChangeOfGroup($PopulationSeasonInfo))"/> - </radioButton> - - <radioButton id="labelPopulationSeasonGroupChangeLengthSpacialized" - constraints="labelPopulationSeasonGroupChangeLengthSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" - origin="not(getSimpleLengthChangeMatrix($PopulationSeasonInfo))" - text="isisfish.populationSeasons.spacialized"> - </radioButton> - - <button text="isisfish.populationSeasons.computeCoefficient" - constraints="labelPopulationSeasonGroupChangeLengthButtonCompute" - actionCommand='input.InputPopulation.computeMatrixChangeOfGroup($PopulationSeasonInfo)'/> - - <button id="labelPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" - constraints="labelPopulationSeasonGroupChangeLengthButtonShow" - origin="$labelPopulationSeasonGroupChangeLengthNoSpacialized/selected" - actionCommand='input.InputPopulation.showSpacializedMatrixChangeOfGroup($PopulationSeasonInfo)'/> - - </hidablePanel> - - <hidablePanel id="fieldPopulationSeasonGroupChangeLengthHidable" - constraints="fieldPopulationSeasonGroupChangeLength" - layout="BorderLayout" - origin="not(getAgeGroupType($PopulationSeasonInfo/population/species))"> - - <MatrixPanel id="fieldPopulationSeasonGroupChangeLength" - origin="copy($PopulationSeasonInfo/lengthChangeMatrix)"> - <MatrixPanelEvents - onMatrixChanged="Update(copy($fieldPopulationSeasonGroupChangeLength/matrix), $PopulationSeasonInfo/lengthChangeMatrix)"/> - </MatrixPanel> - - </hidablePanel> - - - <checkbox constraints="fieldPopulationSeasonReproduction" id="fieldPopulationSeasonReproduction" - origin="$PopulationSeasonInfo/reproduction" text="isisfish.populationSeasons.Reproduction"> - <ItemEvents onStateChanged="Update($fieldPopulationSeasonReproduction/selected, $PopulationSeasonInfo/reproduction, refreshViewPattern('.*PopulationSeasonReproductionDistributionHidable'))"/> - </checkbox> - - <hidablePanel id="labelPopulationSeasonReproductionDistributionHidable" - constraints="labelPopulationSeasonReproductionDistribution" - layout="BorderLayout" origin="$PopulationSeasonInfo/reproduction"> - <label text="isisfish.populationSeasons.distributionSpawning"/> - </hidablePanel> - - <hidablePanel id="fieldPopulationSeasonReproductionDistributionHidable" - constraints="fieldPopulationSeasonReproductionDistribution" - layout="BorderLayout" origin="$PopulationSeasonInfo/reproduction"> - <MatrixPanel id="fieldPopulationSeasonReproductionDistribution" - origin="copy($PopulationSeasonInfo/reproductionDistribution)"> - <MatrixPanelEvents - onMatrixChanged="Update(copy($fieldPopulationSeasonReproductionDistribution/matrix), $PopulationSeasonInfo/reproductionDistribution)"/> - </MatrixPanel> - </hidablePanel> - - <label constraints="labelPopulationSeasonComment" text="isisfish.populationSeasons.comments"/> - <scrollPane constraints="fieldPopulationSeasonComment"> - <textarea id="fieldPopulationSeasonComment" origin="$Population/seasonsComment"> - <DocumentEvents onModified="Update($fieldPopulationSeasonComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPopulationSeasonInfoButtonAction" constraints="panelPopulationSeasonInfoButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.InputPopulation.createSeasonInfo($Population)'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$PopulationSeasonInfo" - actionCommand="input.InputPopulation.removeSeasonInfo($Population, $PopulationSeasonInfo)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,30 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="50%"/> - </styles> - - <table valign="top" cellspacing="2"> - <tr> - <td class="labelTitle">labelPopulationZonesPresence</td> - <td class="labelTitle">labelPopulationZonesReproduction</td> - <td class="labelTitle">labelPopulationZonesRecruitment</td> - </tr> - <tr> - <td class="field" height="20%">fieldPopulationZonesPresence</td> - <td class="field" height="20%">fieldPopulationZonesReproduction</td> - <td class="field" height="20%">fieldPopulationZonesRecruitment</td> - </tr> - <tr> - <td class="labelTitle" fill="Both" colspan="3" width="100%">labelPopulationMappingZoneReproZoneRecru</td> - </tr> - <tr> - <td fill="Both" colspan="3" width="100%" height="20%">fieldPopulationMappingZoneReproZoneRecru</td> - </tr> - <tr> - <td fill="Both" colspan="3" width="100%">panelPopulationZoneButtonAction</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZones.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.populationZones.title" constraints="inputPopulationZones" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/PopulationZones.xgl)"> - - <label constraints="labelPopulationZonesPresence" text="isisfish.populationZones.selectPopulationAreas"/> - <scrollPane constraints="fieldPopulationZonesPresence"> - <list id="populationZonesPresence" origin="getPopulationZone($Population)" - renderer="name"> - <ListModel origin="$FisheryRegion/zone"/> - <ListSelectionEvents - onValueChanged="Update($populationZonesPresence/selectedValues, $Population/populationZone, refreshViewPattern('fieldPopulationZones.*'))"/> - </list> - </scrollPane> - - <label constraints="labelPopulationZonesReproduction" text="isisfish.populationZones.selectSpawningAreas"/> - <scrollPane constraints="fieldPopulationZonesReproduction"> - <list id="fieldPopulationZonesReproduction" origin="getReproductionZone($Population)" - renderer="name"> - <ListModel origin="getPopulationZone($Population)"/> - <ListSelectionEvents - onValueChanged="Update($fieldPopulationZonesReproduction/selectedValues, $Population/reproductionZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> - </list> - </scrollPane> - - <label constraints="labelPopulationZonesRecruitment" text="isisfish.populationZones.selectRecruitmentAreas"/> - <scrollPane constraints="fieldPopulationZonesRecruitment"> - <list id="fieldPopulationZonesRecruitment" origin="getRecruitmentZone($Population)" - renderer="name"> - <ListModel origin="getPopulationZone($Population)"/> - <ListSelectionEvents - onValueChanged="Update($fieldPopulationZonesRecruitment/selectedValues, $Population/recruitmentZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> - </list> - </scrollPane> - - <label constraints="labelPopulationMappingZoneReproZoneRecru" text="isisfish.populationZones.betweenSpawningRecruitmentAreas"/> - <MatrixPanel constraints="fieldPopulationMappingZoneReproZoneRecru" - id="fieldPopulationMappingZoneReproZoneRecru" - origin="copy($Population/mappingZoneReproZoneRecru)"> - <MatrixPanelEvents - onMatrixChanged="Update(copy($fieldPopulationMappingZoneReproZoneRecru/matrix), $Population/mappingZoneReproZoneRecru)"/> - </MatrixPanel> - -<!-- - <scrollPane constraints="fieldPopulationMappingZoneReproZoneRecru"> - <table id="populationMappingReproRecru"> - <ReproRecruTableModel origin="$Population/mappingZoneReproZoneRecru" - list1="getReproductionZone($Population)" - list2="getRecruitmentZone($Population)" /> - </table> - </scrollPane> ---> - - <panel id="panelPopulationZoneButtonAction" constraints="panelPopulationZoneButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Population", $Population);refreshView($fieldPopulationMappingZoneReproZoneRecru);refreshView($inputPopulationZones)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationZones)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,51 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center" colspan="2" width="100%"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">labelPortCreate</td> - </tr> - <tr> - <td class="field">fieldPortCreate</td> - <td fill="Both">buttonPortCreate</td> - </tr> - <tr> - <td class="labelTitle">labelPortName</td> - </tr> - <tr> - <td class="field" colspan="2">fieldPortName</td> - </tr> - - <tr> - <td class="labelTitle">labelPortCell1</td> - </tr> - <tr> - <td class="labelTitle">labelPortCell2</td> - </tr> - <tr> - <td class="field" height="80%" colspan="2" rowspan="3">fieldPortCell</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td class="labelTitle">labelPortComment</td> - </tr> - <tr> - <td class="field" height="20%" colspan="2" rowspan="3">fieldPortComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td colspan="2" fill="Both" width="100%">panelPortButtonAction</td> - </tr> - - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Port.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.port.title" constraints="inputPort" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Port.xgl)"> - - <ContextDataSource id="Port" context="current" source="Port"/> - - <label constraints="labelPortName" text="isisfish.port.name"/> - <textfield constraints="fieldPortName" id="fieldPortName" origin="$Port/name"> - <DocumentEvents onModified="Update($fieldPortName/text)"/> - </textfield> - - <label constraints="labelPortCell1" text="isisfish.port.cell"/> - <scrollPane constraints="fieldPortCell"> - <list id="portCell" origin="getCell($Port)" SelectionMode="0" renderer="name"> - <ListModel origin="$FisheryRegion/cell"/> - <ListSelectionEvents onValueChanged="Update($portCell/selectedValue, $Port/cell, refreshView($portMap))"/> - </list> - </scrollPane> - - <label constraints="labelPortComment" text="isisfish.port.comments"/> - <scrollPane constraints="fieldPortComment"> - <textarea id="fieldPortComment" origin="$Port/comment"> - <DocumentEvents onModified="Update($fieldPortComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelPortButtonAction" constraints="panelPortButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Port")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Port", $Port);refreshView($inputPort)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Port", $Port);refreshView($inputPort)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Port" - actionCommand="input.Input.remove($Port)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,47 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelSelectivityPopulation</td> - <td class="field" colspan="2">fieldSelectivityPopulation</td> - </tr> - <tr> - <td class="label">labelSelectivityEquation</td> - <td class="field" colspan="2">fieldSelectivityEquation</td> - </tr> - <tr> - <td class="label">buttonSelectivitySaveAsModel</td> - <td class="field" height="40%" colspan="2" rowspan="2">fieldSelectivityScript</td> - </tr> - <tr><td class="label">buttonSelectivityEquationEditor</td></tr> - <tr> - <td fill="Both" colspan="3" width="100%">buttonAddSelectivity</td> - </tr> - <tr> - <td fill="Both" colspan="3" height="60%" width="100%">selectivityTable</td> - <td></td> - </tr> - <tr> - <td fill="Both" colspan="3" width="100%">panelSelectivityRemoveButtonAction</td> - </tr> - <tr> - <td fill="Both" colspan="3">panelSelectivityButtonAction</td> - </tr> - <tr> - <td colspan="3">buttonMetier</td> - </tr> - - </table> - - <table cellspacing="2"> - <tr> - <td fill="Both" width="100%">buttonSelectivityRemove</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Selectivity.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.selectivity.title" constraints="inputSelectivity" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Selectivity.xgl)"> - - <label constraints="labelSelectivityPopulation" text="isisfish.selectivity.selectPopulation"/> - <combobox constraints="fieldSelectivityPopulation" id="fieldSelectivityPopulation" - renderer="name" firstNull="true"> - <ComboBoxModel origin="$FisheryRegion/species/population" iterate="true"/> - </combobox> - - <!-- - | Equation de selectivité - +--> - <label constraints="labelSelectivityEquation" text="isisfish.selectivity.equation"/> - - <combobox constraints="fieldSelectivityEquation" id="fieldSelectivityEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldSelectivityEquation/selectedItem/content, $fieldSelectivityScript/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Selectivity")'/> - </combobox> - - <!-- TODO change Java to $Langage/selectedItem when we can change language --> - <button constraints="buttonSelectivitySaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveAsModel("Selectivity", "Java", $fieldSelectivityScript/text);refreshView($fieldSelectivityEquation)'/> - - <button constraints="buttonSelectivityEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor("Selectivity","new","fr.ifremer.isisfish.equation.SelectivityEquation",$fieldSelectivityScript/text,$fieldSelectivityScript)'/> - - <scrollPane constraints="fieldSelectivityScript"> - <editor id="fieldSelectivityScript" askIfNotSaved="false" origin="org.codelutin.util.FileUtil.getTempFile('', '.java')"> - </editor> - </scrollPane> - - <!-- - | Ajouter - +--> - <button constraints="buttonAddSelectivity" id="buttonAddSelectivity" text="isisfish.common.add" - origin="$Gear" - actionCommand="input.InputGear.addSelectivity($Gear, $fieldSelectivityPopulation/selectedItem, $fieldSelectivityScript/text)"/> - - <scrollPane constraints="selectivityTable"> - <table id="selectivityTable" renderer="name"> - <tableModel origin="$Gear/populationSelectivity"> - <column title="Population" property="population"/> - <column title="Equation" property="equation" editable="true"> - <tableColumnEditor><EquationTableEditor/></tableColumnEditor> - </column> - </tableModel> - </table> - </scrollPane> - - <panel constraints="panelSelectivityRemoveButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Selectivity.xgl)"> - <button constraints="buttonSelectivityRemove" id="buttonSelectivityRemove" text="isisfish.common.remove" - origin="$Gear/populationSelectivity" - actionCommand="input.InputGear.removeSelectivity($Gear, getPopulationSelectivity($Gear)[$selectivityTable/selectedRow + 1])"/> - </panel> - - <panel id="panelSelectivityButtonAction" constraints="panelSelectivityButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Gear", $Gear);refreshView($inputSelectivity)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputSelectivity)'/> - - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,59 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelSetOfVesselsName</td> - <td class="field">fieldSetOfVesselsName</td> - </tr> - <tr> - <td class="label">labelSetOfVesselsPort</td> - <td class="field">fieldSetOfVesselsPort</td> - </tr> - <tr> - <td class="label">labelSetOfVesselsVesselType</td> - <td class="field">fieldSetOfVesselsVesselType</td> - </tr> - <tr> - <td class="label">labelSetOfVesselsNumberOfVessels</td> - <td class="field">fieldSetOfVesselsNumberOfVessels</td> - </tr> - <tr> - <td class="label">labelSetOfVesselsFixedCosts</td> - <td class="field">fieldSetOfVesselsFixedCosts</td> - </tr> - - <tr> - <td class="label">labelSetOfVesselsTechnicalEfficiency</td> - <td class="field">fieldSetOfVesselsTechnicalEfficiency</td> - </tr> - <tr> - <td class="label">buttonSetOfVesselsTechnicalEfficiencySaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptSetOfVesselsTechnicalEfficiency</td> - </tr> - <tr> - <td class="label">buttonSetOfVesselsTechnicalEfficiencyEquationEditor</td> - </tr> - <tr></tr> - - - <tr> - <td class="label" rowspan="2">labelSetOfVesselsComment</td> - <td class="field" height="20%" rowspan="2">fieldSetOfVesselsComment</td> - </tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="2" width="100%">panelSetOfVesselsButtonAction</td> - </tr> - <tr> - <td colspan="2">buttonStrategy</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVessels.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.setOfVessels.title" constraints="inputSetOfVesselsCaract" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/SetOfVessels.xgl)"> - - <ContextDataSource id="SetOfVessels" context="current" source="SetOfVessels"/> - - <label constraints="labelSetOfVesselsName" text="isisfish.setOfVessels.name"/> - <textfield constraints="fieldSetOfVesselsName" id="fieldSetOfVesselsName" - origin="$SetOfVessels/name"> - <DocumentEvents onModified="Update($fieldSetOfVesselsName/text)"/> - </textfield> - - <label constraints="labelSetOfVesselsPort" text="isisfish.common.port"/> - <combobox constraints="fieldSetOfVesselsPort" id="fieldSetOfVesselsPort" - origin="$SetOfVessels/port" renderer="name" firstNull="true" - actionCommand="update($fieldSetOfVesselsPort/selectedItem, $SetOfVessels/port)"> - <ComboBoxModel origin="$FisheryRegion/port"/> - </combobox> - - <label constraints="labelSetOfVesselsVesselType" text="isisfish.setOfVessels.vesselType"/> - <combobox constraints="fieldSetOfVesselsVesselType" id="fieldSetOfVesselsVesselType" - origin="$SetOfVessels/vesselType" renderer="name" firstNull="true" - actionCommand="update($fieldSetOfVesselsVesselType/selectedItem, $SetOfVessels/vesselType)"> - <ComboBoxModel origin="$FisheryRegion/vesselType"/> - </combobox> - - <label constraints="labelSetOfVesselsNumberOfVessels" text="isisfish.setOfVessels.numberOfVessels"/> - <textfield constraints="fieldSetOfVesselsNumberOfVessels" id="fieldSetOfVesselsNumberOfVessels" - origin="$SetOfVessels/numberOfVessels"> - <DocumentEvents onModified="Update($fieldSetOfVesselsNumberOfVessels/text)"/> - </textfield> - - <label constraints="labelSetOfVesselsFixedCosts" text="isisfish.setOfVessels.fixedCosts"/> - <textfield constraints="fieldSetOfVesselsFixedCosts" id="fieldSetOfVesselsFixedCosts" - origin="$SetOfVessels/fixedCosts"> - <DocumentEvents onModified="Update($fieldSetOfVesselsFixedCosts/text)"/> - </textfield> - - - <label constraints="labelSetOfVesselsTechnicalEfficiency" text="isisfish.setOfVessels.technicalEfficiency"/> - <combobox constraints="fieldSetOfVesselsTechnicalEfficiency" id="fieldSetOfVesselsTechnicalEfficiency" - origin="$SetOfVessels/technicalEfficiencyEquation" renderer="name" firstNull="true" - actionCommand="Update($fieldSetOfVesselsTechnicalEfficiency/selectedItem/content, $fieldScriptSetOfVesselsTechnicalEfficiency/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "TechnicalEfficiency")'/> - </combobox> - - <button constraints="buttonSetOfVesselsTechnicalEfficiencySaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($SetOfVessels/technicalEfficiencyEquation);refreshView($fieldSetOfVesselsTechnicalEfficiency)'/> - - <button constraints="buttonSetOfVesselsTechnicalEfficiencyEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($SetOfVessels/technicalEfficiencyEquation/category,$SetOfVessels/technicalEfficiencyEquation/name,$SetOfVessels/technicalEfficiencyEquation/javaInterface,$SetOfVessels/technicalEfficiencyEquation/content,$fieldScriptSetOfVesselsTechnicalEfficiency)'/> - - <editor constraints="fieldScriptSetOfVesselsTechnicalEfficiency" askIfNotSaved="false" - id="fieldScriptSetOfVesselsTechnicalEfficiency" - origin="org.codelutin.util.FileUtil.getTempFile($SetOfVessels/technicalEfficiencyEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationTechnicalEfficiency($SetOfVessels, $fieldScriptSetOfVesselsTechnicalEfficiency/text)"/> - </DocumentEvents> - </editor> - - - - <label constraints="labelSetOfVesselsComment" text="isisfish.setOfVessels.comments"/> - <scrollPane constraints="fieldSetOfVesselsComment"> - <textarea id="fieldSetOfVesselsComment" origin="$SetOfVessels/comment"> - <DocumentEvents onModified="Update($fieldSetOfVesselsComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelSetOfVesselsButtonAction" constraints="panelSetOfVesselsButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("SetOfVessels")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("SetOfVessels", $SetOfVessels);refreshView($inputSetOfVessels)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("SetOfVessels", $SetOfVessels);refreshView($inputSetOfVessels)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$SetOfVessels" - actionCommand="input.Input.remove($SetOfVessels)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,54 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelSpeciesName</td> - <td class="field">fieldSpeciesName</td> - </tr> - <tr> - <td class="label">labelSpeciesScientificName</td> - <td class="field">fieldSpeciesScientificName</td> - </tr> - <tr> - <td class="label">labelSpeciesCodeRubbin</td> - <td class="field">fieldSpeciesCodeRubbin</td> - </tr> - <tr> - <td class="label">labelSpeciesCEE</td> - <td class="field">fieldSpeciesCEE</td> - </tr> - <tr> - <td class="label">labelSpeciesDynamic</td> - <td class="field" rowspan="2">panelFieldSpeciesDynamic</td> - </tr> - <tr> - </tr> - <tr> - <td class="label" rowspan="3">labelSpeciesComment</td> - <td class="field" height="20%" rowspan="3">fieldSpeciesComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td colspan="2" fill="Both" width="100%">panelSpeciesButtonAction</td> - </tr> - <tr> - <td colspan="2">buttonPopulation</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="field">fieldSpeciesDynamicAge</td> - <td class="field">fieldSpeciesDynamicLength</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Species.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.species.title" constraints="inputSpecies" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Species.xgl)"> - - <ContextDataSource id="Species" context="current" source="Species"/> - - <label constraints="labelSpeciesName" text="isisfish.species.name"/> - <textfield constraints="fieldSpeciesName" id="fieldSpeciesName" origin="$Species/name"> - <DocumentEvents onModified="Update($fieldSpeciesName/text)"/> - </textfield> - - <label constraints="labelSpeciesScientificName" text="isisfish.species.scientificName"/> - <textfield constraints="fieldSpeciesScientificName" id="fieldSpeciesScientificName" origin="$Species/scientificName"> - <DocumentEvents onModified="Update($fieldSpeciesScientificName/text)"/> - </textfield> - - <label constraints="labelSpeciesCodeRubbin" text="isisfish.species.rubbinCode"/> - <textfield constraints="fieldSpeciesCodeRubbin" id="fieldSpeciesCodeRubbin" origin="$Species/codeRubbin"> - <DocumentEvents onModified="Update($fieldSpeciesCodeRubbin/text)"/> - </textfield> - - <label constraints="labelSpeciesCEE" text="isisfish.species.cee"/> - <textfield constraints="fieldSpeciesCEE" id="fieldSpeciesCEE" origin="$Species/codeCEE"> - <DocumentEvents onModified="Update($fieldSpeciesCEE/text)"/> - </textfield> - - <label constraints="labelSpeciesDynamic" text="isisfish.species.structured"/> - - <panel constraints="panelFieldSpeciesDynamic" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Species.xgl)"> - <radioButton constraints="fieldSpeciesDynamicAge" id="fieldSpeciesDynamicAge" - text="isisfish.species.age" buttonGroup="structuredGroup" - origin="$Species/ageGroupType" - actionCommand="Update($fieldSpeciesDynamicAge/selected)"/> - <!-- - <ItemEvents onStateChanged="Update($fieldSpeciesDynamicAge/selected)"/> - </radioButton> - --> - <radioButton constraints="fieldSpeciesDynamicLength" id="fieldSpeciesDynamicLength" - text="isisfish.species.length" buttonGroup="structuredGroup" - origin="not(getAgeGroupType($Species))" - actionCommand="Update($fieldSpeciesDynamicAge/selected, $Species/ageGroupType)"/> - <!-- - <ItemEvents onStateChanged="Update($fieldSpeciesDynamicAge/selected, $Species/ageGroupType)"/> - </radioButton> - --> - </panel> - - <label constraints="labelSpeciesComment" text="isisfish.species.comments"/> - <scrollPane constraints="fieldSpeciesComment"> - <textarea id="fieldSpeciesComment" origin="$Species/comment"> - <DocumentEvents onModified="Update($fieldSpeciesComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelSpeciesButtonAction" constraints="panelSpeciesButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Species")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Species", $Species);refreshView($inputSpecies)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Species", $Species);refreshView($inputSpecies)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Species" - actionCommand="input.Input.remove($Species)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,64 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelStrategyName</td> - <td class="field">fieldStrategyName</td> - </tr> - <tr> - <td class="label">labelStrategySetOfVessels</td> - <td class="field">fieldStrategySetOfVessels</td> - </tr> - <tr> - <td class="label">labelStrategyProportionSetOfVessels</td> - <td class="field">fieldStrategyProportionSetOfVessels</td> - </tr> - - <tr> - <td></td> - <td class="field">fieldUseEquationInactivity</td> - </tr> - <tr> - <td class="labelTitle" fill="Both" height="100%" width="100%" colspan="2">hideablePanelInactivityEquation</td> - </tr> - - <tr> - <td class="label" rowspan="2">labelStrategyComment</td> - <td class="field" height="20%" rowspan="2">fieldStrategyComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td fill="Both" colspan="2" width="100%">panelStrategyButtonAction</td> - </tr> - </table> - - <table> - <tr> - <td fill="Both" height="100%" width="100%">fieldUseEquation</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="label">labelStrategyInactivity</td> - <td class="field">fieldStrategyInactivity</td> - </tr> - <tr> - <td class="label">buttonStrategyInactivitySaveAsModel</td> - <td class="field" height="30%" rowspan="3">fieldScriptStrategyInactivity</td> - </tr> - <tr> - <td class="label">buttonStrategyInactivityEquationEditor</td> - </tr> - <tr></tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Strategy.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.strategy.title" constraints="inputStrategyCaract" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Strategy.xgl)"> - - <ContextDataSource id="Strategy" context="current" source="Strategy"/> - - <label constraints="labelStrategyName" text="isisfish.strategy.name"/> - <textfield constraints="fieldStrategyName" id="fieldStrategyName" origin="$Strategy/name"> - <DocumentEvents onModified="Update($fieldStrategyName/text)"/> - </textfield> - - <label constraints="labelStrategySetOfVessels" text="isisfish.common.setOfVessels"/> - <combobox constraints="fieldStrategySetOfVessels" id="fieldStrategySetOfVessels" - origin="$Strategy/setOfVessels" renderer="name" firstNull="true" - actionCommand="update($fieldStrategySetOfVessels/selectedItem, $Strategy/setOfVessels)"> - <ComboBoxModel origin="$FisheryRegion/setOfVessels"/> - </combobox> - - <label constraints="labelStrategyProportionSetOfVessels" text="isisfish.strategy.proportionSetOfVessels"/> - <textfield constraints="fieldStrategyProportionSetOfVessels" id="fieldStrategyProportionSetOfVessels" - origin="$Strategy/proportionSetOfVessels"> - <DocumentEvents onModified="Update($fieldStrategyProportionSetOfVessels/text)"/> - </textfield> - - <checkbox constraints="fieldUseEquationInactivity" id="fieldUseEquationInactivity" - origin="$Strategy/inactivityEquationUsed" text="isisfish.strategy.inactivityEquationUsed"> - <ItemEvents onStateChanged="Update($fieldUseEquationInactivity/selected, $Strategy/inactivityEquationUsed, refreshView($hideablePanelInactivityEquation))"/> - </checkbox> - - - <panel id="hideablePanelInactivityEquation" constraints="hideablePanelInactivityEquation" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Strategy.xgl)"> - - <hidablePanel constraints="fieldUseEquation" - origin="getInactivityEquationUsed($Strategy)" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Strategy.xgl)"> - <label constraints="labelStrategyInactivity" text="isisfish.strategy.inactivity"/> - <combobox constraints="fieldStrategyInactivity" id="fieldStrategyInactivity" - origin="$Strategy/inactivityEquation" renderer="name" firstNull="true" - actionCommand="Update($fieldStrategyInactivity/selectedItem/content, $fieldScriptStrategyInactivity/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Inactivity")'/> - </combobox> - - <button constraints="buttonStrategyInactivitySaveAsModel" text="isisfish.common.saveModel" - actionCommand='input.Input.saveEquationAsModel($Strategy/inactivityEquation);refreshView($fieldStrategyInactivity)'/> - - <button constraints="buttonStrategyInactivityEquationEditor" text="isisfish.common.openEditor" - actionCommand='input.Input.openEditor($Strategy/inactivityEquation/category,$Strategy/inactivityEquation/name,$Strategy/inactivityEquation/javaInterface,$Strategy/inactivityEquation/content,$fieldScriptStrategyInactivity)'/> - - <editor constraints="fieldScriptStrategyInactivity" askIfNotSaved="false" - id="fieldScriptStrategyInactivity" - origin="org.codelutin.util.FileUtil.getTempFile($Strategy/inactivityEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationInactivity($Strategy, $fieldScriptStrategyInactivity/text)"/> - </DocumentEvents> - </editor> - - </hidablePanel> - </panel> - - <label constraints="labelStrategyComment" text="isisfish.strategy.comments"/> - <scrollPane constraints="fieldStrategyComment"> - <textarea id="fieldStrategyComment" origin="$Strategy/comment"> - <DocumentEvents onModified="Update($fieldStrategyComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelStrategyButtonAction" constraints="panelStrategyButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Strategy")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategy)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategy)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Strategy" - actionCommand="input.Input.remove($Strategy)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,53 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles>o - - <table cellspacing="2"> - <tr> - <td class="field" height="33%">StrategyMonthInfo1</td> - <td class="field" height="33%">StrategyMonthInfo2</td> - <td class="field" height="33%">StrategyMonthInfo3</td> - <td class="field" height="33%">StrategyMonthInfo4</td> - </tr> - <tr> - <td class="field" height="33%">StrategyMonthInfo5</td> - <td class="field" height="33%">StrategyMonthInfo6</td> - <td class="field" height="33%">StrategyMonthInfo7</td> - <td class="field" height="33%">StrategyMonthInfo8</td> - </tr> - <tr> - <td class="field" height="33%">StrategyMonthInfo9</td> - <td class="field" height="33%">StrategyMonthInfo10</td> - <td class="field" height="33%">StrategyMonthInfo11</td> - <td class="field" height="33%">StrategyMonthInfo12</td> - </tr> - <tr> - <td fill="Both" colspan="4" width="100%">panelStrategyMonthInfoButtonAction</td> - </tr> - </table> - - - <table cellspacing="2"> - <tr> - <td fill="Both" colspan="2" class="labelTitle">labelStrategyMonthInfo</td> - </tr> - <tr> - <td fill="Both" colspan="2" class="field">fieldStrategyMonthInfoTripType</td> - </tr> - <tr> - <td fill="Both" class="label">labelStrategyMonthInfoNumberOfTrips</td> - <td fill="Both" class="field">fieldStrategyMonthInfoNumberOfTrips</td> - </tr> - <tr> - <td fill="Both" class="label">labelStrategyMonthInfoMinInactivityDays</td> - <td fill="Both" class="field">fieldStrategyMonthInfoMinInactivityDays</td> - </tr> - <tr> - <td fill="Both" class="field" colspan="2" height="100%">fieldStrategyMonthInfoProportion</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,504 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.strategyMonthInfo.title" - constraints="inputStrategyMonthInfo" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - - <!-- - | - | StrategyMonthInfo January - | - +--> - - <panel constraints="StrategyMonthInfo1" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo1" context="current" - source="Strategy" path="strategyMonthInfo[1]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo1/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType1" - origin="$StrategyMonthInfo1/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType1/selectedItem, $StrategyMonthInfo1/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo1/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays1" - origin="$StrategyMonthInfo1/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays1/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion1" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo1/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion1/matrix), $StrategyMonthInfo1/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo Febuary - | - +--> - - <panel constraints="StrategyMonthInfo2" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo2" context="current" - source="Strategy" path="strategyMonthInfo[2]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo2/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType2" - origin="$StrategyMonthInfo2/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType2/selectedItem, $StrategyMonthInfo2/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo2/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays2" - origin="$StrategyMonthInfo2/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays2/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion2" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo2/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion2/matrix), $StrategyMonthInfo2/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo March - | - +--> - - <panel constraints="StrategyMonthInfo3" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo3" context="current" - source="Strategy" path="strategyMonthInfo[3]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo3/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType3" - origin="$StrategyMonthInfo3/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType3/selectedItem, $StrategyMonthInfo3/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo3/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays3" - origin="$StrategyMonthInfo3/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays3/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion3" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo3/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion3/matrix), $StrategyMonthInfo3/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo April - | - +--> - - <panel constraints="StrategyMonthInfo4" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo4" context="current" - source="Strategy" path="strategyMonthInfo[4]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo4/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType4" - origin="$StrategyMonthInfo4/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType4/selectedItem, $StrategyMonthInfo4/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo4/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays4" - origin="$StrategyMonthInfo4/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays4/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion4" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo4/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion4/matrix), $StrategyMonthInfo4/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo May - | - +--> - - <panel constraints="StrategyMonthInfo5" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo5" context="current" - source="Strategy" path="strategyMonthInfo[5]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo5/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType5" - origin="$StrategyMonthInfo5/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType5/selectedItem, $StrategyMonthInfo5/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo5/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays5" - origin="$StrategyMonthInfo5/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays5/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion5" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo5/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion5/matrix), $StrategyMonthInfo5/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo June - | - +--> - - <panel constraints="StrategyMonthInfo6" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo6" context="current" - source="Strategy" path="strategyMonthInfo[6]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo6/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType6" - origin="$StrategyMonthInfo6/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType6/selectedItem, $StrategyMonthInfo6/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo6/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays6" - origin="$StrategyMonthInfo6/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays6/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion6" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo6/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion6/matrix), $StrategyMonthInfo6/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo July - | - +--> - - <panel constraints="StrategyMonthInfo7" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo7" context="current" - source="Strategy" path="strategyMonthInfo[7]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo7/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType7" - origin="$StrategyMonthInfo7/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType7/selectedItem, $StrategyMonthInfo7/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo7/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays7" - origin="$StrategyMonthInfo7/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays7/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion7" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo7/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion7/matrix), $StrategyMonthInfo7/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo August - | - +--> - - <panel constraints="StrategyMonthInfo8" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo8" context="current" - source="Strategy" path="strategyMonthInfo[8]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo8/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType8" - origin="$StrategyMonthInfo8/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType8/selectedItem, $StrategyMonthInfo8/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo8/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays8" - origin="$StrategyMonthInfo8/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays8/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion8" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo8/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion8/matrix), $StrategyMonthInfo8/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo September - | - +--> - - <panel constraints="StrategyMonthInfo9" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo9" context="current" - source="Strategy" path="strategyMonthInfo[9]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo9/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType9" - origin="$StrategyMonthInfo9/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType9/selectedItem, $StrategyMonthInfo9/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo9/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays9" - origin="$StrategyMonthInfo9/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays9/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion9" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo9/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion9/matrix), $StrategyMonthInfo9/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo October - | - +--> - - <panel constraints="StrategyMonthInfo10" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo10" context="current" - source="Strategy" path="strategyMonthInfo[10]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo10/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType10" - origin="$StrategyMonthInfo10/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType10/selectedItem, $StrategyMonthInfo10/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo10/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays10" - origin="$StrategyMonthInfo10/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays10/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion10" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo10/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion10/matrix), $StrategyMonthInfo10/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo November - | - +--> - - <panel constraints="StrategyMonthInfo11" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo11" context="current" - source="Strategy" path="strategyMonthInfo[11]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo11/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType11" - origin="$StrategyMonthInfo11/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType11/selectedItem, $StrategyMonthInfo11/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo11/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays11" - origin="$StrategyMonthInfo11/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays11/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion11" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo11/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion11/matrix), $StrategyMonthInfo11/proportionMetier)"/> - </MatrixPanel> - </panel> - - <!-- - | - | StrategyMonthInfo December - | - +--> - - <panel constraints="StrategyMonthInfo12" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/StrategyMonthInfo.xgl)"> - <ContextDataSource id="StrategyMonthInfo12" context="current" - source="Strategy" path="strategyMonthInfo[12]"/> - - <label constraints="labelStrategyMonthInfo" origin="$StrategyMonthInfo12/month"/> - <combobox constraints="fieldStrategyMonthInfoTripType" - id="fieldStrategyMonthInfoTripType12" - origin="$StrategyMonthInfo12/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType12/selectedItem, $StrategyMonthInfo12/tripType)"> - <ComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> - </combobox> - - <label constraints="labelStrategyMonthInfoNumberOfTrips" - text="isisfish.strategyMonthInfo.numberOfTrips"/> - <label constraints="fieldStrategyMonthInfoNumberOfTrips" - origin="$StrategyMonthInfo12/numberOfTrips"/> - - <label constraints="labelStrategyMonthInfoMinInactivityDays" - text="isisfish.strategyMonthInfo.minInactivityDays"/> - <textfield constraints="fieldStrategyMonthInfoMinInactivityDays" - id="fieldStrategyMonthInfoMinInactivityDays12" - origin="$StrategyMonthInfo12/minInactivityDays"> - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays12/text)"/> - </textfield> - - <MatrixPanel constraints="fieldStrategyMonthInfoProportion" - id="fieldStrategyMonthInfoProportion12" - linearModel="true" linearModelShowDefault="true" - origin="copy($StrategyMonthInfo12/proportionMetier)"> - <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion12/matrix), $StrategyMonthInfo12/proportionMetier)"/> - </MatrixPanel> - - </panel> - - <!-- - | - | Button action - | - +--> - - <panel constraints="panelStrategyMonthInfoButtonAction" - id="panelStrategyMonthInfoButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)'/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,34 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelTripTypeName</td> - <td class="field">fieldTripTypeName</td> - </tr> - <tr> - <td class="label">labelTripTypeDuration</td> - <td class="field">fieldTripTypeDuration</td> - </tr> - <tr> - <td class="label">labelTripTypeMinTimeBetweenTrip</td> - <td class="field">fieldTripTypeMinTimeBetweenTrip</td> - </tr> - <tr> - <td class="label" rowspan="3">labelTripTypeComment</td> - <td class="field" height="20%" rowspan="3">fieldTripTypeComment</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td colspan="2" fill="Both" width="100%">panelTripTypeButtonAction</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripType.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.tripType.title" constraints="inputTripType" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/TripType.xgl)"> - - <ContextDataSource id="TripType" context="current" source="TripType"/> - - <label constraints="labelTripTypeName" text="isisfish.tripType.name"/> - <textfield constraints="fieldTripTypeName" id="fieldTripTypeName" - origin="$TripType/name"> - <DocumentEvents onModified="Update($fieldTripTypeName/text)"/> - </textfield> - - <label constraints="labelTripTypeDuration" text="isisfish.tripType.duration" tooltips="In hours"/> - <textfield constraints="fieldTripTypeDuration" id="fieldTripTypeDuration" - origin="$TripType/tripDuration/hour" - tooltips="In hours"> - <DocumentEvents onModified="Update($fieldTripTypeDuration/text * 3600, $TripType/tripDuration)"/> - </textfield> - - <label constraints="labelTripTypeMinTimeBetweenTrip" text="isisfish.tripType.minTime"/> - <textfield constraints="fieldTripTypeMinTimeBetweenTrip" id="fieldTripTypeMinTimeBetweenTrip" - origin="$TripType/minTimeBetweenTrip/hour"> - <DocumentEvents onModified="Update($fieldTripTypeMinTimeBetweenTrip/text * 3600, $TripType/minTimeBetweenTrip)"/> - </textfield> - - <label constraints="labelTripTypeComment" text="isisfish.tripType.comments"/> - <scrollPane constraints="fieldTripTypeComment"> - <textarea id="fieldTripTypeComment" - origin="$TripType/comment"> - <DocumentEvents onModified="Update($fieldTripTypeComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelTripTypeButtonAction" constraints="panelTripTypeButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("TripType")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("TripType", $TripType);refreshView($inputTripType)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("TripType", $TripType);refreshView($inputTripType)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$TripType" - actionCommand="input.Input.remove($TripType)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,56 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="label">labelVesselTypeName</td> - <td class="field">fieldVesselTypeName</td> - </tr> - <tr> - <td class="label">labelVesselTypeLength</td> - <td class="field">fieldVesselTypeLength</td> - </tr> - <tr> - <td class="label">labelVesselTypeSpeed</td> - <td class="field">fieldVesselTypeSpeed</td> - </tr> - <tr> - <td class="label">labelVesselTypeMaxTripDuration</td> - <td class="field">fieldVesselTypeMaxTripDuration</td> - </tr> - <tr> - <td class="label">labelVesselTypeActivityRange</td> - <td class="field">fieldVesselTypeActivityRange</td> - </tr> - <tr> - <td class="label">labelVesselTypeMinCrewSize</td> - <td class="field">fieldVesselTypeMinCrewSize</td> - </tr> - <tr> - <td class="label">labelVesselTypeUnitFuelCostOfTravel</td> - <td class="field">fieldVesselTypeUnitFuelCostOfTravel</td> - </tr> - <tr> - <td class="label" rowspan="3">labelVesselTypeTripType</td> - <td class="field" height="80%" rowspan="3">fieldVesselTypeTripType</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td class="label" rowspan="2">labelVesselTypeComment</td> - <td class="field" height="20%" rowspan="2">fieldVesselTypeComment</td> - </tr> - <tr></tr> - - <tr> - <td colspan="2" fill="Both" width="100%">panelVesselTypeButtonAction</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselType.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel name="isisfish.vesselType.title" constraints="inputVesselType" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/VesselType.xgl)"> - - <ContextDataSource id="VesselType" context="current" source="VesselType"/> - - <label constraints="labelVesselTypeName" text="isisfish.vesselType.name"/> - <textfield constraints="fieldVesselTypeName" id="fieldVesselTypeName" - origin="$VesselType/name"> - <DocumentEvents onModified="Update($fieldVesselTypeName/text)"/> - </textfield> - - <label constraints="labelVesselTypeLength" text="isisfish.vesselType.length"/> - <textfield constraints="fieldVesselTypeLength" id="fieldVesselTypeLength" - origin="$VesselType/length"> - <DocumentEvents onModified="Update($fieldVesselTypeLength/text)"/> - </textfield> - - <label constraints="labelVesselTypeSpeed" text="isisfish.vesselType.speed"/> - <textfield constraints="fieldVesselTypeSpeed" id="fieldVesselTypeSpeed" - origin="$VesselType/speed"> - <DocumentEvents onModified="Update($fieldVesselTypeSpeed/text)"/> - </textfield> - - <label constraints="labelVesselTypeMaxTripDuration" text="isisfish.vesselType.maxDuration"/> - <textfield constraints="fieldVesselTypeMaxTripDuration" id="fieldVesselTypeMaxTripDuration" - origin="$VesselType/maxTripDuration/hour" tooltips="in hour"> - <DocumentEvents onModified="Update(3600 * $fieldVesselTypeMaxTripDuration/text, $VesselType/maxTripDuration)"/> - </textfield> - - <label constraints="labelVesselTypeActivityRange" text="isisfish.vesselType.activityRange"/> - <textfield constraints="fieldVesselTypeActivityRange" id="fieldVesselTypeActivityRange" - origin="$VesselType/activityRange"> - <DocumentEvents onModified="Update($fieldVesselTypeActivityRange/text)"/> - </textfield> - - <label constraints="labelVesselTypeMinCrewSize" text="isisfish.vesselType.miniCrew"/> - <textfield constraints="fieldVesselTypeMinCrewSize" id="fieldVesselTypeMinCrewSize" - origin="$VesselType/minCrewSize"> - <DocumentEvents onModified="Update($fieldVesselTypeMinCrewSize/text)"/> - </textfield> - - <label constraints="labelVesselTypeUnitFuelCostOfTravel" text="isisfish.vesselType.fuelCost"/> - <textfield constraints="fieldVesselTypeUnitFuelCostOfTravel" id="fieldVesselTypeUnitFuelCostOfTravel" - origin="$VesselType/unitFuelCostOfTravel"> - <DocumentEvents onModified="Update($fieldVesselTypeUnitFuelCostOfTravel/text)"/> - </textfield> - - <label constraints="labelVesselTypeTripType" text="isisfish.common.tripType"/> - <scrollPane constraints="fieldVesselTypeTripType"> - <list id="vesselTypeTripType" origin="getTripType($VesselType)" renderer="name"> - <ListModel origin="$FisheryRegion/tripType"/> - <MouseEvents onClicked="Update($vesselTypeTripType/selectedValues, $VesselType/tripType)"/> - </list> - </scrollPane> - - - <label constraints="labelVesselTypeComment" text="isisfish.vesselType.comments"/> - <scrollPane constraints="fieldVesselTypeComment"> - <textarea id="fieldVesselTypeComment" - origin="$VesselType/comment"> - <DocumentEvents onModified="Update($fieldVesselTypeComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelVesselTypeButtonAction" constraints="panelVesselTypeButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("VesselType")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("VesselType", $VesselType);refreshView($inputVesselType)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("VesselType", $VesselType);refreshView($inputVesselType)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$VesselType" - actionCommand="input.Input.remove($VesselType)"/> - </panel> - -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,104 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" fill="Horizontal" colspan="2" align="Center"/> - <style id="label" fill="Horizontal" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - <style id="help" fill="Both" align="Left" colspan="2" width="100%" height="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">beginGroupAgeTitle</td> - </tr> - <tr> - <td class="label">labelFirstAge</td> - <td class="field">firstAge</td> - </tr> - <tr> - <td class="label">labelLastAge</td> - <td class="field">lastAge</td> - </tr> - <tr> - <td class="help">beginGroupAgeHelp</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">beginGroupLengthTitle</td> - </tr> - <tr> - <td class="field" rowspan="2">beginGroupLengthTypeInput</td> - </tr> - <tr></tr> - <tr> - <td class="field" rowspan="2">beginGroupLengthTypeSameSize</td> - </tr> - <tr></tr> - <tr> - <td class="field" rowspan="2">beginGroupLengthTypeGrowthCurve</td> - </tr> - <tr></tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">inputGroupLengthTitle</td> - </tr> - <tr> - <td class="label">labelFirstInputLength</td> - <td class="field">firstInputLength</td> - </tr> - <tr> - <td class="label">labelMaximalGroupsLenght</td> - <td class="field">maximalGroupsLenght</td> - </tr> - <tr> - <td class="help">inputGroupAgeHelp</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">sameSizeGroupLengthTitle</td> - </tr> - <tr> - <td class="label">labelFirstSizeLength</td> - <td class="field">firstSizeLength</td> - </tr> - <tr> - <td class="label">labelSameSizeNumberOfGroup</td> - <td class="field">sameSizeNumberOfGroup</td> - </tr> - <tr> - <td class="label">labelWidth</td> - <td class="field">width</td> - </tr> - <tr> - <td class="help">sameSizeGroupLengthHelp</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">growthCurveGroupLengthTitle</td> - </tr> - <tr> - <td class="label">labelGrowthCurveFirstGroup</td> - <td class="field">growthCurveFirstGroup</td> - </tr> - <tr> - <td class="label">labelNumberOfGroup</td> - <td class="field">numberOfGroup</td> - </tr> - <tr> - <td class="label">labelStep</td> - <td class="field">step</td> - </tr> - <tr> - <td class="help">growthCurveGroupLengthHelp</td> - </tr> - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreation.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Frame id="wizardGroup" visible="true" size="400,200" title="isisfish.wizardGroupCreation.title" - layout="BorderLayout" Resizable="true" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <ContextDataSource id="Population" context="current" source="Population"/> - <ContextDataSource id="wizardModel" context="current" source="wizardModel"/> - - <cardPanel id="wizardPanels" origin="$wizardModel" constraints="CENTER"> - - <panel constraints="singleGroupAge" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> - <label constraints="beginGroupAgeTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" - horizontalAlignment="CENTER"/> - <label constraints="labelFirstAge" text="isisfish.wizardGroupCreation.firstAge"/> - <textfield constraints="firstAge" id="firstAge" - origin="$wizardModel/first"> - <DocumentEvents onModified="update($firstAge/text)"/> - </textfield> - <label constraints="labelLastAge" text="isisfish.wizardGroupCreation.lastAge"/> - <textfield constraints="lastAge" id="lastAge" - origin="$wizardModel/last"> - <DocumentEvents onModified="update($lastAge/text)"/> - </textfield> - <multilabel constraints="beginGroupAgeHelp"> -First age = minimal age -Last age = maximal age - -gap between to group is 1 year. - </multilabel> - </panel> - - <panel constraints="beginGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> - <label constraints="beginGroupLengthTitle" text="isisfish.wizardGroupCreation.selectGroupLengthType" - horizontalAlignment="CENTER"/> - <radioButton constraints="beginGroupLengthTypeInput" - id="beginGroupLengthTypeInput" buttonGroup="groupLengthType" - text="isisfish.wizardGroupCreation.allValues" origin="$wizardModel/inputType"> - <ItemEvents onStateChanged="update($beginGroupLengthTypeInput/selected)"/> - </radioButton> - - <radioButton constraints="beginGroupLengthTypeSameSize" - id="beginGroupLengthTypeSameSize" buttonGroup="groupLengthType" - text="isisfish.wizardGroupCreation.allGroupsSameSize" origin="$wizardModel/sameSizeType"> - <ItemEvents onStateChanged="update($beginGroupLengthTypeSameSize/selected)"/> - </radioButton> - - <radioButton constraints="beginGroupLengthTypeGrowthCurve" - id="beginGroupLengthTypeGrowthCurve" buttonGroup="groupLengthType" - text="isisfish.wizardGroupCreation.computedGrowthCurve" origin="$wizardModel/growthCurveType"> - <ItemEvents onStateChanged="update($beginGroupLengthTypeGrowthCurve/selected)"/> - </radioButton> - </panel> - - <panel constraints="endInputGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> - <label constraints="inputGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" - horizontalAlignment="CENTER"/> - <label constraints="labelFirstInputLength" text="isisfish.wizardGroupCreation.firstLength"/> - <textfield constraints="firstInputLength" id="firstInputLength" - origin="$wizardModel/first"> - <DocumentEvents onModified="update($firstInputLength/text)"/> - </textfield> - <label constraints="labelMaximalGroupsLenght" text="isisfish.wizardGroupCreation.maxGroupsLength"/> - <textfield constraints="maximalGroupsLenght" id="maximalGroupsLenght" - origin="$wizardModel/maxLength"> - <DocumentEvents onModified="update($maximalGroupsLenght/text)"/> - </textfield> - <multilabel constraints="inputGroupAgeHelp" text="A semicolon ';' must separe maximal length of each group"/> - </panel> - - <panel constraints="endSameSizeGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> - <label constraints="sameSizeGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" - horizontalAlignment="CENTER"/> - <label constraints="labelFirstSizeLength" text="isisfish.wizardGroupCreation.firstLength"/> - <textfield constraints="firstSizeLength" id="firstSizeLength" - origin="$wizardModel/first"> - <DocumentEvents onModified="update($firstSizeLength/text)"/> - </textfield> - <label constraints="labelSameSizeNumberOfGroup" text="isisfish.wizardGroupCreation.numberGroup"/> - <textfield constraints="sameSizeNumberOfGroup" id="sameSizeNumberOfGroup" - origin="$wizardModel/numberOfGroup"> - <DocumentEvents onModified="update($sameSizeNumberOfGroup/text)"/> - </textfield> - <label constraints="labelWidth" text="isisfish.wizardGroupCreation.groupWidth"/> - <textfield constraints="width" id="width" - origin="$wizardModel/groupSize"> - <DocumentEvents onModified="update($width/text)"/> - </textfield> - <multilabel constraints="sameSizeGroupLengthHelp"> -First length = minimal length of first group -number of Group = number of group wanted -Group width = width of group - </multilabel> - </panel> - - <panel constraints="endGrowthCurveGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> - <label constraints="growthCurveGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" - horizontalAlignment="CENTER"/> - <label constraints="labelGrowthCurveFirstGroup" text="isisfish.wizardGroupCreation.firstGroup"/> - <textfield constraints="growthCurveFirstGroup" id="growthCurveFirstGroup" - origin="$wizardModel/first"> - <DocumentEvents onModified="update($growthCurveFirstGroup/text)"/> - </textfield> - <label constraints="labelNumberOfGroup" text="isisfish.wizardGroupCreation.numberGroups"/> - <textfield constraints="numberOfGroup" id="numberOfGroup" - origin="$wizardModel/numberOfGroup"> - <DocumentEvents onModified="update($numberOfGroup/text)"/> - </textfield> - <label constraints="labelStep" text="isisfish.wizardGroupCreation.timeStep"/> - <textfield constraints="step" id="step" - origin="$wizardModel/step"> - <DocumentEvents onModified="update($step/text)"/> - </textfield> - <multilabel constraints="growthCurveGroupLengthHelp" text="The equation used is the population's growth curve, it needs to be defined first."/> - </panel> - </cardPanel> - - <panel id="navButton" constraints="SOUTH"> - <button text="isisfish.common.prev" origin="not(isBegin($wizardPanels))" - actionCommand="prev"/> - - <button text="isisfish.common.next" origin="not(isEnd($wizardPanels))" - actionCommand="next"/> - - <button text="isisfish.common.finish" origin="$wizardPanels/end" - actionCommand="input.InputPopulation.wizardGroupFinish($wizardPanels/model)"/> - - <button text="isisfish.common.cancel" actionCommand="cancel"/> - </panel> - -</Frame> \ No newline at end of file Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,56 +0,0 @@ -<layout> - <styles> - <style id="labelTitle" align="Center" colspan="2" width="100%"/> - <style id="label" align="Right"/> - <style id="field" fill="Both" align="Left" width="100%"/> - </styles> - - <table cellspacing="2"> - <tr> - <td class="labelTitle">labelZoneCreate</td> - </tr> - <tr> - <td class="field">fieldZoneNameCreate</td> - <td fill="Both">buttonZoneCreate</td> - </tr> - <tr> - <td class="labelTitle">labelZone</td> - </tr> - <tr> - <td class="field" colspan="2">fieldZone</td> - </tr> - <tr> - <td class="labelTitle">labelZoneName</td> - </tr> - <tr> - <td class="field" colspan="2">fieldZoneName</td> - </tr> - - <tr> - <td class="labelTitle">labelZoneCell1</td> - </tr> - <tr> - <td class="labelTitle">labelZoneCell2</td> - </tr> - <tr> - <td class="field" height="25%" colspan="2" rowspan="3">fieldZoneCells</td> - </tr> - <tr></tr> - <tr></tr> - - <tr> - <td class="labelTitle">labelZoneComment</td> - </tr> - <tr> - <td class="field" height="25%" colspan="2" rowspan="3">fieldZoneComment</td> - </tr> - <tr></tr> - <tr></tr> - <tr> - <td colspan="2" fill="Both" width="100%">panelZoneButtonAction</td> - </tr> - - </table> - -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/input/Zone.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.zone.title" constraints="inputZone" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/Zone.xgl)"> - - <ContextDataSource id="Zone" context="current" source="Zone"/> - - <label constraints="labelZoneName" text="isisfish.zone.name"/> - <textfield constraints="fieldZoneName" id="fieldZoneName" origin="$Zone/name"> - <DocumentEvents onModified="Update($fieldZoneName/text)"/> - </textfield> - - <label constraints="labelZoneCell1" text="isisfish.zone.cells"/> - <scrollPane constraints="fieldZoneCells"> - <list id="zoneCells" origin="getCell($Zone)" iterate="true" renderer="name"> - <ListModel origin="$FisheryRegion/cell"/> - <ListSelectionEvents onValueChanged="Update($zoneCells/selectedValues, $Zone/cell, refreshView($zoneMap))"/> - </list> - </scrollPane> - - <label constraints="labelZoneComment" text="isisfish.zone.comments"/> - <scrollPane constraints="fieldZoneComment"> - <textarea id="fieldZoneComment" origin="$Zone/comment"> - <DocumentEvents onModified="Update($fieldZoneComment/text)"/> - </textarea> - </scrollPane> - - <panel id="panelZoneButtonAction" constraints="panelZoneButtonAction" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/ActionButton.xgl)"> - - <button constraints="buttonCreate" text="isisfish.common.new" origin="$FisheryRegion" - actionCommand='input.Input.create("Zone")'/> - - <button constraints="buttonSave" text="isisfish.common.save" origin="$EntityModified" - actionCommand='input.Input.save("Zone", $Zone);refreshView($inputZone)'/> - - <button constraints="buttonCancel" text="isisfish.common.cancel" origin="$EntityModified" - actionCommand='input.Input.cancel("Zone", $Zone);refreshView($inputZone)'/> - - <button constraints="buttonRemove" text="isisfish.common.remove" origin="$Zone" - actionCommand="input.Input.remove($Zone)"/> - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,17 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Horizontal" width="100%">buttonBar</td> - </tr> - <tr> - <td fill="Horizontal" width="100%">comboScriptSelect</td> - </tr> - <tr> - <td fill="Both" height="100%" width="100%">contentPanel</td> - </tr> - <tr> - <td fill="Horizontal" width="100%">scriptStatusBar</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/script/Script.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,277 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<Frame id="script" visible="true" size="620,400" title="isisfish.script.title" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/script/Script.xgl)" - Maximizable="true" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - <WindowEvents id="events" onOpened="script.Action.opened()" /> - - <ContextDataSource id="ScriptStorage" context="current" source="ScriptStorage"/> - <ContextDataSource id="ActionLog" context="current" source="ActionLog"/> - <ContextDataSource id="ScriptType" context="current" source="ScriptType"/> - <ContextDataSource id="canCommit" context="current" source="canCommit"/> - <ContextDataSource id="canUpdate" context="current" source="canUpdate"/> - <ContextDataSource id="canDiff" context="current" source="canDiff"/> - <ContextDataSource id="canDelete" context="current" source="canDelete"/> - - <!-- - | Menu - +--> - - <menubar id="scriptMenuBar"> - <menu id="scriptTxtFile" text="isisfish.script.menu.file" mnemonic="mnFile"> - <menu id="scriptNewMenu" text="isisfish.script.menu.new" mnemonic="mnNew"> - <!-- TODO Do it dynamiccly and uses Action.ScriptMapping--> - <!-- no change name passed in argument, or change for combo in button bar and in Action.newScript too --> - <menuitem name="miNewScript" text="isisfish.script.menu.txtNewScript" icon="imgNewScript" mnemonic="mnNewScript" - ActionCommand="script.Action.newScript($tree, $treeModel, 'Script')" Accelerator="accNewScript"/> - <menuitem name="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" icon="imgNewSimulator" mnemonic="mnNewSimulator" - ActionCommand="script.Action.newScript($tree, $treeModel, 'Simulator')" Accelerator="accNewSimulator"/> - <menuitem name="miNewExport" text="isisfish.script.menu.txtNewExport" icon="imgNewExport" mnemonic="mnNewExport" - ActionCommand="script.Action.newScript($tree, $treeModel, 'Export')" Accelerator="accNewExport"/> - <menuitem name="miNewRule" text="isisfish.script.menu.txtNewRule" icon="imgNewRule" mnemonic="mnNewRule" - ActionCommand="script.Action.newScript($tree, $treeModel, 'Rule')" Accelerator="accNewRule"/> - <menuitem name="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" icon="imgNewAnalysePlan" mnemonic="mnNewAnalysePlan" - ActionCommand="script.Action.newScript($tree, $treeModel, 'AnalysePlan')" Accelerator="accNewAnalysePlan"/> - <menuitem name="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" icon="imgNewEquationModel" mnemonic="mnNewEquationModel" - ActionCommand="script.Action.newScript($tree, $treeModel, 'EquationModel')" Accelerator="accNewEquationModel"/> - </menu> - <menuitem name="miSave" text="isisfish.script.menu.save" icon="imgSave" mnemonic="mnSave" - ActionCommand="xpath:save($scriptJedit)" - Accelerator="accSave" - origin="util:isValid($ScriptStorage)"/> - - <separator/> - <menuitem name="miImport" text="isisfish.script.menu.txtImport" icon="imgImport" mnemonic="mnImport" - ActionCommand="script.Action.importScript($tree,$treeModel,$ScriptStorage)" - Accelerator="accImport"/> - <menuitem name="miExport" text="isisfish.script.menu.txtExport" icon="imgExport" mnemonic="mnExport" - ActionCommand="script.Action.exportScript($tree)" - origin="$tree/selectionPaths" - Accelerator="accExport"/> - <separator/> - <menuitem name="miDelete" text="isisfish.script.menu.deleteLocaly" icon="imgDelete" mnemonic="mnDelete" - ActionCommand="script.Action.deleteScript($tree,$ScriptStorage, 'false')" - Accelerator="accDelete" - origin="util:isValid($ScriptStorage)"/> - - <separator/> - - <menuitem name="miClose" text="isisfish.script.menu.close" icon="imgClose" mnemonic="mnClose" - ActionCommand="cancel" Accelerator="accClose"/> - </menu> - - <menu id="scriptTxtEdit" text="isisfish.script.menu.edit" mnemonic="mnEdit"> - <menuitem name="miCut" text="isisfish.script.menu.cut" icon="imgCut" mnemonic="mnCut" - ActionCommand="xpath:cut($scriptJedit)" - Accelerator="accCut" - origin="util:isValid($ScriptStorage)"/> - - <menuitem name="miCopy" text="isisfish.script.menu.copy" icon="imgCopy" mnemonic="mnCopy" - ActionCommand="xpath:copy($scriptJedit)" - Accelerator="accCopy" - origin="util:isValid($ScriptStorage)"/> - - <menuitem name="miPaste" text="isisfish.script.menu.paste" icon="imgPaste" mnemonic="mnPaste" - ActionCommand="xpath:paste($scriptJedit)" - Accelerator="accPaste" - origin="util:isValid($ScriptStorage)"/> - - <separator/> -<!-- TODO - <menuitem name="miFind" text="txtFind" icon="imgFind" mnemonic="mnFind" - Accelerator="accFind" - ActionCommand="find" - origin="util:isValid($ScriptStorage)"/> ---> - </menu> - - <menu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS" mnemonic="mnVCS"> - <menuitem name="miCommitVCS" text="isisfish.script.menu.commit" icon="imgCommitVCS" - mnemonic="mnCommitVCS" Accelerator="accCommitVCS" - ActionCommand="script.Action.commitScript($tree,$ScriptStorage, $scriptJedit/text)" - origin="$canCommit"/> - <!--origin="util:isValid($ScriptStorage)"/--> - - <menuitem name="miDiffVCS" icon="imgDiffVCS" - text="isisfish.script.menu.diff" Accelerator="mnDiffVCS" - mnemonic="mnDiffVCS" - ActionCommand="thread:script.Action.diffScript($tree,$ScriptStorage, $scriptJedit/text)" - origin="$canDiff"/> - - <menuitem name="miUpdateVCS" text="isisfish.script.menu.update" icon="imgUpdateVCS" - mnemonic="mnUpdateVCS" Accelerator="accUpdateVCS" - ActionCommand="script.Action.updateScript($tree,$ScriptStorage)" - origin="$canUpdate"/> - - <separator/> - - <menuitem name="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" - icon="imgDeleteVCS" mnemonic="mnDeleteVCS" - ActionCommand="script.Action.deleteScript($tree,$ScriptStorage, 'true')" - Accelerator="accDeleteVCS" - origin="$canDelete"/> - </menu> - - <menu id="scriptTxtCode" text="isisfish.script.menu.code" mnemonic="mnCode"> - <menuitem name="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="imgCheckSyntax" - mnemonic="mnCheckSyntax" Accelerator="accCheckSyntax" - ActionCommand="script.Action.checkScript($ScriptStorage, $scriptJedit/text)" - origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)"/> - - <menuitem name="miEvaluate" text="isisfish.script.menu.evaluate" icon="imgEvaluate" - mnemonic="mnEvaluate" Accelerator="accEvaluate" - ActionCommand="script.Action.evaluateScript($ScriptStorage, $scriptJedit/text)" - origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)"/> - </menu> - - <menu text="isisfish.script.menu.txtHelp" mnemonic="mnHelp"> - <menuitem name="miEditorHelp" text="isisfish.script.menu.txtEditorHelp" icon="imgEditorHelp" - mnemonic="mnEditorHelp" Accelerator="accEditorHelp" - ActionCommand="editorHelp"/> - - <menuitem name="miJavaHelp" text="isisfish.script.menu.txtJavaHelp" icon="imgJavaHelp" - mnemonic="mnJavaHelp" Accelerator="accJavaHelp" - ActionCommand="Help.showURL('JAVA_HELP')"/> - - <separator/> - - <menuitem name="miAbout" text="isisfish.script.menu.about" icon="imgAbout" - mnemonic="mnAbout" Accelerator="accAbout" - ActionCommand="about"/> - </menu> - </menubar> - - <!-- - | Toolbar - +--> - - <panel id="buttonBar" constraints="buttonBar" layout="GridLayout()"> - <combobox id="ScriptTypeChoice" origin="ScriptType" renderer="org.codelutin.i18n.I18n._(.)"> - <!-- no change name in combo box, or change for menu and in Action.newScript too --> - <comboboxmodel origin="fr.ifremer.isisfish.ui.script.Action.getScriptTypesNames()"/> - </combobox> - <button constraints="buttonScriptNew" id="buttonScriptNew" text="isisfish.script.new" - ToolTipText="Create a new script" - actionCommand="script.Action.newScript($tree, $treeModel, $ScriptTypeChoice/selectedItem)"/> - - <button constraints="buttonScriptSave" id="buttonScriptSave" text="isisfish.script.save" - ToolTipText="Save current script" - origin="util:isValid($ScriptStorage)" - actionCommand="script.Action.saveScript($ScriptStorage, $scriptJedit/text)"/> - - <button constraints="buttonScriptExport" id="buttonScriptExport" text="isisfish.script.txtExport" - ToolTipText="Export selected script(s) to zip archive" - origin="$tree/selectionPaths" - actionCommand="script.Action.exportScript($tree)"/> - - <button constraints="buttonScriptCommit" id="buttonScriptCommit" text="isisfish.script.commit" - ToolTipText="Commit script to CVS server" - origin="$canCommit" - actionCommand="script.Action.commitScript($tree, $ScriptStorage, $scriptJedit/text)"/> - - <button constraints="buttonScriptUpdate" id="buttonScriptUpdate" text="isisfish.script.update" - ToolTipText="Update current script from server" - origin="$canUpdate" - actionCommand="script.Action.updateScript($tree,$ScriptStorage)"/> - - <button constraints="buttonScriptCut" id="buttonScriptCut" text="isisfish.script.cut" - ToolTipText="Cut current selection (Ctrl-x)" - origin="util:isValid($ScriptStorage)" - actionCommand="xpath:cut($scriptJedit)"/> - - <button constraints="buttonScriptCopy" id="buttonScriptCopy" text="isisfish.script.copy" - ToolTipText="Copy current selection (Ctrl-c)" - origin="util:isValid($ScriptStorage)" - actionCommand="xpath:copy($scriptJedit)"/> - - <button constraints="buttonScriptPaste" id="buttonScriptPaste" text="isisfish.script.paste" - ToolTipText="Paste current selection (Ctrl-v)" - origin="util:isValid($ScriptStorage)" - actionCommand="xpath:paste($scriptJedit)"/> - - <button constraints="buttonScriptCheck" id="buttonScriptCheck" text="isisfish.script.check" - ToolTipText="Check syntax of the current script" - origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)" - actionCommand="script.Action.checkScript($ScriptStorage, $scriptJedit/text)"/> - - <button constraints="buttonScriptEval" id="buttonScriptEval" text="isisfish.script.evaluate" - ToolTipText="Try to eval current script (must be have main method)" - origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)" - actionCommand="script.Action.evaluateScript($ScriptStorage, $scriptJedit/text)"/> - </panel> - - <!-- - | Content editor - +--> - - <splitpane constraints="contentPanel" oneTouchExpandable="true" dividerLocation="250" orientation="VERTICAL"> - <!-- - | Tree script selection - +--> - <scrollPane constraints="tree"> - <tree id="tree" name="tree" rootVisible="false"> - <NestedTreeModel id="treeModel"> - <TreeNode name="Root"> - <TreeNode name="Script" userObject="'Script'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.ScriptStorage.getScriptNames()"/> - </TreeNode> - <TreeNode name="Simulator" userObject="'Simulator'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.SimulatorStorage.getSimulatorNames()"/> - </TreeNode> - <TreeNode name="Export" userObject="'Export'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.ExportStorage.getExportNames()"/> - </TreeNode> - <TreeNode name="Rule" userObject="'Rule'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.RuleStorage.getRuleNames()"/> - </TreeNode> - <TreeNode name="AnalysePlan" userObject="'AnalysePlan'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlanNames()"/> - </TreeNode> - <TreeNode name="EquationModel" userObject="'EquationModel'"> - <TreeNode origin="fr.ifremer.isisfish.datastore.FormuleStorage.getCategories()"> - <TreeNode treeOrigin=".." childsPropertyName="fr.ifremer.isisfish.datastore.FormuleStorage.getFormuleNames(.)"/> - </TreeNode> - </TreeNode> - </TreeNode> - </NestedTreeModel> - - <TreeRenderer> - <DefaultTreeRenderer type="fr.ifremer.isisfish.datastore.RegionStorage" childsPropertyName="name"/> - <DefaultTreeRenderer type="java.lang.String" childsPropertyName="org.codelutin.i18n.I18n._(.)"/> - </TreeRenderer> - - <TreeSelectionEvents id="treeSelectionListener" - onValueChanged="thread:script.Action.loadScript($tree, $tree/selectionPath/path[2]/userObject, $tree/selectionPath/lastPathComponent)"/> - - </tree> - </scrollPane> - <splitpane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL"> - - <!-- - | Editor script - +--> - - <editor id="scriptJedit" constraints="fieldScriptEdit" - origin="$ScriptStorage/file"/> - - <!-- - | Log area - +--> - - <scrollpane> - <textarea id="actionLogArea" constraints="actionLogArea" - editable="false" - origin="$ActionLog"/> - </scrollpane> - </splitpane> - </splitpane> - - <!-- - | Status bar - +--> - - <xpanel constraints="scriptStatusBar" xml="StatusBar.xml"/> - - -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,78 +0,0 @@ -<layout> - <table cellspacing="2"> - <tr> - <td fill="Both" width="100%">panelAdvancedParamsSimulator</td> - </tr> - <tr> - <td fill="Both" width="100%">panelAdvancedParamsLogger</td> - </tr> - <tr> - <td fill="Both" width="100%" height="90%">panelTagValue</td> - </tr> - <tr> - <td fill="Horizontal" width="100%">buttonAdvancedParamsSave</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td width="1%" fill="Horizontal">labelSimulAdvParamsSimulatorSelect</td> - <td width="99%" colspan="3" fill="Horizontal">fieldSimulAdvParamsSimulatorSelect</td> - </tr> - <tr> - <td fill="Horizontal" width="33%">fieldSimulAdvParamsSimulatorLocal</td> - <td fill="Horizontal" width="33%">fieldSimulAdvParamsSimulatorSubProcess</td> - <td fill="Horizontal" width="33%">fieldSimulationStatistique</td> - <td fill="Horizontal" width="33%">fieldSimulationCache</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td fill="Horizontal" width="20%">labelSimulAdvParamsSimulLogger</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsSimulLoggerError</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsSimulLoggerWarn</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsSimulLoggerInfo</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsSimulLoggerDebug</td> - </tr> - <tr> - <td fill="Horizontal" width="20%">labelSimulAdvParamsScriptLogger</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsScriptLoggerError</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsScriptLoggerWarn</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsScriptLoggerInfo</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsScriptLoggerDebug</td> - </tr> - <tr> - <td fill="Horizontal" width="20%">labelSimulAdvParamsLibLogger</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsLibLoggerError</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsLibLoggerWarn</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsLibLoggerInfo</td> - <td fill="Horizontal" width="20%">fieldSimulAdvParamsLibLoggerDebug</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td align="Center" fill="Horizontal" colspan="4">labelTagValue</td> - </tr> - <tr> - <td fill="Horizontal" width="5%">labelTag</td> - <td fill="Horizontal" width="25%">fieldTag</td> - <td fill="Horizontal" width="5%">labelValue</td> - <td fill="Horizontal" width="25%">fieldValue</td> - </tr> - <tr> - <td fill="Horizontal" colspan="4">buttonTagValueAdd</td> - </tr> - <tr> - <td fill="Both" width="100%" height="90%" colspan="4">tableTagValue</td> - </tr> - <tr> - <td fill="Horizontal" colspan="4">buttonTagValueRemove</td> - </tr> - </table> - -</layout> - - - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,206 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="simulAdvancedParams" name="isisfish.advancedParameters.title" - constraints="simulAdvancedParams" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl)"> - - <panel constraints="panelAdvancedParamsSimulator" border="EtchedBorder" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl)"> - - <!-- - | - | Simulator choice - | - +--> - - <label constraints="labelSimulAdvParamsSimulatorSelect" text="isisfish.advancedParams.simulatorUse"/> - - <combobox constraints="fieldSimulAdvParamsSimulatorSelect" id="fieldSimulAdvParamsSimulatorSelect" - origin="$SimulationParameter/simulatorName" - actionCommand="update($fieldSimulAdvParamsSimulatorSelect/selectedItem, $SimulationParameter/simulatorName)"> - <ComboBoxModel origin="fr.ifremer.isisfish.datastore.SimulatorStorage.getSimulatorNames()"/> - </combobox> - - <!-- - | - | Local/Remote choice - | - +--> -<!-- - <checkbox text="isisfish.advancedParams.localSimulation" - constraints="fieldSimulAdvParamsSimulatorLocal" - id="fieldSimulAdvParamsSimulatorLocal" - origin="$SimulationParameter/local" - actionCommand="Update($fieldSimulAdvParamsSimulatorLocal/selected)"/> - - <checkbox text="isisfish.advancedParams.subProcessSimulation" - constraints="fieldSimulAdvParamsSimulatorSubProcess" - id="fieldSimulAdvParamsSimulatorSubProcess" - origin="$SimulationParameter/subProcess" - actionCommand="Update($fieldSimulAdvParamsSimulatorSubProcess/selected)"/> - --> - <!-- - | - | Trace/Cache option - | - +--> - - <checkbox text="isisfish.advancedParams.simulationStatistique" - constraints="fieldSimulationStatistique" - id="fieldSimulationStatistique" - origin="$SimulationParameter/useStatistic" - actionCommand="Update($fieldSimulationStatistique/selected)"/> - - <checkbox text="isisfish.advancedParams.simulationCache" - constraints="fieldSimulationCache" - id="fieldSimulationCache" - origin="$SimulationParameter/useOptimization" - actionCommand="Update($fieldSimulationCache/selected)"/> - - </panel> - - <panel constraints="panelAdvancedParamsLogger" border="EtchedBorder" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl)"> - - <!-- - | - | simulator Logger level choice - | - +--> - - <label constraints="labelSimulAdvParamsSimulLogger" text="isisfish.advancedParams.simulLevelLogger"/> - - <radioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" - constraints="fieldSimulAdvParamsSimulLoggerError" - buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" - origin='$SimulationParameter/simulErrorLevel' - actionCommand='Update("error", $SimulationParameter/simulLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" - constraints="fieldSimulAdvParamsSimulLoggerWarn" - buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" - origin='$SimulationParameter/simulWarnLevel' - actionCommand='Update("warn", $SimulationParameter/simulLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" - constraints="fieldSimulAdvParamsSimulLoggerInfo" - buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" - origin='$SimulationParameter/simulInfoLevel' - actionCommand='Update("info", $SimulationParameter/simulLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" - constraints="fieldSimulAdvParamsSimulLoggerDebug" - buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" - origin='$SimulationParameter/simulDebugLevel' - actionCommand='Update("debug", $SimulationParameter/simulLogLevel)'/> - - <!-- - | - | script Logger level choice - | - +--> - - <label constraints="labelSimulAdvParamsScriptLogger" text="isisfish.advancedParams.scriptLevelLogger"/> - - <radioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" - constraints="fieldSimulAdvParamsScriptLoggerError" - buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" - origin='$SimulationParameter/scriptErrorLevel' - actionCommand='Update("error", $SimulationParameter/scriptLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" - constraints="fieldSimulAdvParamsScriptLoggerWarn" - buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" - origin='$SimulationParameter/scriptWarnLevel' - actionCommand='Update("warn", $SimulationParameter/scriptLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" - constraints="fieldSimulAdvParamsScriptLoggerInfo" - buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" - origin='$SimulationParameter/scriptInfoLevel' - actionCommand='Update("info", $SimulationParameter/scriptLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" - constraints="fieldSimulAdvParamsScriptLoggerDebug" - buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" - origin='$SimulationParameter/scriptDebugLevel' - actionCommand='Update("debug", $SimulationParameter/scriptLogLevel)'/> - - <!-- - | - | libraries Logger level choice - | - +--> - - <label constraints="labelSimulAdvParamsLibLogger" text="isisfish.advancedParams.libLevelLogger"/> - - <radioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" - constraints="fieldSimulAdvParamsLibLoggerError" - buttonGroup="fieldSimulAdvParamsLibLoggerGroup" - origin='$SimulationParameter/libErrorLevel' - actionCommand='Update("error", $SimulationParameter/libLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" - constraints="fieldSimulAdvParamsLibLoggerWarn" - buttonGroup="fieldSimulAdvParamsLibLoggerGroup" - origin='$SimulationParameter/libWarnLevel' - actionCommand='Update("warn", $SimulationParameter/libLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" - constraints="fieldSimulAdvParamsLibLoggerInfo" - buttonGroup="fieldSimulAdvParamsLibLoggerGroup" - origin='$SimulationParameter/libInfoLevel' - actionCommand='Update("info", $SimulationParameter/libLogLevel)'/> - - <radioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" - constraints="fieldSimulAdvParamsLibLoggerDebug" - buttonGroup="fieldSimulAdvParamsLibLoggerGroup" - origin='$SimulationParameter/libDebugLevel' - actionCommand='Update("debug", $SimulationParameter/libLogLevel)'/> - </panel> - <!-- - | - | Tags values - | - +--> - - <panel constraints="panelTagValue" border="EtchedBorder" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/AdvancedParams.xgl)"> - <label constraints="labelTagValue" text="isisfish.advancedParams.freeParameters" - horizontalAlignment="0"/> - - <label constraints="labelTag" text="isisfish.common.tag"/> - <textfield constraints="fieldTag" id="fieldTag"/> - <label constraints="labelValue" text="isisfish.common.value"/> - <textfield constraints="fieldValue" id="fieldValue"/> - - <button constraints="buttonTagValueAdd" text="isisfish.common.add" - actionCommand="simulator.SimulatorAction.addTagValue($SimulationParameter, $fieldTag/text, $fieldValue/text);refreshView($tableTagValue)"/> - - <scrollPane constraints="tableTagValue"> - <table id="tableTagValue"> - <tableModel origin="entrySet($SimulationParameter/tagValue)"> - <column title="Tag" property="key"/> - <column title="Value" property="value"/> - </tableModel> - </table> - </scrollPane> - - <button constraints="buttonTagValueRemove" text="isisfish.common.remove" - actionCommand="simulator.SimulatorAction.removeTagValue($SimulationParameter, getValueAt($tableTagValue, $tableTagValue/selectedRow, 0));refreshView($tableTagValue)"/> - - </panel> - - <!-- - | - | Save config - | - +--> - - <button constraints="buttonAdvancedParamsSave" text="isisfish.common.saveNextSimulation" - actionCommand="simulator.SimulatorAction.saveTagValue($SimulationParameter/tagValue);simulator.SimulatorAction.saveSimulatorChoice($fieldSimulAdvParamsSimulatorSelect/selectedItem, $fieldSimulAdvParamsSimulatorLocal/selected)"/> - - - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,14 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" height="90%" width="100%" colspan="4">listSimulExportChoose</td> - </tr> - <tr> - <td fill="Horizontal" width="5%">labelSimulExportFolder</td> - <td fill="Horizontal" width="90%">fieldSimulExportFolder</td> - <td fill="Horizontal" width="1%">buttonSimulExportFolderChoose</td> - <td fill="Horizontal" width="5%">buttonSimulExportSave</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Export.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="simulExport" name="isisfish.export.title" constraints="simulExport" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Export.xgl)"> - - <ContextDataSource id="ExportNames" context="current" source="ExportNames"/> - - <scrollPane constraints="listSimulExportChoose"> - <list id="listSimulExportChoose" SelectionMode="2" origin="$SimulationParameter/exportNames"> - <ListModel origin="$ExportNames"/> - <ListSelectionEvents onValueChanged="Update($listSimulExportChoose/selectedValues, $SimulationParameter/exportNames)"/> - <ListRenderer> - <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createExportClassDocsModel($ExportNames)'/> - </ListRenderer> - </list> - </scrollPane> - - <label constraints="labelSimulExportFolder" text="isisfish.export.directory"/> - - <textfield constraints="fieldSimulExportFolder" - id="fieldSimulExportFolder" - origin="$SimulationParameter/exportDirectory"> - <DocumentEvents onModified="Update($fieldSimulExportFolder/text)"/> - </textfield> - - <button constraints="buttonSimulExportFolderChoose" text="isisfish.common.ellipsis" - actionCommand="update(org.codelutin.util.FileUtil.getDirectory(), $SimulationParameter/exportDirectory);refreshView($fieldSimulExportFolder)"/> - - <button constraints="buttonSimulExportSave" text="isisfish.common.saveNextSimulation" - actionCommand="simulator.SimulatorAction.saveExport($SimulationParameter/exportDirectory, $SimulationParameter/exportNames)"/> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,74 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" width="30%" colspan="2">labelSimulParamsSelect</td> - <td fill="Both" width="20%" >panelSimulParamsSelectFilterActions</td> - <td fill="Both">labelSimulParamsName</td> - <td fill="Both" width="50%" colspan="2">fieldSimulParamsName</td> - </tr> - <tr> - <td fill="Both" width="50%" colspan="3">fieldSimulParamsSelect</td> - <td fill="Both">labelSimulParamsDesc</td> - <td fill="Both" width="50%" height="30%" rowspan="5" colspan="2">fieldSimulParamsDesc</td> - </tr> - <tr></tr> - <tr></tr> - <tr></tr> - <tr></tr> - <tr> - <td fill="Horizontal" width="17">labelSimulParamsRegion</td> - <td fill="Both" width="17">labelSimulParamsStrategies</td> - <td fill="Both" width="17">labelSimulParamsPopulations</td> - <td fill="Both" colspan="2" width="34">labelSimulParamsMesures</td> - <td fill="Both" width="17"></td> - </tr> - <tr> - <td fill="Horizontal" width="17" rowspan="4">fieldSimulParamsRegion</td> - <td fill="Both" width="17" rowspan="4">fieldSimulParamsStrategies</td> - <td fill="Both" width="17" rowspan="4">fieldSimulParamsPopulations</td> - <td fill="Both" colspan="2" width="34">fieldSimulParamsMesuresSelect</td> - <td fill="Horizontal" width="17">buttonSimulParamsMesuresAdd</td> - </tr> - <tr> - <td fill="Both" colspan="2" rowspan="3">fieldSimulParamsMesuresList</td> - <td fill="Horizontal">buttonSimulParamsMesuresRemove</td> - </tr> - <tr> - <td fill="Horizontal">buttonSimulParamsMesuresClear</td> - </tr> - <tr></tr> - <tr> - <td fill="Horizontal">labelSimulParamsNbAnnees</td> - <td fill="Both" colspan="5" rowspan="3" height="40%">fieldSimulParamsTabs</td> - </tr> - <tr> - <td fill="Horizontal">fieldSimulParamsNbAnnees</td> - </tr> - <tr></tr> - <tr> - <td fill="Both" colspan="3" width="50%">dummyPanel</td> - <td fill="Both" colspan="3" width="50%">fieldSimulParamsOptions</td> - </tr> - <tr> - <td colspan="3">comboSelLauncher</td> - <td colspan="3">buttonSimulParamsSimulate</td> - <td colspan="3">buttonSimulParamsAddQueue</td> - </tr> - </table> - - <table> - <tr><td>labelSimulParamsEffectifs</td></tr> - <tr><td height="100%" fill="Both">fieldSimulParamsEffectifs</td></tr> - </table> - - <table> - <tr><td>labelSimulParamsRules</td></tr> - <tr><td height="100%" fill="Both">fieldSimulParamsRules</td></tr> - </table> - - <table> - <tr><td fill="Horizontal" width="5%">fieldUseSimulPreScripts</td></tr> - <tr><td fill="Horizontal" width="5%">fieldSimulUseAnalysePlan</td></tr> - <tr><td fill="Horizontal" width="5%">fieldSimulOnlyExport</td></tr> - </table> -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,157 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="simulParams" name="isisfish.params.title" constraints="simulParams" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Params.xgl)"> - - <ContextDataSource id="RuleNames" context="current" source="RuleNames"/> - - <label constraints="labelSimulParamsSelect" text="isisfish.params.loadOldSimulation"/> - <panel constraints="panelSimulParamsSelectFilterActions"> - <button text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" - actionCommand='xpath:fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation($SimulationFilterModel);refreshView("fieldSimulParamsSelect");'/> - <button text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" - actionCommand='xpath:selectAll($SimulationFilterModel);refreshView("fieldSimulParamsSelect")'/> - </panel> - - <combobox id="fieldSimulParamsSelect" constraints="fieldSimulParamsSelect" - origin="$SimulationFilterModel/filteredResult" firstNull="true" - actionCommand="thread:simulator.SimulatorAction.loadOldSimulation($fieldSimulParamsSelect/selectedItem)"> - <ComboBoxModel origin="$SimulationFilterModel/filteredResult"/> - </combobox> - - <label constraints="labelSimulParamsName" text="isisfish.params.simulationName"/> - <textfield constraints="fieldSimulParamsName" id="fieldSimulParamsName" - origin="$OldSimulationName"> - </textfield> - - <label constraints="labelSimulParamsDesc" text="isisfish.params.description"/> - <scrollPane constraints="fieldSimulParamsDesc"> - <textarea id="fieldSimulParamsDesc" - origin="$SimulationParameter/description"> - <DocumentEvents onModified="Update($fieldSimulParamsDesc/text)"/> - </textarea> - </scrollPane> - - <label constraints="labelSimulParamsRegion" text="isisfish.common.region"/> - <combobox constraints="fieldSimulParamsRegion" id="fieldSimulParamsRegion" - origin="$SimulationParameter/regionName" - firstNull="true" - actionCommand="thread:simulator.SimulatorAction.loadRegion($SimulationParameter, $fieldSimulParamsRegion/selectedItem)"> - <ComboBoxModel origin="fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()"/> - </combobox> - - <label constraints="labelSimulParamsStrategies" text="isisfish.common.strategies"/> - <scrollPane constraints="fieldSimulParamsStrategies"> - <list id="listSimulParamsStrategies" SelectionMode="2" - origin="$SimulationParameter/strategies"> - <ListModel origin="$RegionStorage/fisheryRegion/strategy" iterate="true"/> - <ListSelectionEvents onValueChanged="Update($listSimulParamsStrategies/selectedValues, $SimulationParameter/strategies)"/> - </list> - </scrollPane> - - <label constraints="labelSimulParamsPopulations" text="isisfish.common.populations"/> - <scrollPane constraints="fieldSimulParamsPopulations"> - <list id="listSimulParamsPopulations" SelectionMode="2" - origin="$SimulationParameter/populations"> - <ListModel origin="$RegionStorage/fisheryRegion/species/population" iterate="true"/> - <ListSelectionEvents onValueChanged="Update($listSimulParamsPopulations/selectedValues, $SimulationParameter/populations)"/> - <MouseEvents onClicked="xpath:setMatrix($simulParamsNumbers, getNumberOf($SimulationParameter, $listSimulParamsPopulations/selectedValues))"/> - </list> - </scrollPane> - - <label constraints="labelSimulParamsMesures" text="isisfish.common.rules"/> - <combobox constraints="fieldSimulParamsMesuresSelect" id="fieldSimulParamsMesuresSelect" - origin=""> - <ComboBoxModel origin="$RuleNames"/> - <!--<ComboBoxModel origin="fr.ifremer.isisfish.datastore.RuleStorage.getRuleNames()"/>--> - <ComboBoxRenderer> - <SimpleToolTipComboBoxRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createRuleDescriptionsModel($RuleNames)'/> - </ComboBoxRenderer> - </combobox> - <scrollPane constraints="fieldSimulParamsMesuresList"> - <list id="listSimulParamsMesuresList" SelectionMode="0" - origin="" - renderer="fr.ifremer.isisfish.datastore.RuleStorage.getName(/)" - toolTipTextPropertyName="description"> - <ListModel origin="$SimulationParameter/rules"/> - <ListSelectionEvents onValueChanged="fr.ifremer.isisfish.ui.simulator.SimulatorAction.refreshRule($simulParamsRules)"/> - <ListRenderer> - <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createRuleDescriptionsModel2($SimulationParameter/rules,$buttonSimulParamsMesuresClear,$listSimulParamsMesuresList)'/> - </ListRenderer> - </list> - </scrollPane> - - <button constraints="buttonSimulParamsMesuresAdd" id="buttonSimulParamsMesuresAdd" - text="isisfish.common.add" - actionCommand="xpath:addRule($SimulationParameter, getNewRuleInstance(fr.ifremer.isisfish.datastore.RuleStorage.getRule($fieldSimulParamsMesuresSelect/selectedItem)));refreshView($listSimulParamsMesuresList)"/> - <button constraints="buttonSimulParamsMesuresRemove" id="buttonSimulParamsMesuresRemove" - text="isisfish.common.remove" - actionCommand="xpath:removeRule($SimulationParameter, $listSimulParamsMesuresList/selectedValue);refreshView($listSimulParamsMesuresList)"/> - <button constraints="buttonSimulParamsMesuresClear" id="buttonSimulParamsMesuresClear" - text="isisfish.common.clear" actionCommand="xpath:clearRules($SimulationParameter);refreshView($listSimulParamsMesuresList)"/> - <!--TODO Doest not work! when calling use an AbstractCollection with no clear implementation text="Clear" actionCommand="xpath:clear($SimulationParameter/rules);refreshView($listSimulParamsMesuresList)"/>--> - - <label constraints="labelSimulParamsNbAnnees" text="isisfish.params.numberYear"/> - <textfield constraints="fieldSimulParamsNbAnnees" id="fieldSimulParamsNbAnnees" - origin="$SimulationParameter/numberOfYear"> - <DocumentEvents onModified="Update($fieldSimulParamsNbAnnees/text)"/> - </textfield> - - <tabbedPane constraints="fieldSimulParamsTabs"> - <matrixPanel id="simulParamsNumbers" name="isisfish.params.populationNumbers"> - </matrixPanel> - <table id="simulParamsRules" name="isisfish.params.ruleParameters"> - <tableModel origin="fr.ifremer.isisfish.datastore.RuleStorage.getParameterNames($listSimulParamsMesuresList/selectedValue)"> - <column title="Name" property="/" renderer="key"> - <tableColumnRenderer> - <SimpleToolTipTableColumnRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createRuleParamsModel($listSimulParamsMesuresList/selectedValue)'/> - <!--<RuleParameterColumnRenderer origin="$listSimulParamsMesuresList/selectedValue"/>--> - </tableColumnRenderer> - </column> - <column title="Value" editable="true" - property="fr.ifremer.isisfish.datastore.RuleStorage.getParameterValue($listSimulParamsMesuresList/selectedValue, /key)" - actionEdit="fr.ifremer.isisfish.datastore.RuleStorage.setParameterValue($listSimulParamsMesuresList/selectedValue, $e/object/key, $e/value)"> - <tableColumnEditor><ParameterColumnEditor origin="$RegionStorage"/></tableColumnEditor> - <tableColumnRenderer><SimpleToolTipTableColumnRenderer origin=''/></tableColumnRenderer> - </column> - </tableModel> - </table> - </tabbedPane> - - <panel constraints="dummyPanel"/> - <panel id="fieldSimulParamsOptions" - constraints="fieldSimulParamsOptions" - text="Options de simulation" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Params.xgl)"> <!-- TODO la bordure avec le titre --> - <checkbox text="isisfish.params.usePreSimulationScript" - constraints="fieldUseSimulPreScripts" - id="fieldUseSimulPreScripts" - origin="$SimulationParameter/usePreScript" - actionCommand="update($fieldUseSimulPreScripts/selected);xpath:setEnabledAt($simulTabs, 1, $SimulationParameter/usePreScript);simulator.SimulatorAction.selectTab($simulTabs, $SimulationParameter/usePreScript, '1')"/> - - <checkbox text="isisfish.params.useAnalysePlan" - constraints="fieldSimulUseAnalysePlan" - id="fieldSimulUseAnalysePlan" - origin="$SimulationParameter/useAnalysePlan" - actionCommand="update($fieldSimulUseAnalysePlan/selected);xpath:setEnabledAt($simulTabs, 2, $SimulationParameter/useAnalysePlan);simulator.SimulatorAction.selectTab($simulTabs, $SimulationParameter/useAnalysePlan, '2')"/> - - <checkbox text="isisfish.params.onlyExportSimulation" - constraints="fieldSimulOnlyExport" - id="fieldSimulOnlyExport" - origin="$SimulationParameter/onlyExport" - actionCommand="update($fieldSimulOnlyExport/selected)"/> - </panel> - - <combobox constraints="comboSelLauncher" id="comboSelLauncher" - firstNull="true"> - <ComboBoxModel origin="getSimulationLaunchers(fr.ifremer.isisfish.simulator.launcher.SimulationService.getService())"/> - </combobox> - - <button constraints="buttonSimulParamsSimulate" id="buttonSimulParamsSimulate" - text="isisfish.common.simulate" - actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'false', $simulTabs, $comboSelLauncher/selectedItem)"/> -<!-- La queue n'existe plus - <button constraints="buttonSimulParamsAddQueue" id="buttonSimulParamsAddQueue" - text="isisfish.common.addQueue" - actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'true', $simulTabs)"/> - --> -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,11 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" height="100%" width="100%">fieldSimulPreScript</td> - </tr> - <tr> - <td fill="Horizontal" width="100%">buttonBackToParams</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="simulPreScripts" name="isisfish.preScript.title" - constraints="simulPreScripts" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/PreScripts.xgl)"> - - <scrollPane constraints="fieldSimulPreScript"> - <textarea id="fieldSimulPreScript" - origin="$SimulationParameter/preScript"> - <DocumentEvents onModified="Update($fieldSimulPreScript/text, $SimulationParameter/preScript)"/> - </textarea> - </scrollPane> - - <button constraints="buttonBackToParams" text="isisfish.preScript.backParameter" actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')"/> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,23 +0,0 @@ -<layout> - <table cellspacing="2"> - <tr> - <td fill="Both" width="50%" height="90%">panelResultNames</td> - </tr> - </table> - - <table cellspacing="2"> - <tr> - <td align="Center" fill="Horizontal">labelResultNames</td> - </tr> - <tr> - <td fill="Both" width="100%" height="90%">fieldResultNames</td> - </tr> - <tr> - <td fill="Horizontal">buttonResultNamesSave</td> - </tr> - </table> - -</layout> - - - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="ResultChoice" name="isisfish.resultChoice.title" - constraints="ResultChoice" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl)"> - - <ContextDataSource id="ResultNames" context="current" source="ResultNames"/> - - <!-- - | - | Result enabled - | - +--> - - <panel constraints="panelResultNames" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/ResultChoice.xgl)"> - - <label constraints="labelResultNames" text="isisfish.resultChoice.save" - horizontalAlignment="0"/> - <scrollPane constraints="fieldResultNames"> - <!--list id="listResultNames" SelectionMode="2" renderer="org.codelutin.i18n.I18n._(.)"--> - <list id="listResultNames" SelectionMode="2" - origin="$SimulationParameter/resultEnabled"> - <ListModel origin="$ResultNames"/> - <ListSelectionEvents onValueChanged="Update($listResultNames/selectedValues, $SimulationParameter/resultEnabled)"/> - <ListRenderer> - <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createResultFieldsModel($ResultNames)'/> - </ListRenderer> - </list> - </scrollPane> - - <button constraints="buttonResultNamesSave" text="isisfish.common.saveNextSimulation" - actionCommand="simulator.SimulatorAction.saveResultNames($listResultNames/selectedValues)"/> - - </panel> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,27 +0,0 @@ -<layout> - <table> - <!--tr--> - <!--td fill="Both" colspan="2" width="100" height="25">labelSimulParamsAnalysePlans</td--> - <!--/tr--> - <tr> - <td fill="Both" colspan="2" width="34">fieldSimulParamsAnalysePlansSelect</td> - </tr> - <tr> - <td fill="Both" colspan="1" rowspan="3" width="34">fieldSimulParamsAnalysePlansList</td> - <td fill="Horizontal" colspan="1" width="34">buttonSimulParamsAnalysePlansAdd</td> - </tr> - <tr> - <td fill="Horizontal" colspan="1" width="34">buttonSimulParamsAnalysePlansRemove</td> - </tr> - <tr> - <td fill="Horizontal" colspan="1" width="34">buttonSimulParamsAnalysePlansClear</td> - </tr> - <tr> - <td fill="Both" colspan="2" width="100" height="100">simulParamsAnalysePlans</td> - </tr> - <tr> - <td fill="Horizontal" colspan="2" width="100" >buttonBackToParams</td> - </tr> - </table> -</layout> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Sens.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<panel id="simulSens" name="isisfish.sens.title" constraints="simulSens" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Sens.xgl)"> - - <ContextDataSource id="AnalysePlanNames" context="current" source="AnalysePlanNames"/> - - <!--scrollPane constraints="labelSimulParamsAnalysePlans"> - <textarea id="AnalysePlanDescription" editable="false" text="isisfish.sens.planAdd"/> - </scrollPane--> - <combobox constraints="fieldSimulParamsAnalysePlansSelect" id="fieldSimulParamsAnalysePlansSelect" - origin=""> - <ComboBoxModel origin="$AnalysePlanNames"/> - <ComboBoxRenderer> - <SimpleToolTipComboBoxRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanDescriptionsModel($AnalysePlanNames)'/> - </ComboBoxRenderer> - </combobox> - <scrollPane constraints="fieldSimulParamsAnalysePlansList"> - <list id="listSimulParamsAnalysePlansList" SelectionMode="0" - origin="" - renderer="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getName(/)" - toolTipTextPropertyName="description"> - <ListModel origin="$SimulationParameter/analysePlans"/> - <ListSelectionEvents onValueChanged="refreshView($simulParamsAnalysePlans)"/> - <!--ListSelectionEvents onValueChanged="xpath:setText($AnalysePlanDescription, $listSimulParamsAnalysePlansList/selectedValue/description)"/--> - <ListRenderer> - <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanDescriptionsModel2($SimulationParameter/analysePlans,$buttonSimulParamsAnalysePlansClear,$listSimulParamsAnalysePlansList)'/> - </ListRenderer> - </list> - </scrollPane> - - <button constraints="buttonSimulParamsAnalysePlansAdd" id="buttonSimulParamsAnalysePlansAdd" - text="isisfish.common.add" - actionCommand="xpath:addAnalysePlan($SimulationParameter, getNewAnalysePlanInstance(fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlan($fieldSimulParamsAnalysePlansSelect/selectedItem)));refreshView($listSimulParamsAnalysePlansList)"/> - <button constraints="buttonSimulParamsAnalysePlansRemove" id="buttonSimulParamsAnalysePlansRemove" - text="isisfish.common.remove" - actionCommand="xpath:removeAnalysePlan($SimulationParameter, $listSimulParamsAnalysePlansList/selectedValue);refreshView($listSimulParamsAnalysePlansList)"/> - <button constraints="buttonSimulParamsAnalysePlansClear" id="buttonSimulParamsAnalysePlansClear" - text="isisfish.common.clear" actionCommand="xpath:clearPlans($SimulationParameter);refreshView($listSimulParamsAnalysePlansList,$simulParamsAnalysePlans)"/> - <!--TODO Doest not work! when calling use an AbstractCollection with no clear implementation text="Clear" actionCommand="xpath:clear($SimulationParameter/analysePlans);refreshView($listSimulParamsAnalysePlansList)"/>--> - - <scrollPane constraints="simulParamsAnalysePlans"> - <table id="simulParamsAnalysePlans" name="isisfish.sens.planParameters"> - <tableModel origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterNames($listSimulParamsAnalysePlansList/selectedValue)"> - <column title="Name" property="/" renderer="key"> - <tableColumnRenderer> - <SimpleToolTipTableColumnRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanParamsModel($listSimulParamsAnalysePlansList/selectedValue)'/> - </tableColumnRenderer> - </column> - <column title="Value" editable="true" - property="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterValue($listSimulParamsAnalysePlansList/selectedValue, /key)" - actionEdit="fr.ifremer.isisfish.datastore.AnalysePlanStorage.setParameterValue($listSimulParamsAnalysePlansList/selectedValue, $e/object/key, $e/value)"> - <tableColumnEditor><ParameterColumnEditor origin="$RegionStorage"/></tableColumnEditor> - <tableColumnRenderer> - <SimpleToolTipTableColumnRenderer origin=''/> - </tableColumnRenderer> - </column> - </tableModel> - </table> - </scrollPane> - - <button constraints="buttonBackToParams" text="isisfish.sens.backParameter" actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')"/> - -</panel> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,22 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" height="100%" width="100%">sensWizardPanel</td> - </tr> - </table> - -<!-- <table> - <tr> - <td fill="Both" height="100%" width="100%">sensWizardPanelContentPanel</td> - </tr> - </table> ---> - <table> - <tr> - <td fill="Both" height="100%" width="100%">sensWizardPanelContentPanel</td> - </tr> - <tr> - <td fill="Horizontal">sensWizardPanelButtons</td> - </tr> - </table> -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<Frame id="sensWizard" visible="true" size="400,400" title="isisfish.sensibilityWizard.title" - Maximizable="true" Closable="true" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizard.xgl)" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <panel constraints="sensWizardPanel" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizard.xgl)"> - <!--panel constraints="sensWizardPanelContent"--> - <WizardPanel id="wizpnl" constraints="sensWizardPanelContentPanel" xml="simulator/SensWizardPanels.xml" onChange="simulator.SensWizard.newTab($wizardPrev, $wizardNext, $wizardFinish, $wizardTabPane)"/> - <!--/panel--> - <panel constraints="sensWizardPanelButtons"> - <button id="wizardPrev" text="isisfish.common.previous" actionCommand="prev" enabled="false"/> - <button id="wizardNext" text="isisfish.common.next" actionCommand="next"/> - <button id="wizardFinish" text="isisfish.common.finish" actionCommand="finishSensWizard" enabled="false"/> - <button text="isisfish.common.cancel" actionCommand="cancel"/> - </panel> - </panel> - -</Frame> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,55 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" height="100%" width="100%">wizardTabPane</td> - </tr> - </table> - - <table fill="Both" height="100%" width="100%"> - <tr> - <td fill="Horizontal">typeSensWizardLabel</td> - </tr> - <tr> - <td fill="Horizontal">buttonSimulSensWizardValuesList</td> - </tr> - <tr> - <td fill="Horizontal">buttonSimulSensWizardScriptsList</td> - </tr> - </table> - - <table> - <tr> - <td fill="Horizontal" colspan="2">valuesSensWizardLabelPanel</td> - </tr> - <tr> - <td fill="Horizontal" height="20%" colspan="2">valuesSensWizardNewValuePanel</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardAdd</td> - <td fill="Both" height="80%" width="100%" rowspan="7">fieldSensWizardList</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardModify</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardRemove</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardUp</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardDown</td> - </tr> - <tr> - <td fill="Horizontal">buttonValuesSensWizardClear</td> - </tr> - <tr></tr> - </table> - - <table> - <tr> - <td>typeSensWizardLabel</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<panel name="isisfish.sensWizardPanels.title" id="sensWizardPanels" visible="true" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl)"> - - <tabbedpane id="wizardTabPane" constraints="wizardTabPane"> - <panel name="isisfish.sensWizardPanels.type" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl)"> - <label constraints="typeSensWizardLabel" text="isisfish.sensWizardPanels.selectType"/> - <buttonGroup> - <radioButton constraints="buttonSimulSensWizardValuesList" text="isisfish.sensWizardPanels.values" actionCommand="" selected="true"/> - <radioButton constraints="buttonSimulSensWizardScriptsList" text="isisfish.sensWizardPanels.scripts" actionCommand=""/> - </buttonGroup> - </panel> - <panel name="isisfish.sensWizardPanels.values" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl)"> - <panel constraints="valuesSensWizardLabelPanel"> - <label constraints="valuesSensWizardObjectLabel" text="isisfish.sensWizardPanels.object"/> - <textfield constraints="valuesSensWizardObjectField" origin="" editable="false"/> - <label constraints="valuesSensWizardFieldLabel" text="isisfish.sensWizardPanels.field"/> - <textfield constraints="valuesSensWizardFieldField" origin="" editable="false"/> - <label constraints="valuesSensWizardTypeLabel" text="isisfish.sensWizardPanels.type"/> - <textfield constraints="valuesSensWizardTypeField" origin="" editable="false"/> - </panel> - <panel contraints="valuesSensWizardNewValuePanel" text="New Value"> - <textarea origin="" text="isisfish.common.blabla"/> <!-- TODO Peut dépendre du type de l'obet --> - </panel> - <button constraints="buttonValuesSensWizardAdd" id="buttonValuesSensWizardAdd" text="isisfish.sensWizardPanels.add" actionCommand=""/> - <button constraints="buttonValuesSensWizardModify" id="buttonValuesSensWizardModify" text="isisfish.sensWizardPanels.modify" actionCommand=""/> - <button constraints="buttonValuesSensWizardRemove" id="buttonValuesSensWizardRemove" text="isisfish.sensWizardPanels.remove" actionCommand=""/> - <button constraints="buttonValuesSensWizardUp" id="buttonValuesSensWizardUp" text="isisfish.sensWizardPanels.up" actionCommand=""/> - <button constraints="buttonValuesSensWizardDown" id="buttonValuesSensWizardDown" text="isisfish.sensWizardPanels.down" actionCommand=""/> - <button constraints="buttonValuesSensWizardClear" id="buttonValuesSensWizardClear" text="isisfish.sensWizardPanels.clear" actionCommand=""/> - <scrollPane constraints="fieldSensWizardList"> - <list id="listSensWizardList" origin="" SelectionMode="1" iterate="false"> - <ListModel origin=""/> - </list> - </scrollPane> - </panel> - <panel name="isisfish.sensWizardPanels.validate" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl)"> - <label constraints="typeSensWizardLabel" text="isisfish.sensWizardPanels.finish"/> - </panel> - </tabbedpane> -</panel> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xgl =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xgl 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xgl 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,12 +0,0 @@ -<layout> - <table> - <tr> - <td fill="Both" width="100%" height="100%" colspan="2">simulTabs</td> - </tr> - <tr> - <td fill="Horizontal" width="100%">statusBar</td> - <td>fishIcon</td> - </tr> - </table> - -</layout> Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> -<Frame id="simul" visible="true" size="700,500" Location="0,139" title="isisfish.simulation.title" - layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Simul.xgl)" - Maximizable="true" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - <!--onOpened="simulator.SimulatorAction.opened($simulTabs)"--> - <WindowEvents id="events" - onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" - onClosing="UIHelper.closeContext()" /> -<!-- -onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" ---> - -<!-- Fixme : Modif Letellier 29/08/08 -$buttonSimulQueueStart, $buttonSimulQueueRemove, $buttonSimulQueueShowLog, $queueTable, $queueTableDone, ---> - - <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> - <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> - <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/> - <ContextDataSource id="RegionStorage" context="current" source="RegionStorage"/> - - <menubar> - <menu text="isisfish.simulation.menu.file" mnemonic="mnFile"> - <menuitem name="miClose" text="isisfish.simulation.menu.close" icon="imgClose" - mnemonic="mnClose" ActionCommand="cancel" Accelerator="accClose"/> - </menu> -<!-- - <menu text="txtSimulation" mnemonic="mnSimulation"> - <menuitem name="miSimulate" text="txtSimulate" icon="imgSimulate" - mnemonic="mnSimulate" ActionCommand="simulate" Accelerator="accSimulate"/> - <menuitem name="miQueue" text="txtQueue" icon="imgQueue" - mnemonic="mnQueue" ActionCommand="queue" Accelerator="accQueue"/> - </menu> ---> - <menu text="isisfish.simulation.menu.help" mnemonic="mnHelp"> - <menuitem name="miAbout" text="isisfish.simulation.menu.about" icon="imgAbout" - mnemonic="mnAbout" ActionCommand="about" Accelerator="accAbout"/> - </menu> - </menubar> - - <tabbedPane constraints="simulTabs" id="simulTabs"> - <xpanel xml="simulator/Params.xml"/> - <xpanel xml="simulator/PreScripts.xml"/> - <xpanel xml="simulator/Sens.xml"/> - <xpanel xml="simulator/Export.xml"/> - <xpanel xml="simulator/ResultChoice.xml"/> - <xpanel xml="simulator/AdvancedParams.xml"/> - <Queue id="simulQueue" name="isisfish.queue.title"/> -<!-- <xpanel xml="simulator/Queue.xml"/> --> - </tabbedPane> - - <xpanel constraints="statusBar" xml="StatusBar.xml"/> -<!-- - <label icon="images/fish.jpg" constraints="fishIcon"/> ---> -</Frame> - Deleted: isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueue.xml =================================================================== --- isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueue.xml 2008-10-08 13:30:54 UTC (rev 1543) +++ isis-fish/branches/arbo-maven/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueue.xml 2008-10-08 13:44:28 UTC (rev 1544) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<Frame visible="true" size="400,400" title="isisfish.simulationQueue.title" - layout="BorderLayout" Maximizable="true" Closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge"> - - <Queue/> -<!-- - <xpanel xml="simulator/Queue.xml"/> ---> -</Frame> -