(no commit message)

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index 68701f000a8edeae1d8eca4971c308dc1316664d..9d02173cbee47aeee0b3d8f500d7f12bca78451e 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -31,7 +31,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;

-import org.eclipse.ui.navigator.CommonNavigator;

 import org.eclipse.ui.navigator.CommonViewer;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import org.eclipse.ui.navigator.CommonViewer;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;


@@ -39,9 +38,9 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;

+import eu.etaxonomy.taxeditor.model.AbstractUtility;

 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;

-import eu.etaxonomy.taxeditor.store.model.AbstractUtility;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/DeleteTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/DeleteTaxonHandler.java
index ecf668b5e001dd0b1e5c69469b0a22103b08a56d..87dd6744ab9afd40a76e8dea066036b315e65074 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/DeleteTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/DeleteTaxonHandler.java
@@ -20,7 +20,7 @@ import org.eclipse.core.commands.operations.IUndoableOperation;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;

-import eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation;
+import eu.etaxonomy.taxeditor.operations.DeleteTaxonOperation;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/MoveTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/MoveTaxonHandler.java
index 8ed8801e1e930ca4ab1487a59c8807e9898863f8..a4d26df9a2c540895dac03b9f09dac5c9f24668a 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/MoveTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/MoveTaxonHandler.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.name.TaxonSearchDialog;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.name.TaxonSearchDialog;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;

-import eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation;
+import eu.etaxonomy.taxeditor.operations.MoveTaxonOperation;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java
index f56dec68037aa4615996f6487a5bdec30742d1e1..b4404a47d044c3363a7bddf4ba20b690db6edd65 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java
@@ -26,10 +26,10 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;

+import eu.etaxonomy.taxeditor.operations.CreateChildTaxonOperation;
+import eu.etaxonomy.taxeditor.operations.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.parser.CdmParserUtil;

 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;

-import eu.etaxonomy.taxeditor.store.operations.CreateChildTaxonOperation;
-import eu.etaxonomy.taxeditor.store.operations.IPostOperationEnabled;
-import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonDropAdapterAssistant.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonDropAdapterAssistant.java
index 598749c326a93fd9823439f6e317d59898c3357b..78e66b535462917a6ed1de61938cbab29f9c3f89 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonDropAdapterAssistant.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonDropAdapterAssistant.java
@@ -25,10 +25,10 @@ import org.eclipse.ui.navigator.CommonDropAdapter;
 import org.eclipse.ui.navigator.CommonDropAdapterAssistant;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import org.eclipse.ui.navigator.CommonDropAdapterAssistant;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r

+import eu.etaxonomy.taxeditor.model.NameUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r

 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r

-import eu.etaxonomy.taxeditor.store.model.NameUtil;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
-import eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation;\r
+import eu.etaxonomy.taxeditor.operations.MoveTaxonOperation;\r

 \r
 /**\r
  * @author p.ciardelli\r
 \r
 /**\r
  * @author p.ciardelli\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index e619ce4754f515cd9b047f46a251077477225ab2..e04500b5cf235a308e07183748d1e4f1617db3d6 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -30,9 +30,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r

+import eu.etaxonomy.taxeditor.model.DataChangeBridge;\r
+import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;\r

 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r

-import eu.etaxonomy.taxeditor.store.model.DataChangeBridge;\r
-import eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior;\r

 \r
 /** \r
  * Taxonomic tree implementation using Common Navigator Framework.\r
 \r
 /** \r
  * Taxonomic tree implementation using Common Navigator Framework.\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
index 93e34aa6d9338308200de241b59bfdf58687a1d6..5a0fa027e4888e63a2867de706249e575538a818 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
@@ -13,8 +13,8 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
 
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;

-import eu.etaxonomy.taxeditor.store.model.AbstractDataChangeBehaviour;
-import eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior;
+import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
+import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index 95a1c386f23cda5f6b0bc64884559ca5cf754ba7..391ec61585c417ce4c0705a2297632f42d61c181 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@ -29,8 +29,8 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.menus.WorkbenchWindowControlContribution;
 
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.menus.WorkbenchWindowControlContribution;
 

+import eu.etaxonomy.taxeditor.model.Resources;

 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;
 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;

-import eu.etaxonomy.taxeditor.store.model.Resources;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java
index 6107c5a5e80fd4d847d72d2edf990170a1407418..105dd04f291433897bbf3aa365891138fe301656 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java
@@ -19,8 +19,8 @@ import org.eclipse.swt.graphics.Image;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;

+import eu.etaxonomy.taxeditor.model.ImageResources;

 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;

-import eu.etaxonomy.taxeditor.store.model.ImageResources;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java
index 4a8cd4158f8eb1e624032aa189e672074b328b2f..a55ed0e826c5341da6737f22bbeb07c75e746c55 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java
@@ -12,7 +12,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.editor.name.IterableSynonymyList;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.editor.name.IterableSynonymyList;

-import eu.etaxonomy.taxeditor.store.model.NameUtil;
+import eu.etaxonomy.taxeditor.model.NameUtil;

 
 /**
  * 
 
 /**
  * 

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java
index 6ea6e47eee2f676a3868740719e744efb8438ecb..c14ee24f91277cb3b339855a23fc2e55686901d2 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java
@@ -45,15 +45,15 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r

+import eu.etaxonomy.taxeditor.model.DataChangeBridge;\r
+import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;\r
+import eu.etaxonomy.taxeditor.model.NameUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonTransfer;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r

 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r

+import eu.etaxonomy.taxeditor.operations.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.operations.MoveTaxonOperation;\r

 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r

-import eu.etaxonomy.taxeditor.store.model.DataChangeBridge;\r
-import eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior;\r
-import eu.etaxonomy.taxeditor.store.model.NameUtil;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
-import eu.etaxonomy.taxeditor.store.operations.IPostOperationEnabled;\r
-import eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation;\r

 \r
 /**\r
  * The panel containing the taxonomic tree.\r
 \r
 /**\r
  * The panel containing the taxonomic tree.\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java
index 0b30730c1dc9bde253ca5c72583ee6e266b9f1a1..92fc862985c354ef73df15a6ecb1c1eba442cc3d 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeViewDataChangeBehaviour.java
@@ -13,8 +13,8 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
 
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;

-import eu.etaxonomy.taxeditor.store.model.AbstractDataChangeBehaviour;
-import eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior;
+import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
+import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann