Adapt to cdmlib renaming

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
index 774e2f6b74c21a5d359e2359b9d801dbe534e767..f6a29cf5db9e0c5e8e6b42a0f26d64133df07b7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.progress.IProgressConstants;
 
-import eu.etaxonomy.cdm.io.descriptive.owl.out.OwlExportConfigurator;
+import eu.etaxonomy.cdm.io.descriptive.owl.out.StructureTreeOwlExportConfigurator;
 import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
@@ -54,7 +54,7 @@ public class FeatureTreeExportOntologyHandler {
         String directoryString = dialog.open();
         if(directoryString!=null){
             // create job
-            Job job = CdmStore.getExportManager().createIOServiceJob(OwlExportConfigurator.NewInstance(null, null, selectedFeatureTree), new File(directoryString+"/"+selectedFeatureTree.getTitleCache()+".owl"));
+            Job job = CdmStore.getExportManager().createIOServiceJob(StructureTreeOwlExportConfigurator.NewInstance(null, null, selectedFeatureTree), new File(directoryString+"/"+selectedFeatureTree.getTitleCache()+".owl"));
             // configure the job
             job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
             job.setUser(true);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 6ce4ef3eab55b25fd102158c70184c621526139a..b4249cc301e8e5851a41d9d2cd1611841a030177 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -34,7 +34,7 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.common.ImportResult;
-import eu.etaxonomy.cdm.io.descriptive.owl.in.OwlImportConfigurator;
+import eu.etaxonomy.cdm.io.descriptive.owl.in.StructureTreeOwlImportConfigurator;
 import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
 import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
 import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
@@ -316,7 +316,7 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
                case Excel_Distribution:
             return ExcelDistributionUpdateConfigurator.NewInstance(null, null, null);
         case OWL:
-            return OwlImportConfigurator.NewInstance(null);
+            return StructureTreeOwlImportConfigurator.NewInstance(null);
 
                default:
                        MessagingUtils.notImplementedMessage(this);
@@ -407,8 +407,8 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
                return (DwcaImportConfigurator) getConfigurator(TYPE.Gbif);
        }
 
-       public final OwlImportConfigurator OwlImportConfigurator() {
-           return (OwlImportConfigurator) getConfigurator(TYPE.OWL);
+       public final StructureTreeOwlImportConfigurator OwlImportConfigurator() {
+           return (StructureTreeOwlImportConfigurator) getConfigurator(TYPE.OWL);
        }
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportConfiguratorWizardPage.java
index fc1ee08e1dc30ec9d53f757c5cb19546397f29b4..4bfc8c68c64e9c2cbb8527ff172c7100db051128 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportConfiguratorWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportConfiguratorWizardPage.java
@@ -16,7 +16,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
-import eu.etaxonomy.cdm.io.descriptive.owl.in.OwlImportConfigurator;
+import eu.etaxonomy.cdm.io.descriptive.owl.in.StructureTreeOwlImportConfigurator;
 
 /**
  *
@@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.io.descriptive.owl.in.OwlImportConfigurator;
  */
 public class OwlImportConfiguratorWizardPage extends WizardPage {
 
-       public static final String PAGE_NAME = "OwlImportConfiguratorWizardPage";
+       public static final String PAGE_NAME = "StructureTreeOwlImportConfiguratorWizardPage";
 
-       private OwlImportConfigurator configurator;
+       private StructureTreeOwlImportConfigurator configurator;
 
        @Inject
        public OwlImportConfiguratorWizardPage() {
@@ -50,7 +50,7 @@ public class OwlImportConfiguratorWizardPage extends WizardPage {
            return configurator.toString();
         }
 
-    public void setConfigurator(OwlImportConfigurator configurator) {
+    public void setConfigurator(StructureTreeOwlImportConfigurator configurator) {
         this.configurator = configurator;
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportWizard.java
index b8e8c5e2d166025868b0207b16cf1b50c9b2aa68..c2dd954dc39a955b7beef97d896ddb016c5ce912 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportWizard.java
@@ -21,7 +21,7 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
 
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
-import eu.etaxonomy.cdm.io.descriptive.owl.in.OwlImportConfigurator;
+import eu.etaxonomy.cdm.io.descriptive.owl.in.StructureTreeOwlImportConfigurator;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
 import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -32,9 +32,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @since Apr 25, 2019
  *
  */
-public class OwlImportWizard extends AbstractImportWizardE4<OwlImportConfigurator> {
+public class OwlImportWizard extends AbstractImportWizardE4<StructureTreeOwlImportConfigurator> {
 
-       private OwlImportConfigurator configurator;
+       private StructureTreeOwlImportConfigurator configurator;
        private ImportFromFileDataSourceWizardPage dataSourcePage;
 
        @Inject
@@ -43,7 +43,7 @@ public class OwlImportWizard extends AbstractImportWizardE4<OwlImportConfigurato
        }
 
        @Override
-       public OwlImportConfigurator getConfigurator() {
+       public StructureTreeOwlImportConfigurator getConfigurator() {
                return configurator;
        }