cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 1 Apr 2021 22:07:36 +0000 (00:07 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 1 Apr 2021 22:15:59 +0000 (00:15 +0200)
12 files changed:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/handler/OpenDescriptiveDataSetEditorHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonNodeHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsViewHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/e4/DefaultOpenTaxonNodeWizardHandlerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/LineSelection.java

index 620134bb2776f21fad7941d7ab26dbfd4fc803ab..dadb6b2d36bb38e281f38b0b3e791d722273ed73 100644 (file)
@@ -176,8 +176,6 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
     @Optional
     @Inject
     private void updateAfterSearch(@UIEventTopic(WorkbenchEventConstants.BULK_EDITOR_SEARCH_FINISHED)IStructuredSelection selection){
-
-
         if(selection!=null){
             setSelection(selection);
         }
index c2dffe95dbb0f30b8f1000aefdf9a5019ba1506c..c975de41063489a2e26e9f0da69177c610b93d1e 100644 (file)
@@ -229,7 +229,6 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
                 }
                                if (actualMonitor != null){
                                    actualMonitor.setCanceled(true);
-
                                }
                                actualMonitor = monitor;
                                if (entityUUID != null){
@@ -271,18 +270,6 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
                         return Status.CANCEL_STATUS;
                     }
 
-                    //not necessary anymore, we sort by type and
-                    //id as this can be done immediately
-//                     monitor.subTask("Sort");
-//                    referencingObjects = sortReferencing();
-//                    monitor.worked(5);
-//                     if (referencingObjects == null){
-//                         if (monitor.isCanceled()){
-////                           actualUuid = null;
-//                             return Status.CANCEL_STATUS;
-//                         }
-//                     }
-
                        if(monitor.isCanceled()) {
                            return Status.CANCEL_STATUS;
                        }
index df9c1142ac1bfcb021b5eb0ea79a5770149fed7e..52d49cc7bef6d87710f410ccb1bddb002ae385fe 100644 (file)
@@ -1,4 +1,11 @@
-
+/**
+ * Copyright (C) 2014 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.descriptiveDataSet.handler;
 
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
@@ -24,9 +31,6 @@ public class OpenDescriptiveDataSetEditorHandler extends DefaultOpenHandlerBaseE
         EditorUtil.openDescriptiveDataSetEditor(entity.getUuid(), modelService, partService, application);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean canExecute(Object entity) {
         return true;
@@ -36,6 +40,4 @@ public class OpenDescriptiveDataSetEditorHandler extends DefaultOpenHandlerBaseE
     protected String getPartId() {
         return AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETEDITOR;
     }
-
-
 }
\ No newline at end of file
index bbdbafbfda5aa023747c3dea05ec1847f6160d59..acfd4651813a6590493da3bdbaab6ffdae58a268 100644 (file)
@@ -345,7 +345,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>
     }
     public void addToSaveConcept(Taxon toSaveNew) {
        this.toSaveConcepts.add(toSaveNew);
-
     }
 
     @Override
@@ -406,9 +405,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>
         toSaveNewNames.clear();
         toSaveConcepts.clear();
 
-
-
-
         for(AbstractPostOperation<?> entry:operations){
             IStatus status = Status.CANCEL_STATUS;
             final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
index f9408667cbf1de7b07fce5d09348e3e32cecd54d..f3a3ec8558ab62364f466248e3a70fc8ae9fd4e6 100644 (file)
@@ -27,7 +27,7 @@ public class DefaultOpenTaxonEditorForTaxonNodeHandler
         try {
             EditorUtil.openTaxonNodeE4(entity.getUuid(), modelService, partService, application);
         } catch (Exception e) {
-            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonNodeHandler.class, Messages.DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN+entity.getTaxonTitleCache(), e);
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonNodeHandler.class, Messages.DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN + entity.getTaxonTitleCache(), e);
         }
     }
 
index e2178e88c2aa9ce05001fae0e19b68cc8e04c520..96a9abeb299d511c8655fdfe61a3a812a9f9fe49 100644 (file)
@@ -233,8 +233,6 @@ public class Messages extends NLS {
     public static String NameEditorDropTargetListener_CHANGE_SYNONYM_TO_MISAPP;
     public static String NameEditorDropTargetListener_UNSUCCESSFULL_DROP;
     public static String OpenChecklistEditorHandler_CHOOSE_AREA;
-    public static String OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE;
-    public static String OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE;
     public static String OpenChecklistEditorHandler_GOTO_PREFERENCES;
     public static String OpenChecklistEditorHandler_NO_AREAS;
     public static String OpenDerivateEditorForTaxonHandler_COULD_NOT_OPEN_EDITOR;
index 3f59cc63e4787418d73a9f659f8b7fc801943097..a9c35e810d77693cf01f33c3226b97813fe7e929 100644 (file)
@@ -64,9 +64,7 @@ SetSecundumHandler_confirm=Confirm the exchange of secundum reference
 DefaultOpenSpecimenEditorForTypeSpecimenHandler_COULD_NOT_OPEN=Specimen tree editor could not be opened
 DefaultOpenTaxonEditorForTaxonBaseHandler_COULD_NOT_OPEN=Could not open taxon editor for taxon/synonym 
 DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN=Could not open taxon editor for taxon node
-OpenChecklistEditorHandler_CHOOSE_AREA=Please choose the areas you want to display. 
-OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE=Could not open Distribution Editor.
-OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE=Could not open Distribution Editor
+OpenChecklistEditorHandler_CHOOSE_AREA=Please choose the areas you want to display.
 OpenChecklistEditorHandler_GOTO_PREFERENCES=For this go to the preferences, choose the Checklist Editor and choose the areas in the Distribution Selection Wizard.
 OpenChecklistEditorHandler_NO_AREAS=No Areas to display
 OpenDerivateViewHandler_COULD_NOT_OPEN=Specimen tree editor could not be opened
index 7d3e5ef948b0c5e56f1c45037d1101a685688ff7..9bc7afc87e8df1d491b0475e138b985f744bcf2b 100644 (file)
@@ -64,8 +64,6 @@ DefaultOpenSpecimenEditorForTypeSpecimenHandler_COULD_NOT_OPEN=Specimen-Baum-Edi
 DefaultOpenTaxonEditorForTaxonBaseHandler_COULD_NOT_OPEN=Taxon-Editor für Taxon/Synonym konnte nicht geöffnet werden
 DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN=Taxon-Editor für Taxonknoten konnte nicht geöffnet werden 
 OpenChecklistEditorHandler_CHOOSE_AREA=Bitte wählen Sie das Gebiet aus, das dargestellt werden soll
-OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE=Der Verbreitungs-Editor konnte nicht geöffnet werden
-OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE=Der Verbreitungs-Editor konnte nicht geöffnet werden
 OpenChecklistEditorHandler_GOTO_PREFERENCES=Hierfür gehen Sie zu den Preferences, wählen Sie Checklist Editor und dann die Gebiete in dem Verbreitungs-Wizard.
 OpenChecklistEditorHandler_NO_AREAS=Keine Gebiete, die angezeigt werden können
 OpenDerivateViewHandler_COULD_NOT_OPEN=Specimen-Baum-Editor konnte nicht geöffnet werden.
index 8b6cc5d1cef68e983bbfcf68eaa3dfd4e0054f1a..277a5f195e7f2e10edb149ef613947dee5a909f3 100644 (file)
@@ -1,12 +1,18 @@
+/**
+ * Copyright (C) 2014 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.view.checklist.e4.handler;
 
 import java.util.List;
 
-import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
-import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -20,7 +26,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenSetBaseHandler;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.security.RequiredPermissions;
@@ -40,11 +45,6 @@ public class OpenChecklistEditorHandlerE4 extends DefaultOpenSetBaseHandler<List
            EditorUtil.openDistributionEditor(entities, modelService, partService, application);
        }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
     @CanExecute
     @Override
     public boolean canExecute(MHandledMenuItem menuItem,
@@ -82,13 +82,9 @@ public class OpenChecklistEditorHandlerE4 extends DefaultOpenSetBaseHandler<List
         return result;
     }
 
-
-
     @Override
     protected boolean canExecute(Object entity) {
         // TODO Auto-generated method stub
         return true;
     }
-
-
-}
+}
\ No newline at end of file
index 6dd2deb6225d675d5c3e7847671e7b27e5d63eb0..06dd8bf2ae9294f43fc3971048c19cf26b457918 100644 (file)
@@ -23,6 +23,7 @@ public class OpenReferencingObjectsViewHandler {
     Object selectedObject;
     @Execute
     public void execute(EPartService partService) {
+
         MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_BULKEDITOR_REFERENCINGOBJECTS_E4_REFERENCINGOBJECTSVIEWE4);
         part = partService.showPart(part, PartState.ACTIVATE);
         IReferencingObjectsView view = (IReferencingObjectsView)part.getObject();
@@ -63,5 +64,4 @@ public class OpenReferencingObjectsViewHandler {
         menuItem.setVisible(canExecute);
         return canExecute;
     }
-
-}
+}
\ No newline at end of file
index 451128c1ec43b67c2c8d4774d3507c8d86d81fbd..9b6ef91a0024b9b2b7cbeffeb6f86f09de458fd5 100644 (file)
@@ -30,6 +30,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.classification.EditTaxonNodeWizard;
 
 /**
+ * Open the taxon node wizard via e.g. navigator context menu.
+ *
  * @author k.luther
  * @date 22.03.2016
  */
@@ -39,20 +41,17 @@ public class DefaultOpenTaxonNodeWizardHandlerE4 extends DefaultOpenHandlerBaseE
     protected void open(TaxonNodeDto entity, Shell shell, EPartService partService) {
         Collection<MPart> dirtyParts = partService.getDirtyParts();
         if (!dirtyParts.isEmpty()){
-
             for (MPart dirtyPart: dirtyParts){
                 if (dirtyPart.getElementId().equals("eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4")  && ((ITaxonEditor)dirtyPart.getObject()).getTaxonNode().getUuid().equals(entity.getUuid())){
                     boolean doSave = MessageDialog
                             .openConfirm(shell, "The taxonnode is in an unsaved mode",
                                     "Do you want to save?");
-
                     if (!doSave) {
                         return ;
                     }
 
                     partService.savePart(dirtyPart, false);
                 }
-
             }
         }
         EditTaxonNodeWizard taxonNodeWizard = ContextInjectionFactory.make(EditTaxonNodeWizard.class, context);
@@ -61,7 +60,6 @@ public class DefaultOpenTaxonNodeWizardHandlerE4 extends DefaultOpenHandlerBaseE
         WizardDialog dialog = new WizardDialog(shell, taxonNodeWizard);
         int result = dialog.open();
         if (result == Window.OK){
-//            entity = CdmStore.getService(ITaxonNodeService.class).dto(entity.getUuid());
             entity = new TaxonNodeDto(taxonNodeWizard.getEntity());
             EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, taxonNodeWizard.getEntity().getParent());
             EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, entity.getTaxonUuid());
index 80c1822742f58ff246068004f6c76401c0f86431..64f136f177f10f58e993eee406942f046cfd7b90 100644 (file)
@@ -25,19 +25,11 @@ import org.eclipse.jface.viewers.StructuredSelection;
  *
  * @author p.ciardelli
  * @created 03.07.2009
- * @version 1.0
  */
 public class LineSelection extends TextSelection implements IStructuredSelection {
 
        private StructuredSelection structuredSelection;
 
-       /**
-        * <p>Constructor for LineSelection.</p>
-        *
-        * @param selection a {@link org.eclipse.jface.text.ITextSelection} object.
-        * @param document a {@link org.eclipse.jface.text.IDocument} object.
-        * @param selectedObject a {@link java.lang.Object} object.
-        */
        public LineSelection(ITextSelection selection, IDocument document, Object selectedObject) {
                super(document, selection.getOffset(), selection.getLength());
                if (selectedObject != null) {
@@ -47,66 +39,26 @@ public class LineSelection extends TextSelection implements IStructuredSelection
                }
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.IStructuredSelection#getFirstElement()
-        */
-       /**
-        * <p>getFirstElement</p>
-        *
-        * @return a {@link java.lang.Object} object.
-        */
        @Override
     public Object getFirstElement() {
                return structuredSelection.getFirstElement();
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.IStructuredSelection#iterator()
-        */
-       /**
-        * <p>iterator</p>
-        *
-        * @return a {@link java.util.Iterator} object.
-        */
        @Override
     public Iterator<?> iterator() {
                return structuredSelection.iterator();
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.IStructuredSelection#size()
-        */
-       /**
-        * <p>size</p>
-        *
-        * @return a int.
-        */
        @Override
     public int size() {
                return structuredSelection.size();
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.IStructuredSelection#toArray()
-        */
-       /**
-        * <p>toArray</p>
-        *
-        * @return an array of {@link java.lang.Object} objects.
-        */
        @Override
     public Object[] toArray() {
                return structuredSelection.toArray();
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.IStructuredSelection#toList()
-        */
-       /**
-        * <p>toList</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
        @Override
     public List<?> toList() {
                return structuredSelection.toList();