From a114ebf15a37c28994d5dfe868f6d7dc499fc39b Mon Sep 17 00:00:00 2001
From: preecej <preecej@localhost>
Date: Tue, 2 Oct 2012 18:46:38 +0000
Subject: [PATCH] Comment clean-up, changed "Command-W" to "Ctrl-W" on Windows
 actions.props

svn path=/; revision=385
---
 Annotation/resources/config/actions.properties    |  2 +-
 .../ie/dcu/apps/ist/views/SegmentationView.java   | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Annotation/resources/config/actions.properties b/Annotation/resources/config/actions.properties
index 317d660..bcc136b 100644
--- 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 a85b5ed..f3b17f4 100644
--- 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);
-- 
2.34.1