.

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 604f3873efcf5eb67c93bc15bf112e6ffe29ea1f..2fd835a87e16f4bc5bd49cd806159eea85ff5ae9 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0
 Bundle-Activator: eu.etaxonomy.taxeditor.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
 Bundle-Activator: eu.etaxonomy.taxeditor.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

- org.eclipse.ui.forms,
- eu.etaxonomy.cdmLibrary
+ org.eclipse.ui.forms

 Eclipse-LazyStart: true
 Export-Package: eu.etaxonomy.taxeditor
 Eclipse-LazyStart: true
 Export-Package: eu.etaxonomy.taxeditor

diff --git a/plugin.xml b/plugin.xml
index 3a9a4fd96c6fddd018ee52225c0b2f6cc36a619d..9ecdcd231a2419bec7265c7fffc3b618511ea945 100644 (file)
--- a/plugin.xml
+++ b/plugin.xml
@@ -148,7 +148,7 @@
          </property>\r
          <property\r
                name="startupProgressRect"\r
          </property>\r
          <property\r
                name="startupProgressRect"\r

-               value="5,5,45,10">\r
+               value="5,5,366,10">\r

          </property>\r
       </product>\r
    </extension>\r
          </property>\r
       </product>\r
    </extension>\r

diff --git a/src/eu/etaxonomy/taxeditor/NavigationView.java b/src/eu/etaxonomy/taxeditor/NavigationView.java
index e4169c00e410d60f81993b13f67875e9c4fb84f6..2cd4843a4b146fd649326609e44ef07fa34056ed 100644 (file)
--- a/src/eu/etaxonomy/taxeditor/NavigationView.java
+++ b/src/eu/etaxonomy/taxeditor/NavigationView.java
@@ -113,17 +113,15 @@ public class NavigationView extends ViewPart {
      * code, you will connect to a real model and expose its hierarchy.
      */
     private TreeObject createDummyModel() {
      * code, you will connect to a real model and expose its hierarchy.
      */
     private TreeObject createDummyModel() {

-        TreeObject to1 = new TreeObject("Inbox");
-        TreeObject to2 = new TreeObject("Drafts");
-        TreeObject to3 = new TreeObject("Sent");
-        TreeParent p1 = new TreeParent("me@this.com");
+        TreeObject to1 = new TreeObject("Pilosella piloselloides (Vill.) Soják");
+        TreeObject to2 = new TreeObject("Pilosella pavichii (Heuff.) Arv.-Touv.");
+        TreeObject to3 = new TreeObject("Pilosella vahlii (Froel.) F. W. Schultz & Sch. Bip.");
+        TreeParent p1 = new TreeParent("Pilosella treatment");

         p1.addChild(to1);
         p1.addChild(to2);
         p1.addChild(to3);
 
         p1.addChild(to1);
         p1.addChild(to2);
         p1.addChild(to3);
 

-        TreeObject to4 = new TreeObject("Inbox");
-        TreeParent p2 = new TreeParent("other@aol.com");
-        p2.addChild(to4);
+        TreeParent p2 = new TreeParent("Some other treatment");

 
         TreeParent root = new TreeParent("");
         root.addChild(p1);
 
         TreeParent root = new TreeParent("");
         root.addChild(p1);

diff --git a/src/eu/etaxonomy/taxeditor/Perspective.java b/src/eu/etaxonomy/taxeditor/Perspective.java
index faf9e62f9e8a2745ccc8a50d1f6af774c2f064d1..da8d4bd04403ee27f54f5dc36eed6cc2e3e8a723 100644 (file)
--- a/src/eu/etaxonomy/taxeditor/Perspective.java
+++ b/src/eu/etaxonomy/taxeditor/Perspective.java
@@ -11,8 +11,8 @@ public class Perspective implements IPerspectiveFactory {
                //layout.setEditorAreaVisible(false);
                layout.setEditorAreaVisible(true);
                
                //layout.setEditorAreaVisible(false);
                layout.setEditorAreaVisible(true);
                

-               /*layout.addStandaloneView(NavigationView.ID,  false, IPageLayout.LEFT, 0.25f, editorArea);
-               IFolderLayout folder = layout.createFolder("messages", IPageLayout.TOP, 0.5f, editorArea);
+               layout.addStandaloneView(NavigationView.ID,  false, IPageLayout.LEFT, 0.25f, editorArea);
+               /*IFolderLayout folder = layout.createFolder("messages", IPageLayout.TOP, 0.5f, editorArea);

                folder.addPlaceholder(View.ID + ":*");
                folder.addView(View.ID);
                folder.addPlaceholder(FormView.ID + ":*");
                folder.addPlaceholder(View.ID + ":*");
                folder.addView(View.ID);
                folder.addPlaceholder(FormView.ID + ":*");


@@ -20,7 +20,7 @@ public class Perspective implements IPerspectiveFactory {
                
                //layout.addStandaloneView(View.ID, false, IPageLayout.RIGHT, 0.75f, editorArea);
 
                
                //layout.addStandaloneView(View.ID, false, IPageLayout.RIGHT, 0.75f, editorArea);
 

-               //layout.getViewLayout(NavigationView.ID).setCloseable(false);
+               layout.getViewLayout(NavigationView.ID).setCloseable(false);

                                
                layout.addActionSet("eu.etaxonomy.taxeditor.actionSet");
        }
                                
                layout.addActionSet("eu.etaxonomy.taxeditor.actionSet");
        }

diff --git a/src/eu/etaxonomy/taxeditor/SimpleModel.java b/src/eu/etaxonomy/taxeditor/SimpleModel.java
index 7ae06792e5a724bd3c8d966f6d5adfb8dd98870b..c388ad7ba6dfbfc1295cc54ca5c49bcbd58cfde7 100644 (file)
--- a/src/eu/etaxonomy/taxeditor/SimpleModel.java
+++ b/src/eu/etaxonomy/taxeditor/SimpleModel.java
@@ -3,9 +3,9 @@ package eu.etaxonomy.taxeditor;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r

-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.cdm.api.service.*;\r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
+//import eu.etaxonomy.cdm.api.service.*;\r
+//import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r

 \r
 \r
 public class SimpleModel {\r
 \r
 \r
 public class SimpleModel {\r


@@ -34,19 +34,19 @@ public class SimpleModel {
        private void initialize() {\r
                try {\r
                        //TODO Andreas\r
        private void initialize() {\r
                try {\r
                        //TODO Andreas\r

-                       List<TaxonName> tnList = new ArrayList<TaxonName>();\r
-                       TaxonName tn = new TaxonName();\r
-                       CdmApplicationController app = new CdmApplicationController();\r
-                       NameService ns = app.getNameService();\r
-                       tnList.add(ns.getTaxonNameById(1));\r
-                       tnList.add(ns.getTaxonNameById(4));\r
-                       tnList.add(ns.getTaxonNameById(28));\r
+//                     List<TaxonName> tnList = new ArrayList<TaxonName>();\r
+//                     TaxonName tn = new TaxonName();\r
+//                     CdmApplicationController app = new CdmApplicationController();\r
+//                     NameService ns = app.getNameService();\r
+//                     tnList.add(ns.getTaxonNameById(1));\r
+//                     tnList.add(ns.getTaxonNameById(4));\r
+//                     tnList.add(ns.getTaxonNameById(28));\r

 \r
                        objects = new ArrayList();\r
                        NamedObject[] objects = {\r
 \r
                        objects = new ArrayList();\r
                        NamedObject[] objects = {\r

-                                       new Name(tnList.get(0).getName(), tnList.get(0).getGenus(),tnList.get(0).getInfraSpecificEpithet()),\r
-                                       new Name(tnList.get(1).getName(), tnList.get(1).getGenus(),tnList.get(1).getInfraSpecificEpithet()),\r
-                                       new Name(tnList.get(2).getName(), tnList.get(2).getGenus(),tnList.get(2).getInfraSpecificEpithet()),\r
+//                                     new Name(tnList.get(0).getName(), tnList.get(0).getGenus(),tnList.get(0).getInfraSpecificEpithet()),\r
+//                                     new Name(tnList.get(1).getName(), tnList.get(1).getGenus(),tnList.get(1).getInfraSpecificEpithet()),\r
+//                                     new Name(tnList.get(2).getName(), tnList.get(2).getGenus(),tnList.get(2).getInfraSpecificEpithet()),\r

                                        \r
                                        new Name("Pilosella piloselloides (Vill.) Soják", "Pilosella", "piloselloides"),\r
                                        new Name("Pilosella pavichii (Heuff.) Arv.-Touv.", "Pilosella", "pavichii"), \r
                                        \r
                                        new Name("Pilosella piloselloides (Vill.) Soják", "Pilosella", "piloselloides"),\r
                                        new Name("Pilosella pavichii (Heuff.) Arv.-Touv.", "Pilosella", "pavichii"), \r

diff --git a/taxeditor.product b/taxeditor.product
index 6e8a254450a97a944386fc44f5a5a1ba460b6f5a..b0ea134060b2e8f472db2f834f5b09bd280b79cb 100644 (file)
--- a/taxeditor.product
+++ b/taxeditor.product
@@ -23,10 +23,10 @@ Thanks to our worldwide fan community.
 \r
    <splash\r
       location="eu.etaxonomy.taxeditor"\r
 \r
    <splash\r
       location="eu.etaxonomy.taxeditor"\r

-      startupProgressRect="5,5,45,10"\r
+      startupProgressRect="5,5,366,10"\r

       startupMessageRect="7,252,445,20"\r
       startupForegroundColor="FFFFFF" />\r
       startupMessageRect="7,252,445,20"\r
       startupForegroundColor="FFFFFF" />\r

-   <launcher name="taxeditor">\r
+   <launcher name="EDIT Taxonomic Editor">\r

       <solaris/>\r
       <win useIco="true">\r
          <ico path="/eu.etaxonomy.taxeditor/icons/edit_16x16.ico"/>\r
       <solaris/>\r
       <win useIco="true">\r
          <ico path="/eu.etaxonomy.taxeditor/icons/edit_16x16.ico"/>\r


@@ -35,12 +35,12 @@ Thanks to our worldwide fan community.
       </win>\r
    </launcher>\r
 \r
       </win>\r
    </launcher>\r
 \r

+\r

    <vm>\r
    </vm>\r
 \r
    <plugins>\r
       <plugin id="com.ibm.icu"/>\r
    <vm>\r
    </vm>\r
 \r
    <plugins>\r
       <plugin id="com.ibm.icu"/>\r

-      <plugin id="eu.etaxonomy.cdmLibrary"/>\r

       <plugin id="eu.etaxonomy.taxeditor"/>\r
       <plugin id="javax.servlet"/>\r
       <plugin id="org.eclipse.core.commands"/>\r
       <plugin id="eu.etaxonomy.taxeditor"/>\r
       <plugin id="javax.servlet"/>\r
       <plugin id="org.eclipse.core.commands"/>\r