Removed unused class ContextMenu

diff --git a/.gitattributes b/.gitattributes
index 381f242583124cd4bc43ed31533f49c710fd3268..980e02a6e19e5156928f80e8758f8de9352f5a4b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -649,7 +649,6 @@ taxeditor-editor/plugin.xml -text
 taxeditor-editor/pom.xml -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ContextMenu.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java -text

diff --git a/taxeditor-editor/build.properties b/taxeditor-editor/build.properties
index 87c865cf98d6e1643f2d80fe93c5c0fdd5959249..f590f5bbdd52146ec2b5afffdf11d5129e96fa80 100644 (file)
--- a/taxeditor-editor/build.properties
+++ b/taxeditor-editor/build.properties
@@ -3,7 +3,8 @@ source.. = src/main/java/,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               log4j.properties,\
                plugin.properties,\
                icons/
-src.includes = log4j.properties
+source.icons/ = src/main/java/,\
+                src/main/resources/,\
+                src/test/java/

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ContextMenu.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ContextMenu.java
deleted file mode 100644 (file)
index cd3c98c..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ContextMenu.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.action.IMenuListener;\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.MenuManager;\r
-import org.eclipse.jface.action.Separator;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Menu;\r
-\r
-/**\r
- * Creates a menu that is opened by right-clicking on a <code>Control</code>.\r
- * <p>\r
- * Note that menu items are added anew each time the menu is opened.\r
- * </p>\r
- * \r
- * @author p.ciardelli\r
- * @created 26.05.2008\r
- * @version 1.0\r
- */\r
-public class ContextMenu {\r
-       private static final Logger logger = Logger.getLogger(ContextMenu.class);\r
-       \r
-       private Control control;\r
-       private Menu menu;\r
-       private MenuManager menuManager;\r
-       private List actions;\r
-       private String label;\r
-       \r
-       /**\r
-        * Constructor for top-level menu items.\r
-        * \r
-        * @param control\r
-        */\r
-       public ContextMenu(Control control) {\r
-               this.control = control;\r
-               \r
-               // TODO rewrite class to override Menu\r
-               \r
-               createContextMenu();\r
-       }\r
-\r
-       public ContextMenu(String label) {\r
-               this.label = label;\r
-               \r
-               createContextMenu();\r
-       }\r
-       \r
-       public MenuManager getMenuManager() {\r
-               return menuManager;\r
-       }\r
-       \r
-       private void createContextMenu() {\r
-               if (control != null) {\r
-                       menuManager = new MenuManager();\r
-                       menu = menuManager.createContextMenu(control);\r
-                       control.setMenu(menu);\r
-               } else {\r
-                       menuManager = new MenuManager(label);\r
-               }\r
-               \r
-               menuManager.setRemoveAllWhenShown(true);\r
-               menuManager.addMenuListener(new IMenuListener() {\r
-                       public void menuAboutToShow(IMenuManager manager) {\r
-                               for (Object action : getActions()) {\r
-                                       if (action instanceof Action) {\r
-                                               manager.add((Action) action);\r
-                                       }\r
-                                       if (action instanceof Separator) {\r
-                                               manager.add((Separator) action);\r
-                                       }\r
-                                       if (action instanceof MenuManager) {\r
-                                               manager.add((MenuManager) action);\r
-                                       }\r
-                               }\r
-                       }\r
-               });\r
-       }\r
-       \r
-       private List getActions() {\r
-               if (actions == null) {\r
-                       actions = new ArrayList();\r
-               }\r
-               return actions;\r
-       }\r
-       \r
-       public void addAction(Action action) {\r
-               getActions().add(action);\r
-       }\r
-\r
-       public void removeAction(Action action) {\r
-               getActions().remove(action);\r
-       }\r
-       \r
-       public void addSeparator() {\r
-               getActions().add(new Separator());\r
-       }\r
-\r
-       public void addSubmenu(MenuManager submenu) {\r
-               getActions().add(submenu);\r
-       }\r
-       \r
-       public void setMenuManager(MenuManager menuManager){\r
-               if(control == null){\r
-                       logger.warn("No control set for context menu");\r
-               }else{\r
-                       this.menuManager = menuManager;\r
-                       menu = menuManager.createContextMenu(control);\r
-                       control.setMenu(menu);\r
-                       \r
-                       menuManager.addMenuListener(new IMenuListener() {\r
-                               public void menuAboutToShow(IMenuManager manager) {\r
-                                       for (Object action : getActions()) {\r
-                                               if (action instanceof Action) {\r
-                                                       manager.add((Action) action);\r
-                                               }\r
-                                               if (action instanceof Separator) {\r
-                                                       manager.add((Separator) action);\r
-                                               }\r
-                                               if (action instanceof MenuManager) {\r
-                                                       manager.add((MenuManager) action);\r
-                                               }\r
-                                       }\r
-                               }\r
-                       });     \r
-               }\r
-       }\r
-\r
-       public Menu getMenu() {\r
-               return menu;\r
-       }\r
-}
\ No newline at end of file

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
index afc8f7943cb79341deb83c506fd74f0f08d3c38c..0ffe2b925f0cc4535ca99b667437f4ec653be845 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
@@ -328,17 +328,6 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
        protected void setDirty(boolean isDirty) {\r
                managedForm.dirtyStateChanged();\r
        }\r
