Author: chatellier Date: 2009-09-18 10:10:58 +0000 (Fri, 18 Sep 2009) New Revision: 2637 Modified: isis-fish/trunk/TODO.txt isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Finish script UI translation Modified: isis-fish/trunk/TODO.txt =================================================================== --- isis-fish/trunk/TODO.txt 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/TODO.txt 2009-09-18 10:10:58 UTC (rev 2637) @@ -1,10 +1,11 @@ -TODO au 22/12/2008 +TODO au 18/09/2009 ================== - refaire les UI des résultats - - tester que les paramêtres d'une simulation - sont corrects - (ex:detection qu'il n'y a pas de strategie) - - modification des configurations des paths - pour les lancements à distance (caparmor...) - - simulation path... \ No newline at end of file + - tester que les paramêtres d'une simulation sont corrects + (ex:année < 0) + - Pouvoir modifier les facteurs apres avoir recharger une simulation + - valeur par defaut dans les champs de saisie + - JavaWebStart + - Synchronisation des script utilisateur (ecriture) + - Voir une version antérieure d'un script \ No newline at end of file Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/changelog.txt 2009-09-18 10:10:58 UTC (rev 2637) @@ -1,5 +1,6 @@ isis-fish (3.2.0.7) stable; urgency=low + * Isis now start with 1Go of allocated memory * Fix strategies/population selection on old simulation reloading * Always use logger for force writing in debug.txt file * Instantiate simulation parameters objects only when needed (to work on caparmor) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-09-18 10:10:58 UTC (rev 2637) @@ -365,19 +365,19 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="ScriptTypeChoice" model='{new DefaultComboBoxModel(getContextValue(ScriptAction.class).getScriptTypesNames())}'/> - <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='Create a new script' onActionPerformed='newScript()'/> - <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="Save current script" enabled='false' onActionPerformed='saveScript()'/> - <JButton id="buttonScriptExport" text="isisfish.script.txtExport" toolTipText="Export selected script(s) to zip archive" enabled='false' onActionPerformed='exportScript()'/> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="Commit script to CVS server" enabled='false' onActionPerformed='commitScript()'/> - <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="Cut current selection (Ctrl-x)" enabled='false' onActionPerformed='cut()'/> - <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="Copy current selection (Ctrl-c)" enabled='false' onActionPerformed='copy()'/> - <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="Paste current selection (Ctrl-v)" enabled='false' onActionPerformed='paste()'/> - <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="Check syntax of the current script" enabled='false' onActionPerformed='checkScript()'/> - <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="Try to eval current script (must be have main method)" enabled='false' onActionPerformed='evaluateScript()'/> + <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='newScript()'/> + <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='false' onActionPerformed='saveScript()'/> + <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='exportScript()'/> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false' onActionPerformed='commitScript()'/> + <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='false' onActionPerformed='cut()'/> + <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='false' onActionPerformed='copy()'/> + <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='false' onActionPerformed='paste()'/> + <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='false' onActionPerformed='checkScript()'/> + <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='false' onActionPerformed='evaluateScript()'/> </JPanel> <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JScrollPane> - <javax.swing.JTree id="tree" name="tree" rootVisible="false" model='{getTreeModel()}'/> + <javax.swing.JTree id="tree" name="tree" rootVisible="false" model='{getTreeModel()}' /> </JScrollPane> <JSplitPane oneTouchExpandable="true" resizeWeight="0.75" orientation="VERTICAL"> <org.codelutin.widget.editor.Editor id='editor'/> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-09-18 10:10:58 UTC (rev 2637) @@ -20,17 +20,11 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Check\ syntax\ of\ the\ current\ script= Checkout\ pom.xml\ to\ %s= Command\ '%s'\ fail\ to\ execute= -Commit\ script\ to\ CVS\ server= -Copy\ current\ selection\ (Ctrl-c)= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= -Create\ a\ new\ script= -Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= -Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= @@ -43,7 +37,6 @@ Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= -Paste\ current\ selection\ (Ctrl-v)= Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited= @@ -51,15 +44,12 @@ Remote\ control\ file\ doesn't\ exists\ %s= Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= -Save\ current\ script= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= -Stop\ the\ process= SubProcess\ start\:\ %s\ %s= Switch\ repository\ type\ to\ none= -Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)= Try\ to\ log\ on\ %s@%s\:%d= Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= @@ -139,7 +129,6 @@ isisfish.common.season=Season isisfish.common.setOfVessels=Set of vessels isisfish.common.simulate=Simulate -isisfish.common.stop=Stop isisfish.common.strategies=Strategies isisfish.common.sum=Sum isisfish.common.tag=Tag @@ -633,7 +622,6 @@ isisfish.message.script.commit=Enter commit message isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects -isisfish.message.simulation.after=Result exports isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation @@ -849,17 +837,21 @@ isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=Check +isisfish.script.check.tooltip=Check syntax of the current script isisfish.script.commit=Commit +isisfish.script.commit.tooltip=Commit script to SVN server isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation complete.\n---------------------\n\n%s isisfish.script.copy=Copy +isisfish.script.copy.tooltip=Copy current selection (Ctrl-c) isisfish.script.cut=Cut +isisfish.script.cut.tooltip=Cut current selection (Ctrl-x) isisfish.script.evaluate=Evaluate -isisfish.script.export=Export script to archive -isisfish.script.export.cancel=Cancel +isisfish.script.evaluate.tooltip=Try to eval current script (must be have main() method) +isisfish.script.export=Export isisfish.script.export.checkAll=(Un)Check all scripts isisfish.script.export.chooseDir=... -isisfish.script.export.export=Export +isisfish.script.export.tooltip=Export selected script(s) to zip archive isisfish.script.export.tooltip.checkAll=(Un)Check all scripts to export isisfish.script.export.tooltip.chooseDir=Choose directory to export script to isisfish.script.import=Import scripts from archive @@ -900,10 +892,12 @@ isisfish.script.menu.txtVCS=Server isisfish.script.menu.update=Update from server isisfish.script.new=New +isisfish.script.new.tooltip=Create new script isisfish.script.paste=Paste +isisfish.script.paste.tooltip=Paste current selection (Ctrl-v) isisfish.script.save=Save +isisfish.script.save.tooltip=Sauve le script isisfish.script.title=Script Editor -isisfish.script.txtExport=Export isisfish.season.toString=season %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=Select a population Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-18 09:24:53 UTC (rev 2636) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-09-18 10:10:58 UTC (rev 2637) @@ -20,17 +20,11 @@ Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= -Check\ syntax\ of\ the\ current\ script= Checkout\ pom.xml\ to\ %s= Command\ '%s'\ fail\ to\ execute= -Commit\ script\ to\ CVS\ server= -Copy\ current\ selection\ (Ctrl-c)= Could\ not\ found\ formule\ type\ %s\ autorised\ type\ are\ %s= -Create\ a\ new\ script= -Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= -Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= Import\ one\ java\ file\ script\ source= Import\ simulation\ file\ %s\ in\ directory\ %s\ and\ rename\ from\ %s\ to\ %s= @@ -43,7 +37,6 @@ Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s= Normal\ stop\ thread,\ this\ is\ not\ an\ error= Not\ start\ simulation\ %s\ because\ user\ ask\ stop= -Paste\ current\ selection\ (Ctrl-v)= Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e @@ -51,15 +44,12 @@ Remote\ control\ file\ doesn't\ exists\ %s= Remote\ information\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= -Save\ current\ script= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= Ssh\ key\ found\ '%s'\ will\ be\ used\ to\ connect\ to= Stop\ simulation\ plan,\ because\ can't\ call\ afterSimulation\ correctly\ on\ plan\ %s= -Stop\ the\ process= SubProcess\ start\:\ %s\ %s= Switch\ repository\ type\ to\ none= -Try\ to\ eval\ current\ script\ (must\ be\ have\ main\ method)= Try\ to\ log\ on\ %s@%s\:%d= Use\ branches,\ switch\ not\ needed= User\ restart\ simulation\ %s= @@ -139,7 +129,6 @@ isisfish.common.season=Saison isisfish.common.setOfVessels=Flottille isisfish.common.simulate=Simuler -isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies isisfish.common.sum=somme isisfish.common.tag=Tag @@ -633,7 +622,6 @@ isisfish.message.script.commit=Indiquez vos modifications isisfish.message.setting.cache.aspects=Mise en place des aspects Cache isisfish.message.setting.trace.aspects=Mise en place des aspects Trace -isisfish.message.simulation.after=Export des r\u00E9sultats isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation @@ -849,17 +837,21 @@ isisfish.resume.scrolledwindow=defaultToolTip-fr.ifremer.resultat.ResumePanel.scrolledwindow2 isisfish.resume.table=defaultToolTip-fr.ifremer.resultat.ResumePanel.table1 isisfish.script.check=V\u00E9rifier +isisfish.script.check.tooltip=V\u00E9rifie la synthaxe du script isisfish.script.commit=Commit +isisfish.script.commit.tooltip=Committer le script sur le serveur SVN isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation r\u00E9ussie.\n--------------------\n\n%s isisfish.script.copy=Copier +isisfish.script.copy.tooltip=Copier la s\u00E9lection courante (Ctrl-c) isisfish.script.cut=Couper +isisfish.script.cut.tooltip=Couper la s\u00E9lection courante (Ctrl-x) isisfish.script.evaluate=\u00C9valuer -isisfish.script.export=Exporter des scripts dans une archive zip -isisfish.script.export.cancel=Annuler +isisfish.script.evaluate.tooltip=Lance le script (doit contenir un methode main() pour fonctionner) +isisfish.script.export=Exporter isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner isisfish.script.export.chooseDir=... -isisfish.script.export.export=Exporter +isisfish.script.export.tooltip=Exporter les scripts s\u00E9lectionn\u00E9s vers une archive zip isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts isisfish.script.import=Importer des scripts depuis une archive zip @@ -900,10 +892,12 @@ isisfish.script.menu.txtVCS=Serveur isisfish.script.menu.update=Synchronisation isisfish.script.new=Nouveau +isisfish.script.new.tooltip=Cr\u00E9e un nouveau script isisfish.script.paste=Coller +isisfish.script.paste.tooltip=Colle la s\u00E9lection courante (Ctrl-v) isisfish.script.save=Sauver +isisfish.script.save.tooltip=Sauve le script isisfish.script.title=Editeur de scripts -isisfish.script.txtExport=Exporter isisfish.season.toString=saison %1$s-%2$s isisfish.selectivity.equation=Equation isisfish.selectivity.selectPopulation=S\u00E9lectionnez une population