Comment clean-up, changed "Command-W" to "Ctrl-W" on Windows actions.props

svn path=/; revision=385

diff --git a/Annotation/resources/config/actions.properties b/Annotation/resources/config/actions.properties
index 317d660348ad0c7755a76b076ba50db9de1c2029..bcc136b8db38dba24b2baa175805a55cc71fe76b 100644 (file)
--- a/Annotation/resources/config/actions.properties
+++ b/Annotation/resources/config/actions.properties
@@ -51,7 +51,7 @@ action.PrintAction.text=&Print@Ctrl+P
 action.PrintAction.image=file:resources/icons/print.png
 action.PrintAction.tooltip=Print view
 
-action.CloseAction.text=&Close@Command+W
+action.CloseAction.text=&Close@Ctrl+W
 action.CloseAction.image=file:resources/icons/close.png
 action.CloseAction.tooltip=Close current file
 

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index a85b5ed551f5224537b920a3e23560463577395c..f3b17f4b7b243d821d15e645ef13013a58cab64d 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -253,6 +253,7 @@ public class SegmentationView extends Composite {
        public void resetView() {
                Tool.OperatingMode.action.setChecked(false);
                resetViewSelectionToolbar(painters.get("Combined"));
+
                // clear metadata
                comboLabel.deselectAll();
                comboLabel.setEnabled(false);
@@ -260,19 +261,11 @@ public class SegmentationView extends Composite {
                clearTermSynonymTable();
                collectionId.setText("");
                comment.setText("");
-               //if (curatorCombo.getText() != null) {
-                       //curatorCombo.setText(null);
-                       curatorCombo.deselectAll();
-               //}
-               //if (speciesCombo.getText() != null) {
-                       speciesCombo.deselectAll();
-                       //speciesCombo.setText(null);
-               //}
+               curatorCombo.deselectAll();
+               speciesCombo.deselectAll();
+               
                // clear segment data (term labels, layers, image coords)
                if (view.getContext() != null) {
-                       //ArrayList<SegmentationMask> segMasks = view.getContext().getSegmentationMasks();  
-                       //if (segMasks.size() > 0)
-                       //      segMasks.clear();
                        this.getContext().nullifySegments();
                        this.getContext().nullifySegments(); // TODO: why twice?
                        this.setContext(null);