From: b.stoever <b.stoever@localhost>
Date: Mon, 15 Jun 2015 08:52:23 +0000 (+0000)
Subject: Icons added for insert/overwrite button in AlignmentEditor tool bar.
X-Git-Tag: 3.8.0^2~59^2~58
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/169640eb5e4aea6090b119449edd342a1497d171

Icons added for insert/overwrite button in AlignmentEditor tool bar.
Insert left/right in pherogram disabled when switching to overwrite mode.
---

diff --git a/.gitattributes b/.gitattributes
index 18d464846..743b58a7f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -367,8 +367,10 @@ eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
+eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
 eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
+eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png -text
 eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png -text
@@ -405,6 +407,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java -text svneol=unset#text/plain
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/LoadPherogramHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditorHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java -text
diff --git a/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png
new file mode 100644
index 000000000..6c9bce7ad
Binary files /dev/null and b/eu.etaxonomy.taxeditor.editor/icons/insert-16x16.png differ
diff --git a/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png b/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png
new file mode 100644
index 000000000..d2aa9e2fb
Binary files /dev/null and b/eu.etaxonomy.taxeditor.editor/icons/overwrite-16x16.png differ
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index ed687ff85..3c5382273 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -1031,7 +1031,7 @@
                   icon="icons/pherogram-insert-left-16x16.png"
                   style="push">
                <visibleWhen
-                     checkEnabled="true">
+                     checkEnabled="false">
                   <with
                         variable="activePartId">
                      <equals
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java
new file mode 100644
index 000000000..31b96f9e4
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/HandlerTools.java
@@ -0,0 +1,40 @@
+// $Id$
+/**
+* Copyright (C) 2015 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.editor.handler;
+
+
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.resource.ImageDescriptor;
+
+import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
+
+
+
+/**
+ * Implements shared functionality for handler implementations using tool bar icons.
+ *
+ * @author Ben Stöver
+ * @date 15.06.2015
+ */
+public class HandlerTools {  //TODO Move this class or method somewhere else?
+    public static ImageDescriptor createImageDescriptor(String iconName) {
+        URL url = FileLocator.find(TaxeditorEditorPlugin.getDefault().getBundle(),
+                new Path("icons/" + iconName), null);
+        if (url != null) {
+            return ImageDescriptor.createFromURL(url);
+        }
+        else {
+            throw new InternalError("Icon \"" + iconName + "\" could not be loaded.");  //TODO Throw other type of exception?
+        }
+    }
+}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleInsertOverwriteHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleInsertOverwriteHandler.java
index 7b047f888..2d3ebb83f 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleInsertOverwriteHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleInsertOverwriteHandler.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -10,15 +10,20 @@
 package eu.etaxonomy.taxeditor.editor.handler.alignmenteditor;
 
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.commands.IElementUpdater;
 import org.eclipse.ui.menus.UIElement;
 
+import eu.etaxonomy.taxeditor.editor.handler.HandlerTools;
 import eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
@@ -26,34 +31,42 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
 /**
  * Switches an {@link AlignmentEditor} between insertion and overwrite mode.
- * 
+ *
  * @author Ben Stöver
  * @date 04.12.2014
  */
 public class ToggleInsertOverwriteHandler extends AbstractHandler implements IElementUpdater {
-	public static final String COMMAND_ID = 
+	public static final String COMMAND_ID =
 			"eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite";
-	
-	
-	@Override
+
+
+    private final ImageDescriptor INSERT_DESCRIPTOR = HandlerTools.createImageDescriptor("insert-16x16.png");
+    private final ImageDescriptor OVERWRITE_DESCRIPTOR = HandlerTools.createImageDescriptor("overwrite-16x16.png");
+
+
+    @Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
         IEditorPart activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
             ((AlignmentEditor)activeEditor).toggleInsertOverwrite();
+            ((ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class)).refreshElements(
+                    ToggleLeftRightInsertionHandler.COMMAND_ID, new HashMap());
         }
         return null;
 	}
