r2103 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input - Isis-fish-commits

14 Apr 2009

Author: chatellier
Date: 2009-04-14 12:46:21 +0000 (Tue, 14 Apr 2009)
New Revision: 2103

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
Log:
Improve code style , logger & co ...

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-04-10 15:17:12 UTC (rev 2102)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-04-14 12:46:21 UTC (rev 2103)
@@ -97,10 +97,10 @@
 protected DefaultComboBoxModel getFieldCurrentRegionModel(){
     return new DefaultComboBoxModel(Common.getRegionItem());
 }
-protected void regionChange(){
+protected void regionChange() {
     final String name = fieldCurrentRegion.getSelectedItem().toString();
     if (log.isDebugEnabled()) {
-        log.debug(" selected " + name);
+        log.debug("Region change, selected : " + name);
     }
     setInfoText(_("isisfish.message.loading.region", name));
     SwingUtilities.invokeLater(new Runnable() {
@@ -112,18 +112,21 @@
         }
     });
 }
-protected void loadRegion(String name){
+protected void loadRegion(String name) {
+    if (log.isDebugEnabled()) {
+        log.debug("Loadregion : " + name);
+    }
     setRegion((FisheryRegionImpl)getAction().loadRegion(this, name));
-    if (getRegion() == null){
+    if (getRegion() == null) {
         regionNull();
     }
-    else{
+    else {
         setTreeModel();
         getCardlayoutPrincipal().show(inputPanePrincipal,"normale");
     }
 }
 protected void setTreeModel(){
-    if (getRegion() != null){
+    if (getRegion() != null) {
         String regionName = getRegion().getName();
         setContextValue(getRegion());
         NavigationTreeModel model = InputNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion());
@@ -137,76 +140,77 @@
     }
 }
 
-public void repaintNode(String path){
+public void repaintNode(String path) {
     NavigationTreeModel model = getContextValue(NavigationTreeModel.class);
     NavigationTreeNode currentNode = model.findNode(path);
     model.nodeChanged(currentNode);
 }
-public void setTreeSelection(String path){
+public void setTreeSelection(String path) {
     NavigationTreeNode node = NavigationUtil.findNode(this, null, path);
     TreePath pathToRoot = new TreePath(getContextValue(NavigationTreeModel.class).getPathToRoot(node));
     navigation.setSelectionPath(pathToRoot);
     navigation.scrollPathToVisible(pathToRoot);
 }
-protected void setInfoText(String s){
+protected void setInfoText(String s) {
     WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
     root.setInfoText(s);
 }
-protected void newRegion(){
+protected void newRegion() {
     String name = fieldNewRegion.getText();
     setInfoText(_("isisfish.message.creating.region", name));
     getContextValue(InputAction.class).newRegion(name);
-    setInfoText(_("isisfish.message.creating.region", name));
     setFieldCurrentRegionModel();
     fieldCurrentRegion.setSelectedItem(name);
     JButtonNewRegion.setEnabled(false);
     fieldNewRegion.setText("");
     setInfoText(_("isisfish.message.creation.finished"));
 }
-protected void regionNull(){
+protected void regionNull() {
     getCardlayoutPrincipal().show(inputPanePrincipal,"none");
     DefaultTreeModel model = new DefaultTreeModel(null);
     navigation.setModel(model);
 }
-protected void newChanged(){
+protected void newChanged() {
     JButtonNewRegion.setEnabled(true);
 }
-protected void importRegion(){
-    setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegion()));
+protected void importRegion() {
+    setInfoText(_("isisfish.message.import.zip"));
+    getContextValue(InputAction.class).importRegion();
     setFieldCurrentRegionModel();
     setInfoText(_("isisfish.message.import.finished"));
 }
-protected void importRegionAndRename(){
-    setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegionAndRename()));
+protected void importRegionAndRename() {
+    setInfoText(_("isisfish.message.import.zip"));
+    getContextValue(InputAction.class).importRegionAndRename();
     setFieldCurrentRegionModel();
     setInfoText(_("isisfish.message.import.finished"));
 }
-protected void importV2Region(){
+protected void importV2Region() {
     setInfoText(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region());
     setFieldCurrentRegionModel();
     setInfoText(_("isisfish.message.import.finished"));
 }
-protected void importRegionFromSimulation(){
+protected void importRegionFromSimulation() {
     setInfoText(_("isisfish.message.import", getContextValue(InputAction.class).importRegionFromSimulation()));
 }
-protected void exportRegion(){
+protected void exportRegion() {
     setInfoText(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion(getRegionStorage())));
     setFieldCurrentRegionModel();
     setInfoText(_("isisfish.message.export.done"));
 }
-protected void copyRegion(){
+protected void copyRegion() {
     setInfoText(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion(getRegionStorage())));
     setFieldCurrentRegionModel();
     setInfoText(_("isisfish.message.copy.finished"));
 }
-protected void removeRegion(){
-    setInfoText(_("isisfish.message.removing.region" + getRegionStorage().getName()));
+protected void removeRegion() {
+    setInfoText(_("isisfish.message.removing.region", getRegionStorage().getName()));
     setInfoText(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false));
     setFieldCurrentRegionModel();
     regionNull();
 }
-protected void commitRegionInCVS(){
-    setInfoText(_("isisfish.message.commiting.region" + getRegionStorage().getName()));
+protected void commitRegionInCVS() {
+    setInfoText(_("isisfish.message.commiting.region", getRegionStorage().getName()));
     setInfoText(getContextValue(InputAction.class).commitRegionInCVS(getRegionStorage()));
 }
     ]]>
@@ -216,7 +220,7 @@
             <JMenuItem text="isisfish.input.menu.importRegion" onActionPerformed="importRegion()" accelerator="accNew"/>
             <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="importRegionAndRename()" accelerator="accNew"/>
             <JMenuItem text="isisfish.input.menu.importRegionV2" onActionPerformed="importV2Region()" accelerator="accNew"/>
-             <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="importRegionFromSimulation()" accelerator="accImportFromSimulation"/>
+            <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="importRegionFromSimulation()" accelerator="accImportFromSimulation"/>
             <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{getRegion() != null}' onActionPerformed="exportRegion()" accelerator="accExport"/>
             <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{getRegion() != null}' onActionPerformed="copyRegion()" accelerator="accExport"/>
             <JSeparator/>

    

r2103 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)