-               \r
-       protected ContextMenu createContextMenu() {\r
-               if (textViewer != null) {\r
-                       ContextMenu contextMenu = new ContextMenu(textViewer.getRulerControl());\r
-                       textViewer.getTextWidget().setMenu(contextMenu.getMenu());\r
-                       return contextMenu;\r
-               } else {\r
-                       logger.warn("Can't create menu because textViewer has not been initalized.");\r
-                       return null;\r
-               }\r
-       }\r
        \r
        public void setMenu (Menu menu) {\r
                super.setMenu(menu);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
index 1f1045f1101bbad5df9f5a40b830800cafa1b6de..5a67ac6235c3f175c43a8f5f450698f69eea9828 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
@@ -10,23 +10,17 @@
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.operations.IUndoableOperation;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
-import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
 import eu.etaxonomy.taxeditor.propertysheet.description.DescriptionElementPropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.DescriptionUtil;\r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
 import eu.etaxonomy.taxeditor.store.model.Resources;\r
-import eu.etaxonomy.taxeditor.store.operations.DeleteDescriptionElementOperation;\r
 \r
 /**\r
  * @author p.ciardelli\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
index d835b030cce568289b87f5a860c55a61adfc521e..941bb4b6dc69f87fd5cd085c3ba51922c1e8daeb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
@@ -10,27 +10,17 @@
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.operations.IUndoableOperation;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.action.IMenuListener;\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
-import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;\r
-import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
-import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
 import eu.etaxonomy.taxeditor.propertysheet.description.TaxonDescriptionPropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
 import eu.etaxonomy.taxeditor.store.model.Resources;\r
-import eu.etaxonomy.taxeditor.store.operations.CreateDescriptionElementOperation;\r
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r
 \r
 /**\r
  * Composite for editing a description's label / Title Cache information.\r
@@ -100,39 +90,6 @@ public class DescriptionLabelComposite extends GroupedComposite {
                return description;\r
        }\r
 \r
-       /**\r
-        * FIXME migrate menu to plugin.xml configuration\r
-        */\r
-       private void createMenu() {\r
-               \r
-               MenuManager featuresMenu = new MenuManager("Add description element");\r
-               featuresMenu.setRemoveAllWhenShown(true);\r
-               featuresMenu.addMenuListener(new IMenuListener() {\r
-                       public void menuAboutToShow(IMenuManager manager) {\r
-                               for (final Feature feature : PreferencesUtil.getPreferredFeatures()) {\r
-                                       \r
-                                       String text = feature.getLabel();\r
-                                       manager.add(new Action(text){\r
-                                               \r
-                                               public void run() {\r
-                                                       IUndoableOperation operation = new CreateDescriptionElementOperation\r
-                                                                       (this.getText(), editor.getUndoContext(), taxon, description, feature, editor);\r
-                                                       EditorUtil.executeOperation(operation);\r
-                                               }\r
-                                       });\r
-                               }\r
-                       }\r
-               });\r
-               \r
-               // Important: add an empty action. Otherwise, when the main menu sees that\r
-               // there are no actions in the submenu, it will not be shown\r
-               // HACK?\r
-               featuresMenu.add(new Action() {});\r
-\r
-               ContextMenu contextMenu = createContextMenu();\r
-               contextMenu.addSubmenu(featuresMenu);\r
-       }\r
-\r
        protected void parse(String text) {\r
                getDescription().setTitleCache(text);\r
                \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/GalleryLabelComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/GalleryLabelComposite.java
index 8d39c3196c917f497fbbfe981b6a85c8504b2a4d..c53de7dc2605e85614136b877dec67fcfe12f60a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/GalleryLabelComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/GalleryLabelComposite.java
@@ -10,27 +10,17 @@
 package eu.etaxonomy.taxeditor.editor.images;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.operations.IUndoableOperation;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.action.IMenuListener;\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
-import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;\r
-import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
-import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
 import eu.etaxonomy.taxeditor.propertysheet.description.TaxonDescriptionPropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
 import eu.etaxonomy.taxeditor.store.model.Resources;\r
-import eu.etaxonomy.taxeditor.store.operations.CreateDescriptionElementOperation;\r
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r
 \r
 /**\r
  * Composite for editing a description's label / Title Cache information.\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
index 469b47fc46c1057862c4ee245dae524806b5a60f..d4df27f25a62e4d63d77f8ebd1a872de40c22208 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
@@ -18,7 +18,6 @@ import org.eclipse.ui.views.properties.IPropertySource;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.NameUtil;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
index 625279554cc27cd9af4e8c3dbc80f6d8430473a4..3d3315f5ff2453efde0c3cdc0ccf32ae13498e5e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
@@ -231,7 +231,7 @@ public class ReferenceSearchDialog extends Dialog {
 \r
                // Delete non-nomenclatural references as needed\r
                if (searchType == IReferenceSearch.NOMREF) {\r
-                       List nomenclaturalResultsArray = new ArrayList();\r
+                       List nomenclaturalResultsArray = new ArrayList<Object>();\r
                        for (Object result : resultsArray) {\r
                                if (result instanceof INomenclaturalReference) {\r
                                        nomenclaturalResultsArray.add(result);\r