ref #6566 Removed unused classes and properties
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 23 May 2017 16:06:03 +0000 (18:06 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 23 May 2017 16:06:03 +0000 (18:06 +0200)
eu.etaxonomy.taxeditor.editor/fragment.e4xmi
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/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/ListenToSelectionChangeContextMenu.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/ToggleLinkWithTaxonSelectionHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBaseE4.java [deleted file]

index 640b6e833e2e864d4c728b727e529a8be68bd9a1..6ebcfaa7df2cf90b4a5b1cdfd4ec5ddb9ef308a6 100644 (file)
       </menus>
     </elements>
   </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="__3UcUDSmEeek0dKsFNy--Q" featurename="children" parentElementId="bulkeditor.menus.openmenu" positionInList="last">
-    <elements xsi:type="menu:HandledMenuItem" xmi:id="_Uwm_YDSnEeek0dKsFNy--Q" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.commandlabelderivative_editor" label="%command.label.DERIVATIVE_EDITOR" command="_WPjpoDSnEeek0dKsFNy--Q">
-      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_7imM4DSoEeek0dKsFNy--Q" coreExpressionId="isCdmStoreConnected"/>
-      <parameters xmi:id="_ZMAMoDSnEeek0dKsFNy--Q" elementId="eu.etaxonomy.taxeditor.editor.openPart.parameter.specimenEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"/>
-    </elements>
-  </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="__mwtMDVpEee_b7RlBzTDRw" featurename="commands" parentElementId="xpath:/">
     <elements xsi:type="commands:Command" xmi:id="_BjF3ADVqEee_b7RlBzTDRw" elementId="eu.etaxonomy.taxeditor.editor.command.specimeneditor.create_field_unit" commandName="%command.commandname.1"/>
     <elements xsi:type="commands:Command" xmi:id="_qqMbcDmBEeeOos_QXKSXcA" elementId="eu.etaxonomy.taxeditor.editor.command.add_derivate.add_specimen" commandName="%command.commandname.2"/>
index 51c8dd2295414980137447fbdfbb49f803742621..cb2cadcd361608b516ab66900b90cae376a0ebba 100644 (file)
@@ -136,8 +136,6 @@ public class Messages extends NLS {
        public static String KeyEditor_GRAPH;
     public static String KeyEditor_LIST;
     public static String KeyEditor_SAVING;
-    public static String ListenToSelectionChangeContextMenu_LINK;
-    public static String ListenToSelectionChangeContextMenu_UNLINK;
     public static String MediaViewPart_MEDIA;
     public static String MisapplicationContainer_SEC_REF_REQUIRED;
     public static String MoveDerivateOperation_MOVE_NOT_POSSIBLE;
index 982fa7b3bd70768e71e686ae9daaa49640bebb1b..136e769aef4fd028ffeff7fda5c7bf717880ca88 100644 (file)
@@ -193,8 +193,6 @@ ChecklistEditor_TAXON=Taxon
 ChecklistEditor_UNKNOWN=unknown
 OpenRelatedConceptHandler_COULD_NOT_OPEN=Could not open taxon
 OpenRelatedConceptHandler_COULD_NOT_OPEN_MESSAGE=Could not open the taxon: %s
-ListenToSelectionChangeContextMenu_LINK=Link with taxon selection
-ListenToSelectionChangeContextMenu_UNLINK=Unlink from taxon selection
 DeleteDerivateHandler_INVALID_SELECTION=Selection is not valid for this delete handler
 DeleteDerivateHandler_LABEL=Delete of derivates
 DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS=Delete was successfull, but with exceptions
index 41328ec4fd83ffc77531b2e6602497fe291c2f6e..bdf894e5bb31770e99157d32248c241a39bada08 100644 (file)
@@ -193,8 +193,6 @@ ChecklistEditor_TAXON=Taxon
 ChecklistEditor_UNKNOWN=unbekannt
 OpenRelatedConceptHandler_COULD_NOT_OPEN=Konnte Taxon nicht öffnen
 OpenRelatedConceptHandler_COULD_NOT_OPEN_MESSAGE=Konnte Taxon nicht öffnen: %s
-ListenToSelectionChangeContextMenu_LINK=Verknüpfe mit Taxonauswahl
-ListenToSelectionChangeContextMenu_UNLINK=Verknüpfung mit Taxonauswahl aufheben
 DeleteDerivateHandler_INVALID_SELECTION=Auswahl ungültig
 DeleteDerivateHandler_LABEL=Löschen von Derivaten
 DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS=Löschen war erfolgreich, aber es gab Exceptions
index c0aa839f70793d638e8a5727d574ce0dcb46f8fe..c79c608c0d5b1a5ea78f291e2ba00f6967b4fbc0 100644 (file)
@@ -542,17 +542,15 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         return new ArrayList<SpecimenOrObservationBase<?>>(rootElements);
     }
 
-    public void toggleListenToSelectionChange() {
+    public void toggleListenToSelectionChange(MPart part) {
         listenToSelectionChange = !listenToSelectionChange;
         derivateSearchCompositeController.setEnabled(!listenToSelectionChange);
         if(!listenToSelectionChange){
             selectedTaxon = null;
-            //TODO e4
-//            setPartName(SPECIMEN_EDITOR);
+            part.setLabel(SPECIMEN_EDITOR);
         }
         else if(selectedTaxon==null){
-            //TODO e4
-//            setPartName(SPECIMEN_EDITOR+Messages.DerivateView_NO_TAXON_SELECTED);
+            part.setLabel(SPECIMEN_EDITOR+Messages.DerivateView_NO_TAXON_SELECTED);
         }
     }
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/ListenToSelectionChangeContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/ListenToSelectionChangeContextMenu.java
deleted file mode 100644 (file)
index 068f249..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu;
-
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.ImageResources;
-
-/**
- * Context menu for the SingleReads in the derivate hierarchy.
- *
- */
-public class ListenToSelectionChangeContextMenu extends CompoundContributionItem {
-
-    @Override
-    protected IContributionItem[] getContributionItems() {
-        IContributionItem[] contributionItems = new IContributionItem[] {
-                new ContributionItem() {
-                    @Override
-                    public void fill(Menu menu, int index) {
-                        final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                        IWorkbenchPart activePart = window.getActivePage().getActivePart();
-                        if(activePart instanceof DerivateView){
-                            final DerivateView derivateView = (DerivateView) activePart;
-                            MenuItem item = new MenuItem(menu, SWT.NONE);
-                            if(derivateView.isListenToSelectionChange()){
-                                item.setText(Messages.ListenToSelectionChangeContextMenu_UNLINK);
-                            }
-                            else{
-                                item.setText(Messages.ListenToSelectionChangeContextMenu_LINK);
-                            }
-                            item.setImage(ImageResources.getImage(ImageResources.SYNCED));
-                            item.addSelectionListener(new SelectionAdapterExtension(derivateView));
-                        }
-                    }
-                }
-        };
-        return contributionItems;
-    }
-
-    private final class SelectionAdapterExtension extends SelectionAdapter {
-
-        private final DerivateView derivateView;
-
-        private SelectionAdapterExtension(DerivateView derivateView) {
-            this.derivateView = derivateView;
-        }
-
-        @Override
-        public void widgetSelected(SelectionEvent e) {
-            derivateView.toggleListenToSelectionChange();
-        }
-    }
-}
-
index 8cdbcbda7f87c8c936f66ec3dd669dabdbb3335f..d3ce781f2873ca665a159cc494f4d38819f0c24a 100644 (file)
@@ -15,7 +15,7 @@ public class ToggleLinkWithTaxonSelectionHandler {
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart part){
         DerivateView derivateView = (DerivateView) part.getObject();
-        derivateView.toggleListenToSelectionChange();
+        derivateView.toggleListenToSelectionChange(part);
     }
 
     @CanExecute
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBaseE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/DefaultOpenHandlerBaseE4.java
deleted file mode 100644 (file)
index 3fb1a06..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-package eu.etaxonomy.taxeditor.handler.defaultHandler;
-
-import java.util.UUID;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
-
-public abstract class DefaultOpenHandlerBaseE4 <ENTITY, PART> {
-
-    @Execute
-    public void execute(MHandledMenuItem menuItem, EPartService partService){
-        String partId = getPartId();
-        PART part= (PART) partService.createPart(partId).getObject();
-
-        ENTITY entity = null;
-        String commandId = menuItem.getCommand().getElementId();
-        UUID uuid = (UUID) menuItem.getTransientData().get(commandId+".uuid");
-        //check if uuid parameter is set
-        if(uuid!=null){
-            entity = getEntity(uuid);
-        }
-        initPart(entity, part);
-        partService.showPart(partId, PartState.ACTIVATE);
-    }
-
-    protected abstract void initPart(ENTITY entity, PART part);
-
-    protected abstract String getPartId();
-
-    protected abstract ENTITY getEntity(UUID uuid);
-
-}