adapted to latest model changes (references)

diff --git a/taxeditor-bulkeditor/plugin.xml b/taxeditor-bulkeditor/plugin.xml
index 31d3e6b48a8f7a5f810cfc29c39702746889459a..a9c835aee84491a0145ca18ed5cb90472747eb81 100644 (file)
--- a/taxeditor-bulkeditor/plugin.xml
+++ b/taxeditor-bulkeditor/plugin.xml
@@ -31,7 +31,7 @@
    <extension\r
          point="org.eclipse.ui.menus">\r
       <menuContribution\r
-            locationURI="menu:org.eclipse.ui.main.menu">\r
+            locationURI="menu:org.eclipse.ui.main.menu?before=org.eclipse.ui.main.menu.window">\r
          <menu\r
                id="bulkeditor.menus.openmenu"\r
                label="Bulk Editor">\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
index 5033912a268e43efe82943afbcdd5a4be472169f..b085c21edb2ceac83de25c7af6d33b9a325e1c04 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
@@ -17,11 +17,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IEditorPart;\r
 \r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
-import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.EntityListener;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy;\r
 import eu.etaxonomy.taxeditor.propertysheet.name.NonViralNamePropertySource;\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorPersistenceService.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorPersistenceService.java
index 48c6bce90b54f5a74ff8b240bbe0ae68b2aa1c37..28b42525a554f93cdcf0baf9fb34d38db7077cfe 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorPersistenceService.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorPersistenceService.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.cdm.strategy.merge.MergeException;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IdentifiableEntityComparator;\r
@@ -41,7 +40,7 @@ public class BulkEditorPersistenceService implements IEntityPersistenceService {
        \r
        \r
        public ReferenceBase makeTestReference(String titleCache, int year) {\r
-               StrictReferenceBase ref = (StrictReferenceBase) creator.createEntity(titleCache);\r
+               ReferenceBase ref = (ReferenceBase) creator.createEntity(titleCache);\r
                if (year > 0)\r
                        ref.setDatePublished(TimePeriod.NewInstance(year));\r
                return ref;\r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSortMenuProvider.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSortMenuProvider.java
index 74559090d4be561f00d4e7fa0f83d127847c8e83..56d143926d0bfe040d447fa710741021549b0d87 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSortMenuProvider.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSortMenuProvider.java
@@ -20,7 +20,6 @@ import org.eclipse.ui.IEditorInput;
 \r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IdentifiableEntityComparator;\r
 import eu.etaxonomy.taxeditor.bulkeditor.input.ReferenceEditorInput;\r
 \r
@@ -72,7 +71,7 @@ public class BulkEditorSortMenuProvider implements IBulkEditorSortMenuProvider {
                 */\r
                private String getYearString(Object o) {\r
                        TimePeriod datePublished = o == null || !(o instanceof ReferenceBase) ? \r
-                                       null : ((StrictReferenceBase) o).getDatePublished(); \r
+                                       null : ((ReferenceBase) o).getDatePublished(); \r
                        return datePublished == null? null : datePublished.toString();\r
                }\r
                \r