ref #6925 Rename utility getter methods
authorPatrick Plitzner <p.plitzner@bgbm.org>
Fri, 13 Oct 2017 06:57:42 +0000 (08:57 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Fri, 13 Oct 2017 06:57:42 +0000 (08:57 +0200)
16 files changed:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/OpenDistributionHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/e4/ConceptGraphViewE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractAlignmentEditorHandler.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/LoadPherogramHandler.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/ToggleInsertOverwriteHandler.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/ToggleLeftRightInsertionHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java

index 440fbcb6bdff9dddc016802d3f57d3de5bfc53dd..3fcce555dfb3ff304ad6cf943bdb6651b84e2936 100644 (file)
@@ -158,23 +158,6 @@ public class EditorUtil extends AbstractUtility {
            editor.init(input);
        }
 
-       /**
-        * <p>
-        * findEditorByTaxonNodeUuid
-        * </p>
-        *
-        * @param taxonNodeUuid
-        *            a {@link java.util.UUID} object.
-        * @return a {@link org.eclipse.ui.IEditorPart} object.
-        * @throws java.lang.Exception
-        *             if any.
-        */
-       public static IEditorPart findEditorByTaxonNodeUuid(UUID taxonNodeUuid)
-                       throws Exception {
-               IEditorInput input = TaxonEditorInput.NewInstance(taxonNodeUuid);
-               return getActivePage().findEditor(input);
-       }
-
        /**
         * An uninitialized taxon is one that hasn't been saved yet. As such, it
         * should appear in neither the list of recent names nor in the taxonomic
index bd046f63fdddac859239eed1b4f2e63300397310..09b23ac5f732bc7f7027bd79f99b6a76556c9afb 100644 (file)
@@ -23,6 +23,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.LineSelection;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
@@ -44,7 +45,7 @@ public class EditCdmAuthoritiesHandler  extends AbstractHandler {
         */
        @Override
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               BulkEditor editor = (BulkEditor) EditorUtil.getActiveE4Editor();
+               BulkEditor editor = (BulkEditor) AbstractUtility.getActiveEditor();
 
                ISelection selection = editor.getSite().getSelectionProvider().getSelection();
                if(selection instanceof LineSelection){
index 45eec0ca38bd1fd439c1bd912a28c0ad359c390c..720601e2e9ff0275c94e111d568ce20000147fc5 100644 (file)
@@ -22,8 +22,8 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
 /**
  * @author a.oppermann
@@ -36,7 +36,7 @@ public class OpenDistributionHandler extends AbstractHandler {
     public Object execute(ExecutionEvent event) throws ExecutionException {
 
         ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-        ChecklistEditor editor = (ChecklistEditor) EditorUtil.getActiveE4Editor();
+        ChecklistEditor editor = (ChecklistEditor) AbstractUtility.getActiveEditor();
 
         if (currentSelection instanceof IStructuredSelection) {
 
index 95f1d65766eaba2a9bdb47a58f051cb01be91b33..693bc477bc04747825311cb76d335e0bd00dec96 100644 (file)
@@ -59,7 +59,7 @@ public class ConceptGraphViewE4 extends AbstractCdmEditorPartE4 {
                // description selected in this view
                return;
            }
-               if(AbstractUtility.getActiveE4Editor() == null){
+               if(AbstractUtility.getActiveEditor() == null){
                        showEmptyPage();
                        return;
                }
index 20ed65f0af2daabca7f29f9d4c16f71eaee11d28..83e29c7e7470c05d51c89b2d552e333a08e2d270 100644 (file)
@@ -160,21 +160,21 @@ public class DescriptionsMenuPropertyTesterE4 extends PropertyTester {
        }
 
        private boolean isTaxonEditor() {
-           if(AbstractUtility.getActiveE4Editor() instanceof TaxonNameEditorE4){
+           if(AbstractUtility.getActiveEditor() instanceof TaxonNameEditorE4){
                return true;
            }
            return false;
        }
 
        private boolean isBulkEditor() {
-           if(AbstractUtility.getActiveE4Editor() instanceof BulkEditor){
+           if(AbstractUtility.getActiveEditor() instanceof BulkEditor){
                return true;
            }
            return false;
        }
 
        private boolean isDerivateEditor() {
-           if(AbstractUtility.getActiveE4Editor() instanceof DerivateView){
+           if(AbstractUtility.getActiveEditor() instanceof DerivateView){
                return true;
            }
            return false;
index 8dedfb8c9664528da30da9b4cc7e20d36e2c9b14..2745ddeaf3cc8e5258a1eb750648efadde87f414 100644 (file)
@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.molecular.editor.AlignmentEditor;
  */
 public abstract class AbstractAlignmentEditorHandler extends AbstractHandler {
        public static AlignmentEditor getActiveAlignmentEditor() {
-           Object activeEditor = AbstractUtility.getActiveE4Editor();
+           Object activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
             return (AlignmentEditor)activeEditor;
         }
index 2168d57ed5dac6c851f58a1fb9ed14a5e92f5687..b11cf21dcfd061e722b94dc966d9c7ad4437ed5b 100644 (file)
@@ -37,7 +37,7 @@ public class LoadPherogramHandler extends AbstractHandler {
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
-        Object activeEditor = AbstractUtility.getActiveE4Editor();
+        Object activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
             AlignmentEditor alignmentEditor = (AlignmentEditor)activeEditor;
 
index 2867fd49a5a747175f59cc6684941cc47fa73a4d..1710c3bafbf7433becb2961e7895ba4b49ed00c0 100644 (file)
@@ -49,7 +49,7 @@ public class ToggleInsertOverwriteHandler extends AbstractAlignmentEditorHandler
 
        @Override
        public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) {
-           Object activeEditor = AbstractUtility.getActiveE4Editor();
+           Object activeEditor = AbstractUtility.getActiveEditor();
                if (activeEditor instanceof AlignmentEditor) {
                        if (((AlignmentEditor)activeEditor).isInsertMode()) {
                            element.setIcon(INSERT_DESCRIPTOR);
index 5ea69c778d6a3d2b3cacf6e547eb73fbc64c6d71..27bb9597ab7abb605543f64d593cdd03b3d4252a 100644 (file)
@@ -52,7 +52,7 @@ public class ToggleLeftRightInsertionHandler extends AbstractAlignmentEditorHand
 
     @Override
     public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) {
-        Object activeEditor = AbstractUtility.getActiveE4Editor();
+        Object activeEditor = AbstractUtility.getActiveEditor();
         if (activeEditor instanceof AlignmentEditor) {
             setBaseEnabled(((AlignmentEditor)activeEditor).isInsertMode());
             if (((AlignmentEditor)activeEditor).isInsertLeftInPherogram()) {
index b4b5bd6dc602d3c6a38bc2f3538bc4d790f43318..e79eaeb929b11513895dd84a51beeff9a6a17b74 100644 (file)
@@ -8,23 +8,10 @@
  */\r
 \r
 package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
-import java.util.UUID;\r
-\r
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.IHandler;\r
-import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.MultiStatus;\r
-import org.eclipse.core.runtime.Status;\r
-import org.eclipse.ui.IWorkbenchPage;\r
-import org.eclipse.ui.PartInitException;\r
-\r
-import eu.etaxonomy.cdm.model.common.TermType;\r
-import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
-import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
-import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
-import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 \r
 /**\r
@@ -40,17 +27,17 @@ public class OpenDefinedTermEditorHandler extends AbstractHandler implements IHa
        @Override\r
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
 \r
-               String termTypeUuid = event.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid");\r
-               IWorkbenchPage activePage = StoreUtil.getActivePage();\r
-               try {\r
-                       activePage.openEditor(new TermEditorInput(TermType.getByUuid(UUID.fromString(termTypeUuid))), DefinedTermEditor.ID);\r
-               } catch (PartInitException e) {\r
-\r
-                       String PID = "eu.etaxonomy.taxeditor.application";\r
-                       MultiStatus info = new MultiStatus(PID, 1, "You might be missing sufficient permissions to open the Defined Term Editor", null);\r
-                       info.add(new Status(IStatus.WARNING, PID, 1, e.getMessage(), null));\r
-                       MessagingUtils.warningDialog("Cannot open Defined Term Editor", getClass(), info);\r
-               }\r
+//             String termTypeUuid = event.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid");\r
+//             IWorkbenchPage activePage = StoreUtil.getActivePage();\r
+//             try {\r
+//                     activePage.openEditor(new TermEditorInput(TermType.getByUuid(UUID.fromString(termTypeUuid))), DefinedTermEditor.ID);\r
+//             } catch (PartInitException e) {\r
+//\r
+//                     String PID = "eu.etaxonomy.taxeditor.application";\r
+//                     MultiStatus info = new MultiStatus(PID, 1, "You might be missing sufficient permissions to open the Defined Term Editor", null);\r
+//                     info.add(new Status(IStatus.WARNING, PID, 1, e.getMessage(), null));\r
+//                     MessagingUtils.warningDialog("Cannot open Defined Term Editor", getClass(), info);\r
+//             }\r
 \r
                return null;\r
        }\r
index d256407643de5697c6ed43924cd57962fafbf6a1..ac767716736c1314d721a6e075dbad41a2d39f0c 100644 (file)
 package eu.etaxonomy.taxeditor.io;
 
 import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.text.SimpleDateFormat;
@@ -33,35 +31,29 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
+import eu.etaxonomy.cdm.io.cdmLight.CdmLightExportConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
 import eu.etaxonomy.cdm.io.common.ExportDataWrapper;
 import eu.etaxonomy.cdm.io.common.ExportResult;
 import eu.etaxonomy.cdm.io.common.ExportResultType;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
-import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;
 import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
-import eu.etaxonomy.cdm.io.cdmLight.CdmLightExportConfigurator;
 import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;
 import eu.etaxonomy.cdm.io.service.IIOService;
+import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
-
-import eu.etaxonomy.taxeditor.operation.FeedbackGenerator;
 import eu.etaxonomy.taxeditor.operation.IFeedbackGenerator;
 import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
@@ -74,7 +66,7 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class ExportManager extends AbstractIOManager<IExportConfigurator> implements IPostMoniteredOperationEnabled {
-       
+
        private final String successMessage = "The export was successfull";
 
     private static final Logger logger = Logger.getLogger(ExportManager.class);
@@ -165,8 +157,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
 
                                        @Override
                                        public void run() {
-                                               IWorkbenchPart activePart = StoreUtil.getActivePage()
-                                                               .getActivePart();
+                                               Object activePart = EventUtility.getActivePart();
                                                if (activePart instanceof IConversationEnabled) {
                                                        // terminate any open transactions
                                                        IConversationEnabled conversationEnabled = (IConversationEnabled) activePart;
@@ -218,11 +209,11 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                                 ExportManager.this,
                                 feedBackGeneratorList,
                                 monitor);
-                       
+
                     } catch (Exception ex) {
                         return new Status(Status.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
                     }
-                       
+
                        ExportResult result = (ExportResult)remotingMonitor.getResult();
                        ExportDataWrapper data = result.getExportData();
                        try{
@@ -232,7 +223,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                                    FileOutputStream stream = new FileOutputStream(exportFile);
                                 stream.write(exportData);
                                 stream.close();
-                               } 
+                               }
                        } else if (result.getExportData().getType().equals(ExportResultType.MAP_BYTE_ARRAY)){
                             Map<String, byte[]> resultMap = (Map<String, byte[]>)data.getExportData();
                             Set<String> keySet = resultMap.keySet();
@@ -241,13 +232,13 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                             String fileEnding = ".zip";
                             if (configurator instanceof DwcaTaxExportConfigurator){
                                DwcaTaxExportConfigurator dwcaConfig = (DwcaTaxExportConfigurator)configurator;
-                            
-                               File file = new File(dwcaConfig.getDestination().toURI());                              
+
+                               File file = new File(dwcaConfig.getDestination().toURI());
                                 FileOutputStream stream = new FileOutputStream(file);
                                 ZipOutputStream zos = new ZipOutputStream(stream);
                                 for (String key: keySet){
                                        byte[] fileData = resultMap.get(key);
-                                       ZipEntry entry = new ZipEntry( key + fileEnding); 
+                                       ZipEntry entry = new ZipEntry( key + fileEnding);
                                                                        zos.putNextEntry(entry);
                                                                        zos.write(fileData);
                                                                        zos.closeEntry();
@@ -257,12 +248,12 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                                 } else{
                            logger.error("This kind of result data is not supported yet." + result.getExportData().getType().toString());
                        }
-                               
+
                        } catch(Exception e){
                            logger.error(e.getStackTrace());
                        }
 
-                       showResult(configurator.getClass().getSimpleName(), display, result, successMessage); 
+                       showResult(configurator.getClass().getSimpleName(), display, result, successMessage);
 
 
                    } catch (Exception e) {
@@ -327,7 +318,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
     public Job createIOServiceJob(CdmLightExportConfigurator configurator, String urlString) {
         Assert.isNotNull(configurator, "Configuration may not be null");
         final Display display = Display.getDefault();
-        
+
          Job job = new Job("Export: " + configurator.getClass().getSimpleName()) { //$NON-NLS-1$
              @Override
              protected IStatus run(IProgressMonitor monitor) {
@@ -356,14 +347,14 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                              SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
                              Calendar cal = Calendar.getInstance();
                              String fileEnding = ".csv";
-                             
-                             if (configurator.isCreateZipFile()){      
-                                        File file = new File(urlString+File.separator + "csv_light_" + sdf.format(cal.getTime())+ ".zip");                              
+
+                             if (configurator.isCreateZipFile()){
+                                        File file = new File(urlString+File.separator + "csv_light_" + sdf.format(cal.getTime())+ ".zip");
                                  FileOutputStream stream = new FileOutputStream(file);
                                  ZipOutputStream zos = new ZipOutputStream(stream);
                                  for (String key: keySet){
                                        byte[] fileData = resultMap.get(key);
-                                       ZipEntry entry = new ZipEntry( key + fileEnding); 
+                                       ZipEntry entry = new ZipEntry( key + fileEnding);
                                                                zos.putNextEntry(entry);
                                                                zos.write(fileData);
                                                                zos.closeEntry();
@@ -407,7 +398,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
     public void runMoniteredOperation(final IExportConfigurator configurator, String urlString) {
         IIOService ioService = CdmApplicationState.getIOService();
         final UUID uuid = ioService.monitExportData(configurator);
-        
+
         Display.getDefault().asyncExec(new Runnable() {
             @Override
             public void run() {
@@ -437,7 +428,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> implem
                        CdmStore.getContextManager().notifyContextRefresh();
                    }
                });
-               
+
        }
 
 }
index acc47c0ac1aa9216a1bb7f8dbd600cdee4973e0f..40c6aecef2eadc08c0a378c08f70c20bb902a585 100755 (executable)
@@ -622,7 +622,7 @@ public abstract class AbstractUtility {
         return "eu.taxeditor";
     }
 
-    public static Object getActiveE4Editor() {
+    public static Object getActiveEditor() {
         MPart activePart = EventUtility.getActivePart();
         if(activePart!=null && activePart.getObject()!=null
                 && activePart.getObject() instanceof IE4SavablePart){
index c7504a1d03e92de6e0fa1cbb921c78f5a4af1185..026b527bbf0720c1d9d6bcda70ffee9fe727a8ad 100644 (file)
@@ -578,9 +578,9 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
         }
            if(getParentElement() instanceof RootElement || getParentElement() == null){
 
-               Object activeEditor = AbstractUtility.getActiveE4Editor();
+               Object activeEditor = AbstractUtility.getActiveEditor();
                if(activeEditor instanceof IConversationEnabled){
-                   ConversationHolder conversation = ((IConversationEnabled) AbstractUtility.getActiveE4Editor()).getConversationHolder();
+                   ConversationHolder conversation = ((IConversationEnabled) AbstractUtility.getActiveEditor()).getConversationHolder();
                    return conversation;
                }
            }else if(getParentElement() instanceof IConversationEnabled){
index 56feee5c1ffd250fb98016e4365b96dec5997c62..92a0403a85cfcb9761b6f0ee66b1a040712edb17 100644 (file)
@@ -42,7 +42,7 @@ public class DataImportEditorContextMenu extends CompoundContributionItem {
                     @Override
                     public void fill(Menu menu, int index) {
                         final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                        final Object activeEditor = AbstractUtility.getActiveE4Editor();
+                        final Object activeEditor = AbstractUtility.getActiveEditor();
                         final ISelection selection = window.getActivePage().getSelection();
                         if(selection instanceof StructuredSelection){
                             final StructuredSelection structuredSelection = (StructuredSelection)selection;
index 93207e49cc559a1fca1af47e448be7970152efc7..6390e8f56e6b75633592403c33c448d162ed73c6 100644 (file)
@@ -76,7 +76,7 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
            if(wrappedPart!=null){
                partObject = wrappedPart;
            }
-           if(AbstractUtility.getActiveE4Editor() == null && !(AbstractUtility.getActivePart() instanceof IConversationEnabled)){
+           if(AbstractUtility.getActiveEditor() == null && !(AbstractUtility.getActivePart() instanceof IConversationEnabled)){
             showEmptyPage();
             return;
         }
index 41174858f9fdf3c9b1970b277e53033fb0c2697e..6295eefb5799a79672ece59dcb1b1999c6283c0c 100644 (file)
@@ -67,7 +67,7 @@ public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
         if(wrappedPart!=null){
             partObject = wrappedPart;
         }
-               if(AbstractUtility.getActiveE4Editor() == null){
+               if(AbstractUtility.getActiveEditor() == null){
                        showEmptyPage();
                        return;
                }