Add descriptive data views/editors to perspectives

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
index 42e48b8cb09769eae8cf9b5cc40435bc67848120..ad13318d600d03790ab36dc61779ab9610834421 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
@@ -12,6 +12,8 @@ package eu.etaxonomy.taxeditor.perspective;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 
+import eu.etaxonomy.taxeditor.editor.AppModelId;
+
 /**
  * @author a.oppermann
  * @created Nov 18, 2014
@@ -33,6 +35,7 @@ public class ChecklistPerspective extends Default {
 
                navigationFolder.addView(NAVIGATOR);
                navigationFolder.addPlaceholder(SEARCH_RESULTS);
+        navigationFolder.addPlaceholder(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETNAVIGATOR);
 
                IFolderLayout folder = layout.createFolder("Folder", IPageLayout.BOTTOM, 0.6f, layout.getEditorArea());
                folder.addView(FACTUAL_DATA_VIEW);

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java
index 37bb8e5cb6de37f9838a8701751508a79c84adee..b39651a9cfed0f3a28637a3e5cd3e2dbb9163558 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java
@@ -8,8 +8,12 @@
  */
 package eu.etaxonomy.taxeditor.perspective;
 
+import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 
+import eu.etaxonomy.taxeditor.editor.AppModelId;
+import eu.etaxonomy.taxeditor.navigation.search.SearchBar;
+
 /**
  * @author pplitzner
  * @date 10.12.2013
@@ -19,7 +23,12 @@ public class DerivatePerspective extends Default {
 
     @Override
     public void createInitialLayout(IPageLayout layout) {
-        layout.addView(NAVIGATOR, IPageLayout.LEFT, 0.25f, layout.getEditorArea());
+        IFolderLayout navigationFolder = layout.createFolder(SearchBar.NAVIGATION_STACK_ID, IPageLayout.LEFT, 0.25f, layout.getEditorArea());
+
+        navigationFolder.addView(NAVIGATOR);
+        navigationFolder.addPlaceholder(SEARCH_RESULTS);
+        navigationFolder.addPlaceholder(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETNAVIGATOR);
+
 
         layout.addView(DETAILS_VIEW, IPageLayout.RIGHT, 0.6f, layout.getEditorArea());
 

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DescriptiveDataSetPerspective.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DescriptiveDataSetPerspective.java
index fc6eac9453c594347481aad392e2c4db76901c5d..53fcc1a9e4cf6e2600bcdf0d266f1dcf05f89379 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DescriptiveDataSetPerspective.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DescriptiveDataSetPerspective.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.perspective;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 
+import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.navigation.search.SearchBar;
 
 /**
@@ -26,10 +27,10 @@ public class DescriptiveDataSetPerspective extends Default {
 
                navigationFolder.addView(NAVIGATOR);
                navigationFolder.addPlaceholder(SEARCH_RESULTS);
-               layout.addView("eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator", IPageLayout.TOP, 0.5f, SearchBar.NAVIGATION_STACK_ID);
+               layout.addView(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETNAVIGATOR, IPageLayout.TOP, 0.5f, SearchBar.NAVIGATION_STACK_ID);
 
-               layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.view.descriptiveDataSet.DescriptiveDataSetEditor", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
-               layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
+               layout.addPlaceholder(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETEDITOR, IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
+               layout.addPlaceholder(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_MATRIX_CHARACTERMATRIXPART, IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
 
                layout.addView(DETAILS_VIEW, IPageLayout.RIGHT, 0.7f, layout.getEditorArea());
 

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
index aef70602458132e7c5a40823ea45657a0638a5b7..80fdff98f95413d13cde8c944f3acf3725378608 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.perspective;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 
+import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.navigation.search.SearchBar;
 
 /**
@@ -27,6 +28,7 @@ public class Taxonomic extends Default {
 
                navigationFolder.addView(NAVIGATOR);
                navigationFolder.addPlaceholder(SEARCH_RESULTS);
+               navigationFolder.addPlaceholder(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETNAVIGATOR);
 
                layout.addPlaceholder(NAME_EDITOR, IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());