-    
-    
+
+
 	@Override
 	public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) {
         IEditorPart activeEditor = AbstractUtility.getActiveEditor();
 		if (activeEditor instanceof AlignmentEditor) {
 			if (((AlignmentEditor)activeEditor).isInsertMode()) {
-				element.setText(" INS ");
+			    element.setIcon(INSERT_DESCRIPTOR);
+				element.setText("INS");
 				element.setTooltip("Click to switch to overwrite mode");
 			}
 			else {
+                element.setIcon(OVERWRITE_DESCRIPTOR);
 				element.setText("OVR");
 				element.setTooltip("Click to switch to insertion mode");
 			}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleLeftRightInsertionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleLeftRightInsertionHandler.java
index 9e7ba3e45..8b5489ee8 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleLeftRightInsertionHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleLeftRightInsertionHandler.java
@@ -9,26 +9,22 @@
 
 package eu.etaxonomy.taxeditor.editor.handler.alignmenteditor;
 
-import java.net.URL;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.commands.IElementUpdater;
 import org.eclipse.ui.menus.UIElement;
 
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
+import eu.etaxonomy.taxeditor.editor.handler.HandlerTools;
 import eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
+
+
 /**
  * Switches an {@link AlignmentEditor} between insertion in the base sequence to
  * the left or to the right.
@@ -38,64 +34,44 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
  */
 public class ToggleLeftRightInsertionHandler extends AbstractHandler implements IElementUpdater {
     public static final String COMMAND_ID = "eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion";
-    
-    
-    private final ImageDescriptor INSERT_LEFT_DESCRIPTOR;
-    private final ImageDescriptor INSERT_RIGHT_DESCRIPTOR;
-    private final ImageDescriptor INSERT_LEFT_DISABLED_DESCRIPTOR;
-    private final ImageDescriptor INSERT_RIGHT_DISABLED_DESCRIPTOR;
 
-    
-    private ImageDescriptor createImageDescriptor(String iconName) {
-        URL url = FileLocator.find(TaxeditorEditorPlugin.getDefault().getBundle(), 
-        		new Path("icons/" + iconName), null);
-        if (url != null) {
-            return ImageDescriptor.createFromURL(url);
-        }
-        else {
-        	throw new InternalError("Icon \"" + iconName + "\" could not be loaded.");  //TODO Throw other type of exception?
-        }
-    }
-    
-    
-    /**
-     *
-     */
-    public ToggleLeftRightInsertionHandler() {
-    	super();
-    	INSERT_LEFT_DESCRIPTOR = createImageDescriptor("pherogram-insert-left-16x16.png");
-    	INSERT_RIGHT_DESCRIPTOR = createImageDescriptor("pherogram-insert-right-16x16.png");
-    	INSERT_LEFT_DISABLED_DESCRIPTOR = createImageDescriptor("pherogram-insert-left-disabled-16x16.png");
-    	INSERT_RIGHT_DISABLED_DESCRIPTOR = createImageDescriptor("pherogram-insert-right-disabled-16x16.png");
-    }
 
-    
+    private final ImageDescriptor INSERT_LEFT_DESCRIPTOR =
+            HandlerTools.createImageDescriptor("pherogram-insert-left-16x16.png");
+    private final ImageDescriptor INSERT_RIGHT_DESCRIPTOR =
+            HandlerTools.createImageDescriptor("pherogram-insert-right-16x16.png");
+    private final ImageDescriptor INSERT_LEFT_DISABLED_DESCRIPTOR =
+            HandlerTools.createImageDescriptor("pherogram-insert-left-disabled-16x16.png");
+    private final ImageDescriptor INSERT_RIGHT_DISABLED_DESCRIPTOR =
+            HandlerTools.createImageDescriptor("pherogram-insert-right-disabled-16x16.png");
+
+
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         IEditorPart activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
-            ((AlignmentEditor) activeEditor).toggleLeftRightInsertionInPherogram();
+            ((AlignmentEditor)activeEditor).toggleLeftRightInsertionInPherogram();
         }
-        ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
-        commandService.refreshElements(COMMAND_ID, new HashMap());
         return null;
     }
 
-    
+
     @Override
     public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) {
         IEditorPart activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
-            if (((AlignmentEditor) activeEditor).isInsertLeftInPherogram()) {
+            setBaseEnabled(((AlignmentEditor)activeEditor).isInsertMode());
+            if (((AlignmentEditor)activeEditor).isInsertLeftInPherogram()) {
                 element.setIcon(INSERT_LEFT_DESCRIPTOR);
                 element.setDisabledIcon(INSERT_LEFT_DISABLED_DESCRIPTOR);
-                element.setText(" Left ");
-                element.setTooltip("Click to switch to insert new distorsions of the base call sequence right of future edits.");
-            } else {
+                element.setText("Left");
+                element.setTooltip("Switch to insert pherogram distorsions right of future edits.");
+            }
+            else {
                 element.setIcon(INSERT_RIGHT_DESCRIPTOR);
                 element.setDisabledIcon(INSERT_RIGHT_DISABLED_DESCRIPTOR);
                 element.setText("Right");
-                element.setTooltip("Click to switch to insert new distorsions of the base call sequence left of future edits.");
+                element.setTooltip("Switch to insert pherogram distorsions left of future edits.");
             }
         }
     }