r3408 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script - Isis-fish-commits

15 Jun 2011

Author: chatellier
Date: 2011-06-15 15:00:06 +0000 (Wed, 15 Jun 2011)
New Revision: 3408

Log:
Enable VCS actions.
Reformat file.

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx

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	2011-06-15 14:53:18 UTC (rev 3407)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx	2011-06-15 15:00:06 UTC (rev 3408)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+  Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
@@ -47,40 +47,63 @@
             <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png">
                 <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript"
                     onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' icon="script.png" />
-                <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' icon="script.png" />
-                <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" />
-                <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" />
-                <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' icon="script.png" />
-                <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" />
-                <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" />
-                <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Formule)' icon="script.png" />
+                <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' icon="script.png" />
+                <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" />
+                <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" />
+                <JMenuItem id="miNewAnalysePlan" text="isisfish.script.menu.txtNewAnalysePlan"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.AnalysePlan)' icon="script.png" />
+                <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" />
+                <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" />
+                <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel"
+                    onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Formule)' icon="script.png" />
             </JMenu>
-            <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' />
+            <JMenuItem id="miSave" text="isisfish.script.menu.save"
+                onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' />
             <JSeparator/>
-            <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" />
-            <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="getScriptAction().exportScript()" icon="page_white_compressed.png" enabled='{isFileSelected()}' />
+            <JMenuItem id="miImport" text="isisfish.script.menu.txtImport"
+                enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" />
+            <JMenuItem id="miExport" text="isisfish.script.menu.txtExport"
+                onActionPerformed="getScriptAction().exportScript()" icon="page_white_compressed.png" enabled='{isFileSelected()}' />
             <JSeparator/>
-            <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='getScriptAction().deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' />
+            <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly"
+                onActionPerformed='getScriptAction().deleteScript(false)' icon="script_delete.png" enabled='{isSingleFileSelected()}' />
         </JMenu>
         <JMenu id="scriptTxtEdit" text="isisfish.script.menu.edit">
-            <JMenuItem id="miCut" text="isisfish.script.menu.cut" onActionPerformed="getScriptAction().cut()" icon="cut.png" enabled='{isTextSelected()}' />
-            <JMenuItem id="miCopy" text="isisfish.script.menu.copy" onActionPerformed="getScriptAction().copy()" icon="page_copy.png" enabled='{isTextSelected()}' />
-            <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' />
+            <JMenuItem id="miCut" text="isisfish.script.menu.cut"
+                onActionPerformed="getScriptAction().cut()" icon="cut.png" enabled='{isTextSelected()}' />
+            <JMenuItem id="miCopy" text="isisfish.script.menu.copy"
+                onActionPerformed="getScriptAction().copy()" icon="page_copy.png" enabled='{isTextSelected()}' />
+            <JMenuItem id="miPaste" text="isisfish.script.menu.paste"
+                onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' />
         </JMenu>
         <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS">
-            <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='false' />
-            <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' />
-            <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()" enabled='false'/>
+            <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png"
+                onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' />
+            <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS"
+                onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' />
+            <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png"
+                onActionPerformed="getScriptAction().updateScript()"/>
             <JSeparator/>
-            <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='false'/>
+            <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer"
+                onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png"/>
         </JMenu>
         <JMenu id="scriptTxtCode" text="isisfish.script.menu.code">
-            <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' />
-            <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script_code_red.png" onActionPerformed="new SwingWorker<Void, Void>(){public Void doInBackground(){getScriptAction().checkAllScripts();return null;}}.execute()" />
-            <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png" onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' />
+            <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png"
+                onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' />
+            <JMenuItem id="miCheckAllSyntax" text="isisfish.script.menu.checkAllSyntax" icon="script_code_red.png"
+                onActionPerformed="new SwingWorker<Void, Void>(){public Void doInBackground(){getScriptAction().checkAllScripts();return null;}}.execute()" />
+            <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" icon="script_gear.png"
+                onActionPerformed="getScriptAction().evaluateScript()" enabled='{isJavaFileSelected()}' />
             <JSeparator/>
-            <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" onActionPerformed="getScriptAction().generateScriptJavadoc()"/>
-            <JMenuItem id="miShowJavadoc" text="isisfish.script.menu.javadocshow" onActionPerformed="getScriptAction().showScriptJavadoc()"/>
+            <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate"
+                onActionPerformed="getScriptAction().generateScriptJavadoc()"/>
+            <JMenuItem id="miShowJavadoc" text="isisfish.script.menu.javadocshow"
+                onActionPerformed="getScriptAction().showScriptJavadoc()"/>
         </JMenu>
     </JMenuBar>
 
@@ -88,15 +111,24 @@
     <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
         <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'>
             <JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/>
-            <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' icon="script.png" />
-            <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" />
-            <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" />
-            <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" />
-            <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' icon="cut.png" />
-            <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' icon="page_copy.png" />
-            <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' icon="page_paste.png" />
-            <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().checkScript()' icon="script_code_red.png" />
-            <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}' onActionPerformed='getScriptAction().evaluateScript()' icon="script_gear.png" />
+            <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip'
+                onActionPerformed='getScriptAction().newScript()' icon="script.png" />
+            <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip"
+                enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" />
+            <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false'
+                onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" />
+            <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false'
+                onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" />
+            <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}'
+                onActionPerformed='getScriptAction().cut()' icon="cut.png" />
+            <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}'
+                onActionPerformed='getScriptAction().copy()' icon="page_copy.png" />
+            <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}'
+                onActionPerformed='getScriptAction().paste()' icon="page_paste.png" />
+            <JButton id="buttonScriptCheck" text="isisfish.script.check" toolTipText="isisfish.script.check.tooltip" enabled='{isJavaFileSelected()}'
+                onActionPerformed='getScriptAction().checkScript()' icon="script_code_red.png" />
+            <JButton id="buttonScriptEval" text="isisfish.script.evaluate" toolTipText="isisfish.script.evaluate.tooltip" enabled='{isJavaFileSelected()}'
+                onActionPerformed='getScriptAction().evaluateScript()' icon="script_gear.png" />
         </JPanel>
         <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'>
             <JScrollPane>

    

r3408 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)