- simplified code/refactoring

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / NonViralNameDetailSection.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
index 6657d7a744bcefa27ca3337d414b6239d25525d7..d76f59a91f74368ce3dd6eb9dc3d36ce0dafbefb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * 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.
 */
@@ -11,6 +11,7 @@
 package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.SWT;
@@ -20,11 +21,11 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
@@ -53,20 +54,21 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
                        ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) {
                super(formFactory, conversation, parentElement, selectionProvider, style);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#createToolbar()
         */
        @Override
        protected Control createToolbar() {
                ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
-               
+
                if(getEntity() != null && checkForMultipleNameUsages(getEntity())){
-               
-                       Action cloneAction = new Action("Clone", Action.AS_PUSH_BUTTON){
-                               public void run() {
-                                       boolean confirm = StoreUtil.confirmDialog("Confirm cloning", "Do you really want to clone the name?");
-                                       
+
+                       Action cloneAction = new Action("Clone", IAction.AS_PUSH_BUTTON){
+                               @Override
+                public void run() {
+                                       boolean confirm = AbstractUtility.confirmDialog("Confirm cloning", "Do you really want to clone the name?");
+
                                        if(confirm){
                                                NonViralName clonedName;
                                                clonedName = (NonViralName) getEntity().clone();
@@ -76,27 +78,27 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
 //                                             EditorUtil.getActiveMultiPageTaxonEditor().r
                                                firePropertyChangeEvent(new CdmPropertyChangeEvent(NonViralNameDetailSection.this, null));
                                        }
-                                       
+
                                };
                        };
-                       
+
                        cloneAction.setToolTipText("Clone the name if you do not want to edit the shared instance");
-                       
+
                        toolBarManager.add(cloneAction);
-               
+
                }
                return toolBarManager.createControl(this);
        }
-       
+
 
        /**
-        * @param nonViralName 
-        * 
+        * @param nonViralName
+        *
         */
        private boolean checkForMultipleNameUsages(NonViralName nonViralName) {
                return nonViralName.getTaxonBases().size() != 1;
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType()
         */
@@ -119,7 +121,8 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
         * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
         */
        /** {@inheritDoc} */
-       public void setTaxonBase(TaxonBase taxon) {
+       @Override
+    public void setTaxonBase(TaxonBase taxon) {
                taxonBase = taxon;
                NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(taxon.getName());
                setEntity(name);