editor now updatable via updateSite

diff --git a/.gitattributes b/.gitattributes
index 980e02a6e19e5156928f80e8758f8de9352f5a4b..6e47f01fd32135c0dd71b39f48541da64846ad57 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -650,8 +650,6 @@ taxeditor-editor/pom.xml -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java -text

-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java -text

 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java -text


@@ -662,17 +660,13 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/IHasPropertySource.
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java -text

-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java -text

 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java -text

-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java -text

 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java -text

-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java -text

 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WarningAnnotation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WarningAnnotation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java -text


@@ -804,7 +798,6 @@ taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBa
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchWindowAdvisor.java -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchWindowAdvisor.java -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java -text

-taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java -text

 taxeditor-feature-dependencies/.project -text
 taxeditor-feature-dependencies/build.properties -text
 taxeditor-feature-dependencies/feature.xml -text
 taxeditor-feature-dependencies/.project -text
 taxeditor-feature-dependencies/build.properties -text
 taxeditor-feature-dependencies/feature.xml -text


@@ -841,7 +834,6 @@ taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Perspective
 taxeditor-navigation/src/test/java/log4j.properties -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text
 taxeditor-navigation/src/test/java/log4j.properties -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text

-taxeditor-navigation/src/test/resources/log4j.properties -text

 taxeditor-store/.settings/org.eclipse.jdt.core.prefs -text
 taxeditor-store/META-INF/MANIFEST.MF -text
 taxeditor-store/build.properties -text
 taxeditor-store/.settings/org.eclipse.jdt.core.prefs -text
 taxeditor-store/META-INF/MANIFEST.MF -text
 taxeditor-store/build.properties -text


@@ -966,8 +958,6 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomo
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java -text

-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java -text

 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java -text


@@ -1007,8 +997,6 @@ taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomo
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java -text

-taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java -text
-taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java -text

 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java -text

diff --git a/taxeditor-application/.settings/org.eclipse.jdt.core.prefs b/taxeditor-application/.settings/org.eclipse.jdt.core.prefs
index c664dbc3b933326960a985b56a7d9ed0371281f9..4a5ab4c8cd9a2a9ff076f605b9bb3dd1bc90444b 100644 (file)
--- a/taxeditor-application/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-application/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
-#Tue Jun 02 13:01:38 CEST 2009
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+#Tue Jun 02 17:10:51 CEST 2009

 eclipse.preferences.version=1
 eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index 3b6b4a2717cb30438597592e3d5a8044f555bf54..d1ed6646974219c50d965e624964835f7296e41a 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true

-Bundle-Version: 1.1.0
+Bundle-Version: 2.0.0.v200906021612

 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmLibrary;bundle-version="2.0.0",eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",eu.etaxonomy.taxeditor.editor;bundle-version="1.0.0",eu.etaxonomy.taxeditor.navigation;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmLibrary;bundle-version="2.0.0",eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",eu.etaxonomy.taxeditor.editor;bundle-version="1.0.0",eu.etaxonomy.taxeditor.navigation;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product
index c7addffe54af79a6b3cd58df2e473868aa8e9156..66df514fcf3a4b835a5ff66d038eb65ba24f2892 100644 (file)
--- a/taxeditor-application/TaxEditor.product
+++ b/taxeditor-application/TaxEditor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.4"?>
 
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.4"?>
 

-<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="1.1.0" useFeatures="true">
+<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.0" useFeatures="true">

 
    <aboutInfo>
       <text>
 
    <aboutInfo>
       <text>


@@ -29,7 +29,6 @@
       </win>
    </launcher>
 
       </win>
    </launcher>
 

-

    <vm>
    </vm>
 
    <vm>
    </vm>
 


@@ -82,8 +81,7 @@
    </plugins>
 
    <features>
    </plugins>
 
    <features>

-      <feature id="eu.etaxonomy.taxeditor" version="1.1.0"/>
-      <feature id="org.eclipse.equinox.p2.user.ui" version="1.0.2.r34x_v20090120-7d-7tEQcCaaYSBeNOClOn02267"/>
+      <feature id="eu.etaxonomy.taxeditor" version="2.0.0.v200906021611"/>

    </features>
 
 </product>
    </features>
 
 </product>

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
index dc82904c1e49e88af73013e8e921585bc3493356..d825581a873c8ac372bd4cd48fc6853ba1a7df9c 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
@@ -2,7 +2,6 @@ package eu.etaxonomy.taxeditor;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.ui.IWorkbenchWindow;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;

 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 


@@ -16,12 +15,6 @@ import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 

-       // Actions - important to allocate these only in makeActions, and then use
-       // them
-       // in the fill methods. This ensures that the actions aren't recreated
-       // when fillActionBars is called with FILL_PROXY.
-       private IWorkbenchAction exitAction;
-

        public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
                super(configurer);
        }
        public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
                super(configurer);
        }

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
index e6b110225108aa69496f5724b0291fa664090af0..3049bfb12c08bf66b8d409659148d895ce717c88 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
@@ -9,22 +9,34 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = Perspective.ID;
 
 
        private static final String PERSPECTIVE_ID = Perspective.ID;
 

+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.application.WorkbenchAdvisor#createWorkbenchWindowAdvisor(org.eclipse.ui.application.IWorkbenchWindowConfigurer)
+        */

        public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
                        IWorkbenchWindowConfigurer configurer) {
                return new ApplicationWorkbenchWindowAdvisor(configurer);
        }
 
        public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
                        IWorkbenchWindowConfigurer configurer) {
                return new ApplicationWorkbenchWindowAdvisor(configurer);
        }
 

+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId()
+        */

        public String getInitialWindowPerspectiveId() {
                return PERSPECTIVE_ID;
        }
        
        public String getInitialWindowPerspectiveId() {
                return PERSPECTIVE_ID;
        }
        

+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.application.WorkbenchAdvisor#initialize(org.eclipse.ui.application.IWorkbenchConfigurer)
+        */

        public void initialize(IWorkbenchConfigurer configurer) {
                super.initialize(configurer);
                                
                // Remembers the user's view layout, window size, window location etc.
                //  for the next time application is started
                configurer.setSaveAndRestore(true);             
        public void initialize(IWorkbenchConfigurer configurer) {
                super.initialize(configurer);
                                
                // Remembers the user's view layout, window size, window location etc.
                //  for the next time application is started
                configurer.setSaveAndRestore(true);             

-       }
+       }       

        
 
 //     public void initialize(IWorkbenchConfigurer configurer) {
        
 
 //     public void initialize(IWorkbenchConfigurer configurer) {

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
index 5bcf6fc0f1dc7e66246bb6dfb36301feb2cf5223..5541ffcfc8c76195275e0a4baf8b24dee6435c4b 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
@@ -5,24 +5,17 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IWorkbenchPartReference;

 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 

-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;

 import eu.etaxonomy.taxeditor.store.preference.InitNomenclaturalCodePrefDialog;
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        private static final Logger logger = Logger.getLogger(ApplicationWorkbenchWindowAdvisor.class);
 
 import eu.etaxonomy.taxeditor.store.preference.InitNomenclaturalCodePrefDialog;
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        private static final Logger logger = Logger.getLogger(ApplicationWorkbenchWindowAdvisor.class);
 

-       private IPartListener2 propertySheetListener;
-

        public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
                super(configurer);
        }
        public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
                super(configurer);
        }


@@ -43,61 +36,21 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
        
        public void postWindowOpen() {
                checkNomenclaturalCode();
        
        public void postWindowOpen() {
                checkNomenclaturalCode();

-               
-//             setPropertySheetListener();

        }
        }

-       
-//     /**
-//      * 
-//      */
-//     private void setPropertySheetListener() {
-//             propertySheetListener = new IPartListener2() {
-//
-//                     public void partActivated(IWorkbenchPartReference partRef) {
-//                             if (partRef.getId().equals(MultiPageTaxonEditor.ID)) {
-//                                     EditorUtil.showPropertySheet();
-//                             }
-//                     }
-//
-//                     public void partOpened(IWorkbenchPartReference partRef) {
-////                           if (partRef.getId().equals(MultiPageTaxonEditor.ID)) {
-////                                   EditorUtil.showPropertySheet();
-////                           }
-//                     }
-//
-//                     public void partClosed(IWorkbenchPartReference partRef) {
-////                           if (partRef.getId().equals(MultiPageTaxonEditor.ID)) {
-////                                   EditorUtil.checkHidePropertySheet();
-////                           }
-//                     }
-//                     
-//                     public void partBroughtToTop(IWorkbenchPartReference partRef) {}
-//
-//                     public void partDeactivated(IWorkbenchPartReference partRef) {
-//                             EditorUtil.checkHidePropertySheet();
-//                     }
-//
-//                     public void partHidden(IWorkbenchPartReference partRef) {}
-//
-//                     public void partInputChanged(IWorkbenchPartReference partRef) {}
-//
-//                     public void partVisible(IWorkbenchPartReference partRef) {}
-//                     
-//             };
-////           getWindowConfigurer().getWindow().getActivePage().addPartListener(propertySheetListener);
-//     }

 
        private void checkNomenclaturalCode() {
                
                // First time Editor is opened, no nomenclatural code has been set
                if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
 
 
        private void checkNomenclaturalCode() {
                
                // First time Editor is opened, no nomenclatural code has been set
                if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
 

+                       logger.debug("No nomencatural code set.");
+                       

                        Shell shell = TaxonomicEditorPlugin.getDefault().getWorkbench()
                                        .getActiveWorkbenchWindow().getShell();
                        
                        // Query user re: preferred nom. code
                        Dialog dialog = new InitNomenclaturalCodePrefDialog(shell);
                        Shell shell = TaxonomicEditorPlugin.getDefault().getWorkbench()
                                        .getActiveWorkbenchWindow().getShell();
                        
                        // Query user re: preferred nom. code
                        Dialog dialog = new InitNomenclaturalCodePrefDialog(shell);

-                       int returnCode = dialog.open();
+                       dialog.open();

                        
                        // Short message confirming user's choice
                        String code = PreferencesUtil.getPreferredNomenclaturalCodeAsString();
                        
                        // Short message confirming user's choice
                        String code = PreferencesUtil.getPreferredNomenclaturalCodeAsString();

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
index 37649989084087ffabff3f0102bd5dfd16895b7f..2d8e76703c22daf565a0093e593059695fa78ecc 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
@@ -30,6 +30,7 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
        public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;
        public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;

+               logger.debug("Taxonomic Editor started.");

        }
 
        /*
        }
 
        /*


@@ -39,6 +40,7 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
        public void stop(BundleContext context) throws Exception {
                plugin = null;
                super.stop(context);
        public void stop(BundleContext context) throws Exception {
                plugin = null;
                super.stop(context);

+               logger.debug("Taxonomic Editor stopped.");

        }
 
        /**
        }
 
        /**

diff --git a/taxeditor-editor/.settings/org.eclipse.jdt.core.prefs b/taxeditor-editor/.settings/org.eclipse.jdt.core.prefs
index 5c1ec0b9a5f3b5850746b2fc4787ed63f0a7b1bd..47c6c2859a619b435e2cb233c2e139c1074ee062 100644 (file)
--- a/taxeditor-editor/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
-#Tue Jun 02 13:01:37 CEST 2009
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+#Tue Jun 02 18:13:10 CEST 2009

 eclipse.preferences.version=1
 eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index 3d7c7ae4506cdbfaa7b9465f5a9b4c256c11aa51..015c05e369d02109af2685cb583d9bd857fd5b22 100644 (file)
--- a/taxeditor-editor/META-INF/MANIFEST.MF
+++ b/taxeditor-editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true

-Bundle-Version: 1.1.0
+Bundle-Version: 2.0.0.v200906021612

 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0


@@ -41,3 +41,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
  eu.etaxonomy.cdmLibrary;bundle-version="2.0.0",
  eu.etaxonomy.taxeditor.store;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
  eu.etaxonomy.cdmLibrary;bundle-version="2.0.0",
  eu.etaxonomy.taxeditor.store;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml
index 9db88268e08a32f7ff33d574a13e2c05ca6e3b8b..f04831350e8739d9fe9b63b0ba50cf9f7be82d66 100644 (file)
--- a/taxeditor-editor/plugin.xml
+++ b/taxeditor-editor/plugin.xml
@@ -20,12 +20,6 @@
    </extension-->
    <extension
          point="org.eclipse.ui.editors">
    </extension-->
    <extension
          point="org.eclipse.ui.editors">

-      <editor
-            class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
-            icon="icons/edit_16x16.gif"
-            id="eu.etaxonomy.taxeditor.editor.multipagetaxonview"
-            name="Multitabbed Taxon Editor">
-      </editor>

       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
             default="false"
       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
             default="false"

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
index 5f1b091cf619517e7cc86813bdfcc64ab717f935..671e19c2dc8ac3e8798b05f7aef72da2e093e02e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
@@ -124,9 +124,6 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
         */\r
        public void init(IEditorSite site, IEditorInput input)\r
                        throws PartInitException {\r
         */\r
        public void init(IEditorSite site, IEditorInput input)\r
                        throws PartInitException {\r

-               // bind the session\r
-               \r
-               \r

                if (!(input instanceof IEditorInput))\r
                        throw new PartInitException(\r
                                "Invalid Input: Must be IEditorInput");\r
                if (!(input instanceof IEditorInput))\r
                        throw new PartInitException(\r
                                "Invalid Input: Must be IEditorInput");\r


@@ -144,6 +141,8 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                this.provider = new SimpleSelectionProvider();\r
                this.getSite().setSelectionProvider(provider);\r
                \r
                this.provider = new SimpleSelectionProvider();\r
                this.getSite().setSelectionProvider(provider);\r
                \r

+               \r
+               logger.trace("New Editor instance created.");\r

        }\r
        \r
        public IUndoContext getUndoContext() {\r
        }\r
        \r
        public IUndoContext getUndoContext() {\r


@@ -171,7 +170,6 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                this.selectedObject = selectedObject;\r
                \r
                //  set background on selection TODO wanted to move this to setFocus() on the selectedObject but that doesn't work (infinite loop)\r
                this.selectedObject = selectedObject;\r
                \r
                //  set background on selection TODO wanted to move this to setFocus() on the selectedObject but that doesn't work (infinite loop)\r

-//             ((GroupedComposite) selectedObject).setSelected();\r

                ((GroupedComposite) selectedObject).setBackground(Resources.getColor(Resources.COLOR_COMPOSITE_SELECTED));\r
                \r
                \r
                ((GroupedComposite) selectedObject).setBackground(Resources.getColor(Resources.COLOR_COMPOSITE_SELECTED));\r
                \r
                \r


@@ -342,7 +340,7 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
        }\r
        \r
        /**\r
        }\r
        \r
        /**\r

-        * \r
+        * Redraws this editor\r

         */\r
        public boolean redraw() {\r
                \r
         */\r
        public boolean redraw() {\r
                \r


@@ -419,7 +417,7 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
        public GroupedComposite getFirstGroupedComposite() {\r
                return firstGroupedComposite;\r
        }\r
        public GroupedComposite getFirstGroupedComposite() {\r
                return firstGroupedComposite;\r
        }\r

-       \r
+\r

        class EditorPropertySheetPage extends PropertySheetPage {\r
                \r
                EditorPropertySheetPage() {\r
        class EditorPropertySheetPage extends PropertySheetPage {\r
                \r
                EditorPropertySheetPage() {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 51d351315fc38dc890318ee3b60a1372c4f5acb2..8df96a7ea99925fe9ab51e8b843bbb5af6963abf 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -10,7 +10,6 @@
 package eu.etaxonomy.taxeditor.editor;\r
 \r
 import java.util.HashSet;\r
 package eu.etaxonomy.taxeditor.editor;\r
 \r
 import java.util.HashSet;\r

-import java.util.Map;\r

 import java.util.Set;\r
 import java.util.UUID;\r
 \r
 import java.util.Set;\r
 import java.util.UUID;\r
 \r


@@ -31,15 +30,8 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;\r
 \r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;\r
 \r

-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.editor.description.TaxonDescriptionEditor;\r

 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r

-import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r

 import eu.etaxonomy.taxeditor.store.model.AbstractUtility;\r
 import eu.etaxonomy.taxeditor.store.model.AbstractUtility;\r

-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r

 \r
 /**\r
  * @author n.hoffmann\r
 \r
 /**\r
  * @author n.hoffmann\r


@@ -49,32 +41,12 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 public class EditorUtil extends AbstractUtility{\r
        private static final Logger logger = Logger.getLogger(EditorUtil.class);\r
 \r
 public class EditorUtil extends AbstractUtility{\r
        private static final Logger logger = Logger.getLogger(EditorUtil.class);\r
 \r

-       // TODO I am not quite sure if this is the right approach\r
-       private static Map<Taxon, TaxonNameEditor> taxonNameEditors;\r
-       private static Map<Taxon, TaxonDescriptionEditor> taxonDescriptionEditors;\r
-\r

        private static boolean isSaving = false;\r
 \r
        private static IStatusLineManager statusLineManager;\r
 \r
        private static IViewPart view;\r
        \r
        private static boolean isSaving = false;\r
 \r
        private static IStatusLineManager statusLineManager;\r
 \r
        private static IViewPart view;\r
        \r

-       /**\r
-        * @param input\r
-        * @return\r
-        * @throws PartInitException\r
-        */\r
-       private static IEditorPart getEditorByInput(IEditorInput input)\r
-                       throws PartInitException {\r
-               for (IEditorReference reference : getActivePage().getEditorReferences()) {\r
-                       if (reference.getEditorInput().equals(input)) {\r
-                               IEditorPart editor = reference.getEditor(false);\r
-                               return editor;\r
-                       }\r
-               }\r
-               return null;\r
-       }\r
-\r

        public static boolean closeAll() {\r
                for (IEditorPart editor : getOpenEditors()) {\r
                        if (!getActivePage().closeEditor(editor, true)) {\r
        public static boolean closeAll() {\r
                for (IEditorPart editor : getOpenEditors()) {\r
                        if (!getActivePage().closeEditor(editor, true)) {\r


@@ -135,21 +107,6 @@ public class EditorUtil extends AbstractUtility{
                return open(input, MultiPageTaxonEditor.ID);\r
        }\r
 \r
                return open(input, MultiPageTaxonEditor.ID);\r
        }\r
 \r

-\r
-       private static boolean redraw(AbstractTaxonEditor editor) {     \r
-               if(editor == null || editor.redraw()){\r
-                       \r
-//                     if (getActiveEditor().setFocus())\r
-//                     getActivePage()\r
-                       \r
-                       // Mark editor as changed and unsaved\r
-                       editor.setDirty();      \r
-                       return true;    \r
-               }       \r
-               return false;           \r
-       }\r
-       \r
-\r

        public static void setSaving(boolean isSaving) {\r
                EditorUtil.isSaving = isSaving;\r
        }\r
        public static void setSaving(boolean isSaving) {\r
                EditorUtil.isSaving = isSaving;\r
        }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java
deleted file mode 100644 (file)
index 4bd009b..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.ui.IEditorInput;\r
-import org.eclipse.ui.IEditorSite;\r
-import org.eclipse.ui.PartInitException;\r
-import org.eclipse.ui.part.EditorPart;\r
-\r
-public class EmptyEditorView extends EditorPart {\r
-\r
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.EmptyEditorView"; //$NON-NLS-1$\r
-\r
-       /**\r
-        * Create contents of the editor part\r
-        * @param parent\r
-        */\r
-       @Override\r
-       public void createPartControl(Composite parent) {\r
-               Composite container = new Composite(parent, SWT.NONE);\r
-               //\r
-       }\r
-\r
-       @Override\r
-       public void setFocus() {\r
-               // Set the focus\r
-       }\r
-\r
-       @Override\r
-       public void doSave(IProgressMonitor monitor) {\r
-               // Do the Save operation\r
-       }\r
-\r
-       @Override\r
-       public void doSaveAs() {\r
-               // Do the Save As operation\r
-       }\r
-\r
-       @Override\r
-       public void init(IEditorSite site, IEditorInput input)\r
-                       throws PartInitException {\r
-               // Initialize the editor part\r
-       }\r
-\r
-       @Override\r
-       public boolean isDirty() {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean isSaveAsAllowed() {\r
-               return false;\r
-       }\r
-\r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
deleted file mode 100644 (file)
index 80330b0..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.IDocumentListener;\r
-import org.eclipse.jface.text.TextViewer;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.DisposeEvent;\r
-import org.eclipse.swt.events.DisposeListener;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.events.FocusListener;\r
-import org.eclipse.swt.graphics.Font;\r
-\r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
-\r
-/**\r
- * Displays a message such as "Click here to start entering\r
- * data" when <code>document</code> is empty.\r
- * \r
- * @author p.ciardelli\r
- * @created 15.09.2008\r
- * @version 1.0\r
- */\r
-public class EmptyTextViewerPrompt implements IDocumentListener {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(EmptyTextViewerPrompt.class);\r
-       \r
-       private IDocument document;\r
-       private StyledText textControl;\r
-       private String prompt;\r
-       private FocusListener focusListener = null;\r
-\r
-       private Font textFont;\r
-       private Font promptFont = Resources.getFont(Resources.FONT_DEFAULT_PROMPT);\r
-       \r
-       public EmptyTextViewerPrompt(TextViewer textViewer, String prompt) {\r
-\r
-               this.document = textViewer.getDocument();\r
-               this.textControl = textViewer.getTextWidget();\r
-               this.prompt = prompt;\r
-\r
-               this.textFont = textControl.getFont();\r
-               \r
-               documentChanged(null);          \r
-       }\r
-\r
-       /**\r
-        * Override <code>prompt</code>'s default font. \r
-        * \r
-        * @param font\r
-        */\r
-       public void setPromptFont(Font font) {\r
-               this.promptFont = font;\r
-       }\r
-       \r
-       /**\r
-        * Adds a focus listener to the <code>textControl</code>, which hides \r
-        * the <code>prompt</code> if the cursor is in the <code>textControl</code>, \r
-        * and shows it if the cursor is elsewhere.  \r
-        */\r
-       private void createPrompt() {\r
-               \r
-               textControl.setFont(promptFont);\r
-               document.set(prompt);\r
-\r
-               focusListener = new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               if (document.get().equals(prompt)) {\r
-                                       textControl.setFont(textFont);\r
-                                       document.set("");\r
-                               }\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               if (document.getLength() == 0) {\r
-                                       textControl.setFont(promptFont);\r
-                                       document.set(prompt);\r
-                               }\r
-                       }\r
-                       \r
-               };\r
-               textControl.addFocusListener(focusListener);\r
-               textControl.addDisposeListener(new DisposeListener() {\r
-\r
-                       \r
-                       public void widgetDisposed(DisposeEvent e) {\r
-                               focusListener = null;\r
-                       }\r
-                       \r
-               });\r
-       }\r
-       \r
-       /**\r
-        * Removes focus listener from <code>textControl</code>, turning off\r
-        * the showing of <code>prompt</code>.\r
-        */\r
-       private void removePrompt() {\r
-               if (focusListener != null) {\r
-                       textControl.removeFocusListener(focusListener);\r
-                       focusListener = null;\r
-               }\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)\r
-        */\r
-       public void documentAboutToBeChanged(DocumentEvent event) {}\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)\r
-        */\r
-       public void documentChanged(DocumentEvent event) {\r
-               \r
-               if (document.get().equals(prompt)) {\r
-                       return;\r
-               }\r
-               \r
-               if (document.getLength() == 0) {\r
-                       createPrompt();\r
-               } else {\r
-                       removePrompt();\r
-               }\r
-       }\r
-}
\ No newline at end of file

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
index 2f45113c1fddeef4e1a549f046a73b58b5356a97..949b7979f655c2c68ba8771588c39fe7ff7b6f2d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
@@ -12,7 +12,6 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;\r
 \r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
 import org.eclipse.swt.widgets.Canvas;\r
 \r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r

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

 \r
 public class ErrorAnnotation extends Annotation implements IAnnotationPresentation {\r
     private IMarker marker;\r
 \r
 public class ErrorAnnotation extends Annotation implements IAnnotationPresentation {\r
     private IMarker marker;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
index f2dc495da92f5acec5a43d26434e6af334be3d93..fc4a64a2302997d558c1f5a7866c9f65f68b1242 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.taxeditor.editor.description.TaxonDescriptionEditor;
 import eu.etaxonomy.taxeditor.editor.images.GalleryLabelComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.ImageComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.ImagesGroupComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.GalleryLabelComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.ImageComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.ImagesGroupComposite;\r

-import eu.etaxonomy.taxeditor.editor.images.TaxonHasNoImagesComposite;\r

 import eu.etaxonomy.taxeditor.editor.images.TaxonImageEditor;\r
 import eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite;\r
 import eu.etaxonomy.taxeditor.editor.name.ConceptComposite;\r
 import eu.etaxonomy.taxeditor.editor.images.TaxonImageEditor;\r
 import eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite;\r
 import eu.etaxonomy.taxeditor.editor.name.ConceptComposite;\r


@@ -61,6 +60,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
                if (factory == null) {\r
                        factory = new FreeTextElementFactory();\r
                }\r
                if (factory == null) {\r
                        factory = new FreeTextElementFactory();\r
                }\r

+               logger.trace("Created a new FreeTextElementFactory instance.");\r

                return factory;\r
        }\r
        \r
                return factory;\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java
index f11939a57742dcdd113fddfc9f38698967d6401a..2021172001b2fcf13730e085d2b8198db14834fe 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java
@@ -53,6 +53,8 @@ public class GroupComposite extends Composite {
 \r
                // Drop functionality\r
                this.setDroppable(true);\r
 \r
                // Drop functionality\r
                this.setDroppable(true);\r

+               \r
+               logger.trace("Created a new Group composite");\r

        }\r
        \r
        public GroupComposite(AbstractTaxonEditor editor, Composite parent){\r
        }\r
        \r
        public GroupComposite(AbstractTaxonEditor editor, Composite parent){\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
index 027a301c8fd21170f4771d812383dcc129fded1b..777269551728afc9bf7807591663e327c0403846 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
@@ -43,5 +43,7 @@ public class GroupCompositeLabel extends Composite {
                // Add the label\r
                final Label label = new Label(this, SWT.NONE);\r
                label.setText(labelText.toUpperCase());\r
                // Add the label\r
                final Label label = new Label(this, SWT.NONE);\r
                label.setText(labelText.toUpperCase());\r

+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\r

        }\r
 }\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
index 0ffe2b925f0cc4535ca99b667437f4ec653be845..62af930af830870354b3b94e02ae7f8d78da081a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
@@ -101,6 +101,8 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
                taxon = (Taxon) formData;\r
 \r
                createControl();\r
                taxon = (Taxon) formData;\r
 \r
                createControl();\r

+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\r

        }\r
        \r
        protected void createControl() {\r
        }\r
        \r
        protected void createControl() {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
index 0f63607cda3b279b604db6007d75b8e18a59572b..07a12f33bd4835e06be065082f315f3470749f56 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Collection;\r
 import java.util.Scanner;\r
 \r
 import java.util.Collection;\r
 import java.util.Scanner;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.KeyEvent;\r
 import org.eclipse.swt.events.KeyListener;\r
 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.KeyEvent;\r
 import org.eclipse.swt.events.KeyListener;\r


@@ -47,8 +46,6 @@ import org.eclipse.swt.events.VerifyListener;
  * @version 1.0\r
  */\r
 public abstract class LineBreakListener implements VerifyListener, KeyListener {\r
  * @version 1.0\r
  */\r
 public abstract class LineBreakListener implements VerifyListener, KeyListener {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(LineBreakListener.class);\r

        \r
        Collection<String> splitTexts;\r
        \r
        \r
        Collection<String> splitTexts;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java
index 4280a4c85bce8ac9803657c859eb4de07008ee42..f2dbb0e3b14b39305f886c2b70f17f205864c364 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.text.source.Annotation;\r
 import org.eclipse.jface.text.source.AnnotationPainter.SquigglesStrategy;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.jface.text.source.Annotation;\r
 import org.eclipse.jface.text.source.AnnotationPainter.SquigglesStrategy;\r
 import org.eclipse.swt.SWT;\r


@@ -27,8 +26,6 @@ import org.eclipse.swt.graphics.Point;
  * @version 1.0\r
  */\r
 public class LineWrapSquigglesStrategy extends SquigglesStrategy {\r
  * @version 1.0\r
  */\r
 public class LineWrapSquigglesStrategy extends SquigglesStrategy {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(LineWrapSquigglesStrategy.class);\r

        \r
        public static final String ID = "linewrap_squigglesstrategy";\r
 \r
        \r
        public static final String ID = "linewrap_squigglesstrategy";\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java
index d7af8b5a1036a54221bb39261baf17e191e55f1c..c2449d49114d8a1ec6a6739fd060c922ea21d0cb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java
@@ -14,7 +14,6 @@ import org.eclipse.jface.text.TextViewer;
 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r
 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r

-import org.eclipse.swt.widgets.Composite;\r

 import org.eclipse.ui.forms.IManagedForm;\r
 import org.eclipse.ui.forms.widgets.ScrolledForm;\r
 \r
 import org.eclipse.ui.forms.IManagedForm;\r
 import org.eclipse.ui.forms.widgets.ScrolledForm;\r
 \r


@@ -42,6 +41,13 @@ public class LineWrapSupport {
 \r
        private TextViewer viewer;\r
        \r
 \r
        private TextViewer viewer;\r
        \r

+       /**\r
+        * @return the viewer\r
+        */\r
+       public TextViewer getViewer() {\r
+               return viewer;\r
+       }\r
+\r

        public LineWrapSupport(TextViewer viewer, IManagedForm form) {\r
                \r
                if (viewer == null) {\r
        public LineWrapSupport(TextViewer viewer, IManagedForm form) {\r
                \r
                if (viewer == null) {\r


@@ -56,6 +62,8 @@ public class LineWrapSupport {
                                \r
                this.lineCount = textWidget.getLinePixel(textWidget.getLineCount());\r
                this.scrolledForm = form.getForm();\r
                                \r
                this.lineCount = textWidget.getLinePixel(textWidget.getLineCount());\r
                this.scrolledForm = form.getForm();\r

+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\r

        }\r
        \r
        /**\r
        }\r
        \r
        /**\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java
deleted file mode 100644 (file)
index 768052b..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.action.MenuManager;\r
-\r
-/**\r
- * @author n.hoffmann\r
- * @created 03.02.2009\r
- * @version 1.0\r
- */\r
-public class MenuConstants {\r
-       private static final Logger logger = Logger.getLogger(MenuConstants.class);\r
-       \r
-       /**\r
-        * \r
-        * @return\r
-        * @deprecated this should all take place in plugin.xml\r
-        */\r
-       public static final MenuManager EDITOR_TAXON_MENU(){            \r
-               MenuManager taxonEditorMenu = new MenuManager("Taxon");\r
-//             \r
-//             taxonEditorMenu.add(new CreateHeterotypicSynonymAction());\r
-//             taxonEditorMenu.add(new CreateSynonymInGroupAction());\r
-//             taxonEditorMenu.add(new Separator());                   \r
-//             taxonEditorMenu.add(new CreateMisappliedNameAction());\r
-//             \r
-//             MenuManager subMenu = new MenuManager("Create concept relation");\r
-//             for (TaxonRelationshipType type : \r
-//                             CdmSessionDataRepository.getDefault().getConceptRelationshipTypes()) {\r
-//                     subMenu.add(new CreateConceptRelationAction(type));\r
-//             }\r
-//             taxonEditorMenu.add(subMenu);\r
-//             taxonEditorMenu.add(new Separator());\r
-//             taxonEditorMenu.add(new MoveTaxonDialogAction());\r
-//             taxonEditorMenu.add(new ChangeTaxonToSynonymAction());\r
-//             taxonEditorMenu.add(new Separator());\r
-//             // TODO is it correct that onlx taxa with rank species may have autonyms?\r
-////           if(taxon.getName().getRank().equals(Rank.SPECIES())){\r
-////                   taxonEditorMenu.add(new CreateAutonymAction());\r
-////           }\r
-//             taxonEditorMenu.add(new CreateTaxonomicallyIncludedTaxonAction());\r
-//             \r
-               return taxonEditorMenu;\r
-       }\r
-       \r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
index cc02caa41189d80ba822b23435ff4bfc06e95e8f..8f8529e0fde19dedb4ffc486e67cf4cf69755c65 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
@@ -189,7 +189,7 @@ public class MultiPageTaxonEditor extends MultiPageEditorPart implements IConver
     protected void setPartName() {\r
         \r
        String partName = null;\r
     protected void setPartName() {\r
         \r
        String partName = null;\r

-       TaxonNameBase name = taxon.getName();\r
+       TaxonNameBase<?, ?> name = taxon.getName();\r

        \r
        if (name != null) {\r
                partName = name.getTitleCache();\r
        \r
        if (name != null) {\r
                partName = name.getTitleCache();\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java
index 8e3cc58073c41a5cbc2881278420b154aa0d8929..4d14d0b3197e7762b5ca31fd860848fc706946f7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java
@@ -25,10 +25,10 @@ public enum Page {
        IMAGE ("Image", TaxonImageEditor.class, 2);
        
        private String title;
        IMAGE ("Image", TaxonImageEditor.class, 2);
        
        private String title;

-       private Class clazz;
+       private Class<?> clazz;

        private int index;
        
        private int index;
        

-       Page(String title, Class clazz, int index){
+       Page(String title, Class<?> clazz, int index){

                this.title = title;
                this.clazz = clazz;
                this.index = index;
                this.title = title;
                this.clazz = clazz;
                this.index = index;


@@ -38,7 +38,7 @@ public enum Page {
                return this.title;
        }
        
                return this.title;
        }
        

-       public Class getClazz(){
+       public Class<?> getClazz(){

                return this.clazz;
        }
        
                return this.clazz;
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
index 1829bcd24f648fb9024ffd291cb9ef97689ea6d7..91d88812c70db45749e3120effd90b59fa2b2604 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
@@ -8,7 +8,6 @@
  */\r
 package eu.etaxonomy.taxeditor.editor;\r
 \r
  */\r
 package eu.etaxonomy.taxeditor.editor;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r
 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r


@@ -21,8 +20,6 @@ import org.eclipse.swt.events.ModifyListener;
  * @version 1.0\r
  */\r
 public abstract class ParseListener implements ModifyListener {\r
  * @version 1.0\r
  */\r
 public abstract class ParseListener implements ModifyListener {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ParseListener.class);\r

 \r
        public void modifyText(ModifyEvent e) {\r
                StyledText widget = (StyledText) e.widget;\r
 \r
        public void modifyText(ModifyEvent e) {\r
                StyledText widget = (StyledText) e.widget;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java
deleted file mode 100644 (file)
index 2b382f3..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
- * http://www.e-taxonomy.eu\r
- * \r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.dialogs.Dialog;\r
-import org.eclipse.jface.dialogs.IDialogConstants;\r
-import org.eclipse.jface.viewers.DoubleClickEvent;\r
-import org.eclipse.jface.viewers.IDoubleClickListener;\r
-import org.eclipse.jface.viewers.StructuredSelection;\r
-import org.eclipse.jface.viewers.TableViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.events.FocusListener;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Point;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.layout.GridData;\r
-import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.layout.RowData;\r
-import org.eclipse.swt.layout.RowLayout;\r
-import org.eclipse.swt.widgets.Button;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Group;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.eclipse.swt.widgets.Text;\r
-import org.eclipse.swt.widgets.TreeItem;\r
-\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
-import eu.etaxonomy.taxeditor.store.model.NameUtil;\r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
-\r
-/**\r
- * This is a generic dialog that allows the user to choose a taxon via the\r
- * taxonomic tree, recently selected names, or search.\r
- * \r
- * @author p.ciardelli\r
- * @created 27.05.2008\r
- * @version 1.0\r
- */\r
-public class SelectTaxonDialog extends Dialog {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(SelectTaxonDialog.class);\r
-\r
-       public static final String TAXON_TO_SYNONYM = "taxon_to_synonym";\r
-       public static final String TAXON_TO_NEW_PARENT = "taxon_to_new_parent";\r
-\r
-       private String dialogType;\r
-       private String shellText;\r
-       private String descriptionText;\r
-       private Text taxonNameText;\r
-\r
-       // FIXME no direct dependencies\r
-//     private TaxonomicTreeViewer treeViewer;\r
-       private Taxon taxon;\r
-       private Taxon destinationTaxon;\r
-\r
-       private List<Button> buttons = new ArrayList<Button>();\r
-\r
-       private Composite selectComposite;\r
-\r
-       public SelectTaxonDialog(Shell parentShell, String dialogType) {\r
-               super(parentShell);\r
-               this.dialogType = dialogType;\r
-       }\r
-\r
-       public Taxon open(Taxon taxon) {\r
-               this.taxon = taxon;\r
-\r
-               if (dialogType.equals(TAXON_TO_SYNONYM)) {\r
-                       this.shellText = "Choose an accepted name for \""\r
-                                       + NameUtil.getDisplayName(taxon) + "\"";\r
-                       this.descriptionText = "You have chosen to turn \""\r
-                                       + NameUtil.getDisplayName(taxon)\r
-                                       + "\" into a synonym. Please choose a new accepted name from one of the following options.";\r
-               }\r
-\r
-               if (dialogType.equals(TAXON_TO_NEW_PARENT)) {\r
-                       this.shellText = "Choose a new parent for \""\r
-                                       + NameUtil.getDisplayName(taxon) + "\"";\r
-                       this.descriptionText = "You have chosen to select a new parent for \""\r
-                                       + NameUtil.getDisplayName(taxon)\r
-                                       + "\". Please choose the new parent taxon from one of the following options.";\r
-               }\r
-               \r
-               int returnCode = super.open();\r
-               if (returnCode == OK) {\r
-                       return destinationTaxon;\r
-               }\r
-               return null;\r
-       }\r
-\r
-       \r
-       \r
-       // FIXME looks like this is a complete copy of the treeviewer code. This is so not desirable.\r
-       // think about a different solution for this dialog\r
-//     /**\r
-//      * Create contents of the dialog\r
-//      * \r
-//      * @param parent\r
-//      */\r
-//     @Override\r
-//     protected Control createDialogArea(Composite parent) {\r
-//             parent.setRedraw(true);\r
-//             Composite container = (Composite) super.createDialogArea(parent);\r
-//             final GridLayout gridLayout = new GridLayout();\r
-//             gridLayout.numColumns = 2;\r
-//             container.setLayout(gridLayout);\r
-//\r
-//             final Label descriptionLabel = new Label(container, SWT.WRAP);\r
-//             descriptionLabel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, true,\r
-//                             false, 2, 1));\r
-//             descriptionLabel.setText(descriptionText);\r
-//\r
-//             final Group taxTreeGroup = new Group(container, SWT.NONE);\r
-//             taxTreeGroup.setLayout(new GridLayout());\r
-//             final GridData gd_group_1 = new GridData(SWT.FILL, SWT.FILL, true, true);\r
-//             gd_group_1.heightHint = 83;\r
-//             taxTreeGroup.setLayoutData(gd_group_1);\r
-//\r
-//             final Button chooseTreeButton = new Button(taxTreeGroup, SWT.RADIO);\r
-//             buttons.add(chooseTreeButton);\r
-//             chooseTreeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,\r
-//                             false));\r
-//             chooseTreeButton.setText("Choose from taxonomic tree");\r
-//\r
-//             Composite taxTreeComposite = new Composite(taxTreeGroup, SWT.BORDER);\r
-//             taxTreeComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,\r
-//                             true));\r
-//             taxTreeComposite.setLayout(new FillLayout());\r
-//             taxTreeComposite.setBackground(Display.getCurrent().getSystemColor(\r
-//                             SWT.COLOR_WHITE));\r
-//\r
-//             treeViewer = new TaxonomicTreeViewer(taxTreeComposite);\r
-//\r
-//             IObservableSet observableTaxonSet = \r
-//                             CdmSessionDataRepository.getDefault().getObservableTaxa();\r
-//             treeViewer.setLabelProvider(new TaxonomicTreeLabelProvider(\r
-//                             observableTaxonSet) {\r
-//\r
-//             });\r
-//             treeViewer.getTree().addFocusListener(\r
-//                             new SelectButtonFocusListener(chooseTreeButton));\r
-//             treeViewer.addDoubleClickListener(new SelectTaxonDoubleClickListener());\r
-//             treeViewer.getTree().addListener(SWT.PaintItem, new Listener() {\r
-//                     /** If MenuItem with taxon is being drawn, put it in italics.\r
-//                      * \r
-//                      * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)\r
-//                      **/\r
-//                     public void handleEvent(Event event) {\r
-//                             Object data = event.item.getData();\r
-//                             if (data instanceof Taxon && ((Taxon) data).equals(taxon)) {\r
-//                                     ((TreeItem) event.item).setFont(TaxEditorPlugin.getDefault().getFont\r
-//                                                     (ICdmConstants.MENU_ITEM_ITALICS_FONT));\r
-//                             }\r
-//                     }\r
-//             });\r
-//\r
-//             // Open up tree to reveal taxon\r
-//             treeViewer.revealTaxon(taxon);\r
-//\r
-//             final Composite rightPaneComposite = new Composite(container, SWT.NONE);\r
-//             rightPaneComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,\r
-//                             true));\r
-//             rightPaneComposite.setLayout(new FillLayout(SWT.VERTICAL\r
-//                             | SWT.HORIZONTAL));\r
-//\r
-//             final Group recentNamesGroup = new Group(rightPaneComposite, SWT.NONE);\r
-//             recentNamesGroup.setLayout(new GridLayout());\r
-//\r
-//             final Button chooseRecentNamesButton = new Button(recentNamesGroup,\r
-//                             SWT.RADIO);\r
-//             buttons.add(chooseRecentNamesButton);\r
-//             chooseRecentNamesButton.setText("Choose from recently viewed taxa");\r
-//\r
-//             Composite recentNamesComposite = new Composite(recentNamesGroup,\r
-//                             SWT.BORDER);\r
-//             recentNamesComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL,\r
-//                             true, true));\r
-//             recentNamesComposite.setLayout(new FillLayout());\r
-//             recentNamesComposite.setBackground(Display.getCurrent().getSystemColor(\r
-//                             SWT.COLOR_WHITE));\r
-//\r
-//             TableViewer recentNamesViewer = new RecentNamesTableViewer(\r
-//                             recentNamesComposite);\r
-//             recentNamesViewer\r
-//                             .addDoubleClickListener(new SelectTaxonDoubleClickListener());\r
-//             recentNamesViewer.getTable().addFocusListener(\r
-//                             new SelectButtonFocusListener(chooseRecentNamesButton));\r
-//\r
-//             final Group searchGroup = new Group(rightPaneComposite, SWT.NONE);\r
-//             final GridLayout gridLayout_1 = new GridLayout();\r
-//             gridLayout_1.numColumns = 2;\r
-//             searchGroup.setLayout(gridLayout_1);\r
-//\r
-//             final Button searchForNameButton = new Button(searchGroup, SWT.RADIO);\r
-//             buttons.add(searchForNameButton);\r
-//             searchForNameButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER,\r
-//                             true, false));\r
-//             searchForNameButton.setText("Search for name of accepted taxon");\r
-//             new Label(searchGroup, SWT.NONE);\r
-//\r
-//             final Text searchText = new Text(searchGroup, SWT.BORDER);\r
-//             searchText\r
-//                             .setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
-//             searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));\r
-//             searchText.setText("Use \"*\" for wildcard searching");\r
-//             searchText.addFocusListener(new SelectButtonFocusListener(\r
-//                             searchForNameButton) {\r
-//\r
-//                     public void focusGained(FocusEvent e) {\r
-//                             selectButton(button);\r
-//                             searchText.setForeground(SWTResourceManager.getColor(0, 0, 0));\r
-//                             searchText.setText("");\r
-//                     }\r
-//\r
-//                     public void focusLost(FocusEvent e) {\r
-//                             if (searchText.getText() == "") {\r
-//                                     searchText.setForeground(SWTResourceManager.getColor(192,\r
-//                                                     192, 192));\r
-//                                     searchText.setText("Use \"*\" for wildcard searching");\r
-//                             }\r
-//                     }\r
-//\r
-//             });\r
-//\r
-//             final Button searchButton = new Button(searchGroup, SWT.NONE);\r
-//             searchButton.setLayoutData(new GridData());\r
-//             searchButton.setText("Search");\r
-//\r
-//             selectComposite = new Composite(container, SWT.NONE);\r
-//             selectComposite.setLayout(new RowLayout());\r
-//             selectComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, true,\r
-//                             false, 2, 1));\r
-//\r
-//             taxonNameText = new Text(selectComposite, SWT.BORDER);\r
-//             taxonNameText.setFont(SWTResourceManager.getFont("", 12, SWT.BOLD));\r
-//             taxonNameText.setBackground(SWTResourceManager.getColor(255, 255, 255));\r
-//             final RowData rd_text = new RowData();\r
-//             rd_text.width = 400;\r
-//             taxonNameText.setLayoutData(rd_text);\r
-//             taxonNameText.setEditable(false);\r
-//\r
-//             //\r
-//             initButtons();\r
-//\r
-//             return container;\r
-//     }\r
-\r
-       public void setSelectedTaxon(Taxon taxon) {\r
-\r
-               this.destinationTaxon = taxon;\r
-               TaxonNameBase taxonName = taxon.getName();\r
-               if (taxonName == null) {\r
-                       return;\r
-               }\r
-\r
-               taxonNameText.setText(taxonName.getTitleCache());\r
-\r
-               setOkEnabled(true);\r
-       }\r
-\r
-       /**\r
-        * Create contents of the button bar\r
-        * \r
-        * @param parent\r
-        */\r
-       @Override\r
-       protected void createButtonsForButtonBar(Composite parent) {\r
-               createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,\r
-                               true);\r
-               setOkEnabled(false);\r
-               createButton(parent, IDialogConstants.CANCEL_ID,\r
-                               IDialogConstants.CANCEL_LABEL, false);\r
-       }\r
-\r
-       public void setOkEnabled(boolean enabled) {\r
-               getButton(IDialogConstants.OK_ID).setEnabled(enabled);\r
-       }\r
-\r
-       private void initButtons() {\r
-               for (Button button : buttons) {\r
-                       button.addSelectionListener(new SelectionAdapter() {\r
-                               public void widgetSelected(final SelectionEvent e) {\r
-                                       selectButton((Button) e.getSource());\r
-                               }\r
-                       });\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Since buttons are not in the same layout group, the others are not\r
-        * automatically deselected when one is selected. This method takes care of\r
-        * that.\r
-        * \r
-        * @param button\r
-        */\r
-       private void selectButton(Button selectedButton) {\r
-               for (Button button : buttons) {\r
-                       if (button == selectedButton)\r
-                               button.setSelection(true);\r
-                       else\r
-                               button.setSelection(false);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Return the initial size of the dialog\r
-        */\r
-       @Override\r
-       protected Point getInitialSize() {\r
-               return new Point(700, 500);\r
-       }\r
-\r
-       protected void configureShell(Shell newShell) {\r
-               super.configureShell(newShell);\r
-               newShell.setImage(ImageResources.getImage(\r
-                               ImageResources.EDIT_ICON));\r
-               newShell.setText(shellText);\r
-       }\r
-\r
-       class SelectButtonFocusListener implements FocusListener {\r
-\r
-               /**\r
-                * The button whose group has gained focus.\r
-                */\r
-               Button button;\r
-\r
-               SelectButtonFocusListener(Button button) {\r
-                       this.button = button;\r
-               }\r
-\r
-               public void focusGained(FocusEvent e) {\r
-                       selectButton(button);\r
-               }\r
-\r
-               public void focusLost(FocusEvent e) {\r
-               }\r
-\r
-       }\r
-\r
-       class SelectTaxonDoubleClickListener implements IDoubleClickListener {\r
-\r
-               public void doubleClick(DoubleClickEvent event) {\r
-                       Taxon taxon = null;\r
-                       try {\r
-                               taxon = (Taxon) ((StructuredSelection) event.getSelection())\r
-                                               .getFirstElement();\r
-                       } catch (Exception e) {\r
-                               e.printStackTrace();\r
-                               taxon = null;\r
-                       }\r
-                       if (taxon.equals(SelectTaxonDialog.this.taxon)) {\r
-                               return;\r
-                       }\r
-\r
-                       setSelectedTaxon(taxon);\r
-               }\r
-       }\r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
index fb3d32867127e9e9d4faf987205509cf7bba7378..0de6ced89208cd5995cbec9972617eddd4f57530 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.runtime.ListenerList;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.jface.viewers.ISelectionChangedListener;\r
 import org.eclipse.core.runtime.ListenerList;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.jface.viewers.ISelectionChangedListener;\r


@@ -23,8 +22,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
  * @version 1.0\r
  */\r
 public class SimpleSelectionProvider implements ISelectionProvider {\r
  * @version 1.0\r
  */\r
 public class SimpleSelectionProvider implements ISelectionProvider {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(SimpleSelectionProvider.class);\r

 \r
        private ListenerList listeners = new ListenerList();\r
        private ISelection selection;\r
 \r
        private ListenerList listeners = new ListenerList();\r
        private ISelection selection;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 2de1b0674705f4b0c516fc1cc977f86e2ac78f07..30d919cd71608e017be1819e29eac16dc1faa90b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -26,7 +26,6 @@ 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.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;

-import eu.etaxonomy.taxeditor.propertysheet.name.AcceptedTaxonPropertySource;

 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 


@@ -86,13 +85,15 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
                        taxon = (Taxon) taxonBase;
                }       
        
                        taxon = (Taxon) taxonBase;
                }       
        

+               logger.trace(TaxonEditorInput.class.getSimpleName() + " created");
+               

        return new TaxonEditorInput(taxon, conversation);
     }
     
     public static TaxonEditorInput NewEmptyInstance(UUID parentTaxonUuid){
        ConversationHolder conversation = CdmStore.NewTransactionalConversation();
                
        return new TaxonEditorInput(taxon, conversation);
     }
     
     public static TaxonEditorInput NewEmptyInstance(UUID parentTaxonUuid){
        ConversationHolder conversation = CdmStore.NewTransactionalConversation();
                

-               TaxonNameBase name = PreferencesUtil.getInstanceOfPreferredNameClass();
+               TaxonNameBase<?, ?> name = PreferencesUtil.getInstanceOfPreferredNameClass();

                
                Taxon newTaxon = null;
                if(parentTaxonUuid == null){
                
                Taxon newTaxon = null;
                if(parentTaxonUuid == null){


@@ -126,7 +127,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
         * @see org.eclipse.ui.IEditorInput#getName()
         */
        public String getName() {
         * @see org.eclipse.ui.IEditorInput#getName()
         */
        public String getName() {

-               TaxonNameBase name = taxon.getName();
+               TaxonNameBase<?, ?> name = taxon.getName();

                if (name == null || name.getTitleCache() == null) {
                        return "New taxon";
                } else {
                if (name == null || name.getTitleCache() == null) {
                        return "New taxon";
                } else {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java
deleted file mode 100644 (file)
index 7675b63..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**\r
-* Copyright (C) 2009 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 24.02.2009\r
- * @version 1.0\r
- */\r
-public class TemporaryTaxon extends Taxon {\r
-       private static Logger logger = Logger.getLogger(TemporaryTaxon.class);\r
-       \r
-//     TemporaryTaxon(Taxon taxon) {\r
-//             this.t = CdmUtil.getTaxonService().getTaxonByUuid(taxon.getUuid());\r
-//     }\r
-       \r
-       public static TemporaryTaxon newInstance(Taxon taxon) {\r
-               TemporaryTaxon tempTaxon = (TemporaryTaxon) \r
-                               CdmStore.getTaxonService().getTaxonByUuid(taxon.getUuid());\r
-               return tempTaxon;\r
-       }\r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java
deleted file mode 100644 (file)
index 9d3a4a5..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.IToolBarManager;\r
-import org.eclipse.jface.resource.ResourceManager;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Table;\r
-import org.eclipse.swt.widgets.TableColumn;\r
-import org.eclipse.swt.widgets.TableItem;\r
-import org.eclipse.ui.part.ViewPart;\r
-\r
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
-\r
-public class UndoView extends ViewPart {\r
-\r
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.undoview"; //$NON-NLS-1$\r
-    private Table table;\r
-\r
-    /**\r
-        * Create contents of the view part\r
-        * @param parent\r
-        */\r
-       @Override\r
-       public void createPartControl(Composite parent) {\r
-               Composite container = new Composite(parent, SWT.NONE);\r
-               container.setLayout(new FillLayout(SWT.VERTICAL));\r
-\r
-               table = new Table(container, SWT.NONE);\r
-               table.getHorizontalBar().setVisible(false);\r
-               table.setLinesVisible(true);\r
-\r
-               final TableColumn newColumnTableColumn = new TableColumn(table, SWT.NONE);\r
-               newColumnTableColumn.setWidth(19);\r
-\r
-               final TableColumn newColumnTableColumn_1 = new TableColumn(table, SWT.NONE);\r
-               newColumnTableColumn_1.setWidth(1000);\r
-               newColumnTableColumn_1.setText("New column");\r
-\r
-               final TableItem newItemTableItem = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem.setText(1, "Created taxon \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_1.setText(1, "Added fact (Distribution) \"California deciduous forest ...\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_2 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_2.setText(1, "Added fact (Distribution) \"Brazilian (Northerly region)\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_3 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_3.setText(1, "Moved taxon \"Pilosella fuscoatra (N�geli & Peter) Soj�k\" to \"Pilosella fuscoatra coll.\"");\r
-\r
-               final TableItem newItemTableItem_4 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_4.setText(1, "Added unknown syn. \"Hieracium fuscoatrum N�geli & Peter\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_5 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_5.setText(1, "Changed rel. type to homo. syn. for \"Hieracium fuscoatrum N�geli & Peter\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_6 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_6.setText(1, "Edited name \"Hieracium fuscoatrum N�geli & Peter\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-\r
-               final TableItem newItemTableItem_7 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_7.setText(new String[] {"Undo the last action"});\r
-               //newItemTableItem_7.setImage(0, ResourceManager.getPluginImage(Activator.getDefault(), "icons/undo.gif"));\r
-               newItemTableItem_7.setText(1, "Deleted fact (Distribution) \"Brazilian (Northerly region)\" to \"Pilosella fuscoatra (N�geli & Peter) Soj�k\"");\r
-               //\r
-               createActions();\r
-               initializeToolBar();\r
-               initializeMenu();\r
-       }\r
-\r
-       /**\r
-        * Create the actions\r
-        */\r
-       private void createActions() {\r
-               // Create the actions\r
-       }\r
-\r
-       /**\r
-        * Initialize the toolbar\r
-        */\r
-       private void initializeToolBar() {\r
-               IToolBarManager toolbarManager = getViewSite().getActionBars()\r
-                               .getToolBarManager();\r
-       }\r
-\r
-       /**\r
-        * Initialize the menu\r
-        */\r
-       private void initializeMenu() {\r
-               IMenuManager menuManager = getViewSite().getActionBars()\r
-                               .getMenuManager();\r
-       }\r
-\r
-       @Override\r
-       public void setFocus() {\r
-               // Set the focus\r
-       }\r
-\r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java
index 7b914ec6d28706b36095f0f2822181bd2c4f0ed2..daf6a18c9bccf76e0b33d559ed9a3c31e1c4871d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java
@@ -4,8 +4,6 @@ import org.eclipse.swt.dnd.ByteArrayTransfer;
 import org.eclipse.swt.dnd.TransferData;\r
 import org.eclipse.swt.widgets.Widget;\r
 \r
 import org.eclipse.swt.dnd.TransferData;\r
 import org.eclipse.swt.widgets.Widget;\r
 \r

-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-\r

 /**\r
  * For drag and drop - a drag widget with this transfer type can only be dropped onto\r
  *  a drop widget with the same type.\r
 /**\r
  * For drag and drop - a drag widget with this transfer type can only be dropped onto\r
  *  a drop widget with the same type.\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
index 155a7c82707eb8a0a331e3859e123422a263f7c9..a26244e025a58ef8f08d045e8d9e4d27ac8ed77d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
@@ -10,9 +10,7 @@
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Composite;\r

-import org.eclipse.ui.forms.IManagedForm;\r

 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r


@@ -26,8 +24,6 @@ import eu.etaxonomy.taxeditor.store.model.LanguageUtil;
  * @version 1.0\r
  */\r
 public class CommonNameComposite extends DescriptionElementComposite {\r
  * @version 1.0\r
  */\r
 public class CommonNameComposite extends DescriptionElementComposite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CommonNameComposite.class);\r

        \r
        /**\r
         * @param groupComposite\r
        \r
        /**\r
         * @param groupComposite\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
index 5a67ac6235c3f175c43a8f5f450698f69eea9828..02f14e337b1ef5dfb1a3e9a31575e10b0a4cabea 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r


@@ -28,7 +27,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @version 1.0\r
  */\r
 public class DescriptionElementComposite extends GroupedComposite {\r
  * @version 1.0\r
  */\r
 public class DescriptionElementComposite extends GroupedComposite {\r

-       private static final Logger logger = Logger.getLogger(DescriptionElementComposite.class);\r

 \r
        /**\r
         * ************ COMPOSITE TYPES ************\r
 \r
        /**\r
         * ************ COMPOSITE TYPES ************\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
index 4964c3772e4d059282d2f05af0f0b1a97542309e..cbeb9850e8bebebbf8de61c8d39e47eb36497cf3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
@@ -9,14 +9,12 @@
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
 \r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.editor.GroupComposite;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
 \r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.taxeditor.editor.GroupComposite;\r

-import eu.etaxonomy.taxeditor.editor.GroupCompositeLabel;\r

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


@@ -24,8 +22,6 @@ import eu.etaxonomy.taxeditor.editor.GroupCompositeLabel;
  * @version 1.0\r
  */\r
 public class DescriptionFeatureGroupComposite extends GroupComposite {\r
  * @version 1.0\r
  */\r
 public class DescriptionFeatureGroupComposite extends GroupComposite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionFeatureGroupComposite.class);\r

 \r
        private TaxonDescription description;\r
        private Feature feature;\r
 \r
        private TaxonDescription description;\r
        private Feature feature;\r


@@ -42,8 +38,6 @@ public class DescriptionFeatureGroupComposite extends GroupComposite {
                tlLayout.topMargin = 0;\r
                tlLayout.leftMargin = 10;\r
                setLayout(tlLayout);\r
                tlLayout.topMargin = 0;\r
                tlLayout.leftMargin = 10;\r
                setLayout(tlLayout);\r

-               \r
-               Composite groupCompositeLabel = new GroupCompositeLabel(this, feature.getLabel());\r

        }\r
        \r
        public TaxonDescription getDescription() {\r
        }\r
        \r
        public TaxonDescription getDescription() {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionComposite.java
index 1c2fdc951249648e8224c8a6fe27679c42708d51..77543c25c7a5cf9e755d71366816c16268eb9942 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionComposite.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.description;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r


@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.propertysheet.description.DistributionPropertySour
  * @version 1.0\r
  */\r
 public class DistributionComposite extends DescriptionElementComposite {\r
  * @version 1.0\r
  */\r
 public class DistributionComposite extends DescriptionElementComposite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DistributionComposite.class);\r

        \r
        /**\r
         * @param groupComposite\r
        \r
        /**\r
         * @param groupComposite\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
index 174a52cf34a352a2833fc8711a97c551687ee8c6..f7c1a8997cbf1c1c9afacbf6e8f4a4a86b32f77b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.Collections;\r
 import java.util.List;\r
 \r
 import java.util.Collections;\r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.jface.dialogs.IDialogConstants;\r
 import org.eclipse.jface.window.Window;\r
 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.jface.dialogs.IDialogConstants;\r
 import org.eclipse.jface.window.Window;\r


@@ -44,8 +43,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class DistributionDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class DistributionDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DistributionDialog.class);\r

        \r
        private ILocationService locationService;\r
 \r
        \r
        private ILocationService locationService;\r
 \r


@@ -70,7 +67,7 @@ public class DistributionDialog extends Dialog {
        private PresenceAbsenceTermBase<?> selectedStatus;\r
        private Distribution distribution;\r
        private NamedAreaVocabularyType selectedVocabType;\r
        private PresenceAbsenceTermBase<?> selectedStatus;\r
        private Distribution distribution;\r
        private NamedAreaVocabularyType selectedVocabType;\r

-       private ReferenceBase selectedReference;\r
+       private ReferenceBase<?> selectedReference;\r

        /**\r
         * Lists to populate drop downs\r
         */\r
        /**\r
         * Lists to populate drop downs\r
         */\r


@@ -81,7 +78,7 @@ public class DistributionDialog extends Dialog {
        /**\r
         * Static fields to persist default values\r
         */\r
        /**\r
         * Static fields to persist default values\r
         */\r

-       private static ReferenceBase lastReference;\r
+       private static ReferenceBase<?> lastReference;\r

        private static PresenceAbsenceTermBase<?> lastPresenceAbsence;\r
        private static NamedAreaVocabularyType lastVocabType;\r
        private static NamedArea lastNamedArea;\r
        private static PresenceAbsenceTermBase<?> lastPresenceAbsence;\r
        private static NamedAreaVocabularyType lastVocabType;\r
        private static NamedArea lastNamedArea;\r


@@ -556,7 +553,7 @@ public class DistributionDialog extends Dialog {
        /**\r
         * @return\r
         */\r
        /**\r
         * @return\r
         */\r

-       private ReferenceBase getReference() {\r
+       private ReferenceBase<?> getReference() {\r

                return referenceComposite.getReference();\r
        }\r
 \r
                return referenceComposite.getReference();\r
        }\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionFeatureGroupComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionFeatureGroupComposite.java
index 80d34a180c9c36cd98fc6a6ac8bdcc47571a125d..a1b0a05618849c648253472fbe8b605a0db9d731 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionFeatureGroupComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionFeatureGroupComposite.java
@@ -13,14 +13,11 @@ package eu.etaxonomy.taxeditor.editor.description;
 import java.util.HashSet;
 import java.util.Set;
 
 import java.util.HashSet;
 import java.util.Set;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.MouseAdapter;

 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Event;

 
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;


@@ -33,8 +30,6 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
  * @version 1.0
  */
 public class DistributionFeatureGroupComposite extends DescriptionFeatureGroupComposite implements MouseListener{
  * @version 1.0
  */
 public class DistributionFeatureGroupComposite extends DescriptionFeatureGroupComposite implements MouseListener{

-       private static final Logger logger = Logger
-                       .getLogger(DistributionFeatureGroupComposite.class);

        
        private Set<Distribution> distributions;
 
        
        private Set<Distribution> distributions;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionMapDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionMapDialog.java
index e6835f1b3056a717028f34ae5ef17d7cf212b184..5f0fd574d12b3b8e84da035c57e9a9505906cb20 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionMapDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionMapDialog.java
@@ -14,7 +14,6 @@ import java.awt.Color;
 import java.util.Map;
 import java.util.Set;
 
 import java.util.Map;
 import java.util.Set;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.browser.ProgressEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.browser.ProgressEvent;


@@ -48,9 +47,6 @@ public class DistributionMapDialog extends Dialog {
 
        private Shell shell;
        
 
        private Shell shell;
        

-       private static final Logger logger = Logger
-       .getLogger(DistributionMapDialog.class);
-       

        /**
         * @param parent
         * @param style
        /**
         * @param parent
         * @param style


@@ -164,4 +160,11 @@ public class DistributionMapDialog extends Dialog {
        private int calculateWidth(){
                return shell.getSize().x - 10;
        }
        private int calculateWidth(){
                return shell.getSize().x - 10;
        }

+       
+       /**
+        * @return the editor
+        */
+       public AbstractTaxonEditor getEditor() {
+               return editor;
+       }

 }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DynamicFeatureMenu.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DynamicFeatureMenu.java
index 59f1d1d30a4c270c6748f48f909a9669f3c22381..9c9079700fabf8863da7b3f1f9c2bbba5214ee06 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DynamicFeatureMenu.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DynamicFeatureMenu.java
@@ -20,9 +20,7 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.description.Feature;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.model.description.Feature;

-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;

-import eu.etaxonomy.taxeditor.store.CdmStore;

 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 /**
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
index bea1ec2e0307fde57dad16a10aae72180bb6f1bb..1b74f7b236828342f6ea05b6510317b6d31ddd57 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.description;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IEditorInput;\r


@@ -49,8 +48,6 @@ import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
  */\r
 public class TaxonDescriptionEditor extends AbstractTaxonEditor \r
                implements IDescriptionEditorCompositeRepository{\r
  */\r
 public class TaxonDescriptionEditor extends AbstractTaxonEditor \r
                implements IDescriptionEditorCompositeRepository{\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonDescriptionEditor.class);\r

 \r
        private static final String ID = "eu.etaxonomy.taxeditor.taxonDescriptionEditor";\r
        \r
 \r
        private static final String ID = "eu.etaxonomy.taxeditor.taxonDescriptionEditor";\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java
index 6863acc4e6648d48d2e65dc399fe0fa76182150e..17517886a0906c0781bed5631cb863b29b8b0b83 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java
@@ -14,12 +14,9 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.IHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.IHandler;\r

-import org.eclipse.ui.IEditorInput;\r

 import org.eclipse.ui.IEditorPart;\r
 \r
 import org.eclipse.ui.IEditorPart;\r
 \r

-import eu.etaxonomy.cdm.model.taxon.Taxon;\r

 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r

-import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;\r

 \r
 /**\r
  * @author n.hoffmann\r
 \r
 /**\r
  * @author n.hoffmann\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java
index 839741531dedd297cdbe95f1df32881c7c040a0b..f4646376de2cca22a798efbd44476b68dab5f7a1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java
@@ -22,9 +22,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.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;

-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;

-import eu.etaxonomy.taxeditor.editor.FreeTextElementFactory;

 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.IterableSynonymyList;
 
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.IterableSynonymyList;
 


@@ -53,6 +51,7 @@ public class SaveTaxonHandler extends AbstractHandler {
                if (!areRelatedNamesNonZeroLength(editor.getTaxon())) {
                        MessageDialog.openWarning(HandlerUtil.getActiveShell(event), "Zero-Length Name", "One of this taxon's relationships " +
                        "has a zero-length name. Operation was cancelled.");
                if (!areRelatedNamesNonZeroLength(editor.getTaxon())) {
                        MessageDialog.openWarning(HandlerUtil.getActiveShell(event), "Zero-Length Name", "One of this taxon's relationships " +
                        "has a zero-length name. Operation was cancelled.");

+                       logger.trace("Tero length name detected.");

                        return null;
                }
                
                        return null;
                }
                


@@ -64,7 +63,7 @@ public class SaveTaxonHandler extends AbstractHandler {
         * @param name
         * @return
         */
         * @param name
         * @return
         */

-       private boolean isNameZeroLength(TaxonNameBase name) {
+       private boolean isNameZeroLength(TaxonNameBase<?, ?> name) {

                if (name == null) {
                        return true;
                }
                if (name == null) {
                        return true;
                }


@@ -76,7 +75,7 @@ public class SaveTaxonHandler extends AbstractHandler {
         * @return
         */
        private boolean areRelatedNamesNonZeroLength(Taxon taxon) {
         * @return
         */
        private boolean areRelatedNamesNonZeroLength(Taxon taxon) {

-               for (TaxonBase taxonBase : new IterableSynonymyList(taxon)) {
+               for (TaxonBase<?> taxonBase : new IterableSynonymyList(taxon)) {

                        if (isNameZeroLength(taxonBase.getName()) ) {
                                return false;
                        }
                        if (isNameZeroLength(taxonBase.getName()) ) {
                                return false;
                        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
index fd8f682b78cd503cf0c574791e2bd44346cac811..b6c98cad3a4e4252a31ce464609c2b76f93b819d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.images;
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.FocusAdapter;\r
 import org.eclipse.swt.events.FocusEvent;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.FocusAdapter;\r
 import org.eclipse.swt.events.FocusEvent;\r


@@ -26,12 +25,10 @@ import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.ui.forms.widgets.TableWrapData;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import org.eclipse.ui.forms.widgets.TableWrapData;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r

-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r

 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.taxeditor.editor.CompositeBorderDecorator;\r
 import eu.etaxonomy.taxeditor.editor.GroupComposite;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.taxeditor.editor.CompositeBorderDecorator;\r
 import eu.etaxonomy.taxeditor.editor.GroupComposite;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r

-import eu.etaxonomy.taxeditor.editor.description.DescriptionElementComposite;\r

 import eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite;\r
 import eu.etaxonomy.taxeditor.propertysheet.images.ImagePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r
 import eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite;\r
 import eu.etaxonomy.taxeditor.propertysheet.images.ImagePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.ImageResources;\r


@@ -41,9 +38,7 @@ import eu.etaxonomy.taxeditor.store.model.ImageResources;
  * @created 30.03.2009\r
  * @version 1.0\r
  */\r
  * @created 30.03.2009\r
  * @version 1.0\r
  */\r

-public class ImageComposite extends GroupedComposite {\r
-       private static final Logger logger = Logger.getLogger(ImageComposite.class);\r
-       \r
+public class ImageComposite extends GroupedComposite { \r

 \r
        protected Image image;\r
        \r
 \r
        protected Image image;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
index 66cbcb3cdb18dc19a68b4f6afc78b8b54b6b2224..750b625ab6837ea58dc584e02178f5655eb1da11 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.images;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IEditorSite;\r


@@ -36,8 +35,6 @@ import eu.etaxonomy.taxeditor.store.model.ImagesUtil;
  * @version 1.0\r
  */\r
 public class TaxonImageEditor extends AbstractTaxonEditor {\r
  * @version 1.0\r
  */\r
 public class TaxonImageEditor extends AbstractTaxonEditor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonImageEditor.class);\r

                \r
        private static final String ID = "eu.etaxonomy.taxeditor.taxonImageEditor";\r
 \r
                \r
        private static final String ID = "eu.etaxonomy.taxeditor.taxonImageEditor";\r
 \r


@@ -59,7 +56,7 @@ public class TaxonImageEditor extends AbstractTaxonEditor {
                super.createManagedForm(composite);\r
                \r
                Set<TaxonDescription> descriptions = taxon.getDescriptions();\r
                super.createManagedForm(composite);\r
                \r
                Set<TaxonDescription> descriptions = taxon.getDescriptions();\r

-               Set<DescriptionBase> imageGalleries = new HashSet<DescriptionBase>();\r
+               Set<DescriptionBase<?>> imageGalleries = new HashSet<DescriptionBase<?>>();\r

                \r
                for(TaxonDescription description : descriptions){\r
                        if(description.isImageGallery()){\r
                \r
                for(TaxonDescription description : descriptions){\r
                        if(description.isImageGallery()){\r


@@ -80,7 +77,7 @@ public class TaxonImageEditor extends AbstractTaxonEditor {
                \r
                firstGroupedComposite = null;\r
                \r
                \r
                firstGroupedComposite = null;\r
                \r

-               for(DescriptionBase description : descriptions){\r
+               for(DescriptionBase<?> description : descriptions){\r

                        if(description.isImageGallery()){\r
                                // Draw gallery label\r
                                Composite labelComposite = \r
                        if(description.isImageGallery()){\r
                                // Draw gallery label\r
                                Composite labelComposite = \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
index c18f01b32952912e7066ab67208d76504f828aaf..c4cd0d0a113ba637080242f2bf80d8c468078972 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -1,8 +1,6 @@
 package eu.etaxonomy.taxeditor.editor.internal;
 
 import org.apache.log4j.Logger;
 package eu.etaxonomy.taxeditor.editor.internal;
 
 import org.apache.log4j.Logger;

-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;

 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
index c8bda647690f55cdc06bda506756eddb9072e270..b9511d9bab4306bad928748eb690f5a0470223ee 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
@@ -48,7 +48,7 @@ public class AcceptedNameComposite extends NameComposite {
        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r

-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r

                return taxon.getName();\r
        }\r
        \r
                return taxon.getName();\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
index 35f59008dc40aa47dccc4ad36c116f163c0fc3e9..082b736d26fac458ad7c13717fe1a7d4ed36df95 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r


@@ -23,8 +22,6 @@ import eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource;
  */\r
 public class BasionymSynonymPropertySource extends SynonymPropertySource\r
                implements IPropertySource {\r
  */\r
 public class BasionymSynonymPropertySource extends SynonymPropertySource\r
                implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(BasionymSynonymPropertySource.class);\r

        /**\r
         * @param synonym\r
         */\r
        /**\r
         * @param synonym\r
         */\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/CdmParserController.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/CdmParserController.java
index b09ac3d230b7d359fe1136e3ea25bd3a0a10aa07..20d1ae3f0d4a4c9097ecde3b0823982f398ec0f5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/CdmParserController.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/CdmParserController.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r


@@ -24,12 +22,10 @@ import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
  * @version 1.0\r
  */\r
 public class CdmParserController {\r
  * @version 1.0\r
  */\r
 public class CdmParserController {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CdmParserController.class);\r

        \r
        private static INonViralNameParser nonViralNameParser;\r
        \r
        \r
        private static INonViralNameParser nonViralNameParser;\r
        \r

-       private static INonViralNameParser getNonViralNameParser() {\r
+       private static INonViralNameParser<NonViralName<?>> getNonViralNameParser() {\r

                if (nonViralNameParser == null) {\r
                        nonViralNameParser = NonViralNameParserImpl.NewInstance();\r
                }\r
                if (nonViralNameParser == null) {\r
                        nonViralNameParser = NonViralNameParserImpl.NewInstance();\r
                }\r


@@ -53,7 +49,7 @@ public class CdmParserController {
         * @param rank\r
         * @return\r
         */\r
         * @param rank\r
         * @return\r
         */\r

-       public static TaxonNameBase parseFullReference(String fullReference,\r
+       public static TaxonNameBase<?, ?> parseFullReference(String fullReference,\r

                        NomenclaturalCode nomCode, Rank rank) {\r
                \r
                // FIXME whatever needs to be fixed here\r
                        NomenclaturalCode nomCode, Rank rank) {\r
                \r
                // FIXME whatever needs to be fixed here\r


@@ -61,7 +57,7 @@ public class CdmParserController {
 //                     nomCode = PreferencesUtil.getPreferredNomenclaturalCode();\r
 //             }\r
                \r
 //                     nomCode = PreferencesUtil.getPreferredNomenclaturalCode();\r
 //             }\r
                \r

-               TaxonNameBase name = getNonViralNameParser().parseReferencedName(fullReference,\r
+               TaxonNameBase<?, ?> name = getNonViralNameParser().parseReferencedName(fullReference,\r

                                nomCode, rank);\r
 \r
                if (name.hasProblem()) {\r
                                nomCode, rank);\r
 \r
                if (name.hasProblem()) {\r


@@ -80,7 +76,7 @@ public class CdmParserController {
         * @param rank\r
         * @param makeEmpty\r
         */\r
         * @param rank\r
         * @param makeEmpty\r
         */\r

-       public static void parseFullReference(NonViralName nameToBeFilled, String fullReference) {\r
+       public static void parseFullReference(NonViralName<?> nameToBeFilled, String fullReference) {\r

                \r
                Rank rank = null;\r
                boolean makeEmpty = true;\r
                \r
                Rank rank = null;\r
                boolean makeEmpty = true;\r


@@ -103,7 +99,7 @@ public class CdmParserController {
         * @param rank\r
         * @param makeEmpty\r
         */\r
         * @param rank\r
         * @param makeEmpty\r
         */\r

-       public static void parseFullName(NonViralName nameToBeFilled,\r
+       public static void parseFullName(NonViralName<?> nameToBeFilled,\r

                        String fullNameString, Rank rank, boolean makeEmpty) {\r
                getNonViralNameParser().parseFullName(nameToBeFilled, fullNameString,\r
                                rank, makeEmpty);\r
                        String fullNameString, Rank rank, boolean makeEmpty) {\r
                getNonViralNameParser().parseFullName(nameToBeFilled, fullNameString,\r
                                rank, makeEmpty);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
index 86b92a1746bec64bdeba0ad37c0d9ef8cf46b283..9bb9a61eb871e53f0f759375b818c4f0c310a754 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r


@@ -26,8 +25,6 @@ import eu.etaxonomy.taxeditor.propertysheet.name.ConceptPropertySource;
  * @version 1.0\r
  */\r
 public class ConceptComposite extends NameComposite {\r
  * @version 1.0\r
  */\r
 public class ConceptComposite extends NameComposite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ConceptComposite.class);\r

        \r
        private Taxon relatedTaxon;\r
        private TaxonRelationshipType relationshipType;\r
        \r
        private Taxon relatedTaxon;\r
        private TaxonRelationshipType relationshipType;\r


@@ -45,7 +42,7 @@ public class ConceptComposite extends NameComposite {
                this.taxon = editor.getTaxon();\r
                this.relatedTaxon = relatedTaxon;\r
                this.relationshipType = relationshipType;\r
                this.taxon = editor.getTaxon();\r
                this.relatedTaxon = relatedTaxon;\r
                this.relationshipType = relationshipType;\r

-               this.acceptedTaxonIsFromTaxon = acceptedTaxonIsFromTaxon;\r
+               this.setAcceptedTaxonIsFromTaxon(acceptedTaxonIsFromTaxon);\r

                \r
                setIsDraggable(true);\r
                setIcon(CONCEPT_ICON);\r
                \r
                setIsDraggable(true);\r
                setIcon(CONCEPT_ICON);\r


@@ -107,7 +104,7 @@ public class ConceptComposite extends NameComposite {
                return relatedTaxon;\r
        }\r
        \r
                return relatedTaxon;\r
        }\r
        \r

-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r

                return relatedTaxon.getName();\r
        }\r
        \r
                return relatedTaxon.getName();\r
        }\r
        \r


@@ -120,6 +117,20 @@ public class ConceptComposite extends NameComposite {
        public Object getData () {\r
                return getRelatedTaxon();\r
        }\r
        public Object getData () {\r
                return getRelatedTaxon();\r
        }\r

+\r
+       /**\r
+        * @param acceptedTaxonIsFromTaxon the acceptedTaxonIsFromTaxon to set\r
+        */\r
+       public void setAcceptedTaxonIsFromTaxon(boolean acceptedTaxonIsFromTaxon) {\r
+               this.acceptedTaxonIsFromTaxon = acceptedTaxonIsFromTaxon;\r
+       }\r
+\r
+       /**\r
+        * @return the acceptedTaxonIsFromTaxon\r
+        */\r
+       public boolean isAcceptedTaxonIsFromTaxon() {\r
+               return acceptedTaxonIsFromTaxon;\r
+       }\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/INameEditorCompositeRepository.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/INameEditorCompositeRepository.java
index 52ce0289832f30789ebd1219a25aa0a6f6c162d3..1fee721bcfb054efebef13f98de7d4a3e73e0fc7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/INameEditorCompositeRepository.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/INameEditorCompositeRepository.java
@@ -14,7 +14,6 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r

-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/IterableSynonymyList.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/IterableSynonymyList.java
index e6d49eeccbe406ef001dfcdc1810b3b05cb904d9..9a3acc8b35e3dba3089b01c255835cd9c9f803a4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/IterableSynonymyList.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/IterableSynonymyList.java
@@ -14,13 +14,10 @@ import java.util.Iterator;
 import java.util.List;\r
 import java.util.Set;\r
 \r
 import java.util.List;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r

-import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r

 \r
 /**\r
  * Retrieves the elements of a <code>Taxon</code>'s synonymy list, including misapplied names,\r
 \r
 /**\r
  * Retrieves the elements of a <code>Taxon</code>'s synonymy list, including misapplied names,\r


@@ -34,8 +31,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
  * @version 1.0\r
  */\r
 public class IterableSynonymyList implements Iterable<TaxonBase> {\r
  * @version 1.0\r
  */\r
 public class IterableSynonymyList implements Iterable<TaxonBase> {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(IterableSynonymyList.class);\r

        \r
        private Taxon taxon;\r
 \r
        \r
        private Taxon taxon;\r
 \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
index b60b64b63108f619d2f87fb9cd1306c343551bdb..fdb03fe4045332afacda1b0ba97623cee043f15d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.operations.IUndoableOperation;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.core.commands.operations.IUndoableOperation;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.widgets.Composite;\r


@@ -28,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.operations.ChangeConceptToSynonymOperation;
  * @version 1.0\r
  */\r
 public class MisappliedNameComposite extends NameComposite {\r
  * @version 1.0\r
  */\r
 public class MisappliedNameComposite extends NameComposite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(MisappliedNameComposite.class);\r

        \r
        private Taxon misappliedName;\r
        \r
        \r
        private Taxon misappliedName;\r
        \r


@@ -106,7 +103,7 @@ public class MisappliedNameComposite extends NameComposite {
        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r

-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r

                return misappliedName.getName();\r
        }\r
        \r
                return misappliedName.getName();\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
index 606bb3b0b231c277c8f168810f939c59a7b89ff2..552a6a001958032c9d553e2849e1cbdfa76575da 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
@@ -9,11 +9,8 @@
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.name;\r
 \r

-import java.beans.PropertyChangeEvent;\r
-import java.beans.PropertyChangeListener;\r

 import java.util.Set;\r
 \r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.action.Action;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.jface.action.Action;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r


@@ -26,7 +23,6 @@ import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r

-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r

 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r


@@ -49,7 +45,6 @@ import eu.etaxonomy.taxeditor.store.operations.CreateSynonymInNewGroupOperation;
  * @version 1.0\r
  */\r
 public abstract class NameComposite extends GroupedComposite{\r
  * @version 1.0\r
  */\r
 public abstract class NameComposite extends GroupedComposite{\r

-       private static final Logger logger = Logger.getLogger(NameComposite.class);\r

 \r
        /**\r
         * ************ COMPOSITE TYPES ************\r
 \r
        /**\r
         * ************ COMPOSITE TYPES ************\r


@@ -133,7 +128,7 @@ public abstract class NameComposite extends GroupedComposite{
         * @param managedForm\r
         */\r
        public NameComposite(AbstractTaxonEditor editor, Composite parent, \r
         * @param managedForm\r
         */\r
        public NameComposite(AbstractTaxonEditor editor, Composite parent, \r

-                       String compositeType, TaxonBase taxonBase) {\r
+                       String compositeType, TaxonBase<?> taxonBase) {\r

                super(editor, parent);\r
 \r
                createTextViewer();\r
                super(editor, parent);\r
 \r
                createTextViewer();\r


@@ -157,7 +152,7 @@ public abstract class NameComposite extends GroupedComposite{
         * \r
         */\r
        private void showNameRelations() {\r
         * \r
         */\r
        private void showNameRelations() {\r

-               TaxonNameBase name = getName();\r
+               TaxonNameBase<?, ?> name = getName();\r

                if (name == null) {\r
                        return;\r
                }\r
                if (name == null) {\r
                        return;\r
                }\r


@@ -167,7 +162,7 @@ public abstract class NameComposite extends GroupedComposite{
                }\r
                for (NameRelationship nameRelation : nameRelations) {\r
                        String typeLabel = null;\r
                }\r
                for (NameRelationship nameRelation : nameRelations) {\r
                        String typeLabel = null;\r

-                       TaxonNameBase relatedName = null; \r
+                       TaxonNameBase<?, ?> relatedName = null; \r

                        \r
                        boolean isZoological = name instanceof ZoologicalName ? true : false; \r
                        \r
                        \r
                        boolean isZoological = name instanceof ZoologicalName ? true : false; \r
                        \r


@@ -185,7 +180,7 @@ public abstract class NameComposite extends GroupedComposite{
                }\r
        }\r
                \r
                }\r
        }\r
                \r

-       protected void initTextViewer(TaxonBase taxonBase) {\r
+       protected void initTextViewer(TaxonBase<?> taxonBase) {\r

                \r
                showNameRelations();\r
                \r
                \r
                showNameRelations();\r
                \r


@@ -235,11 +230,8 @@ public abstract class NameComposite extends GroupedComposite{
                isUseParser = true;\r
        }\r
        \r
                isUseParser = true;\r
        }\r
        \r

-       private void deactivateParser() {\r
-               isUseParser = false;\r
-       }\r
-       \r
-       protected abstract TaxonNameBase getName();\r
+       // FIXME we do have a naming conflict here \r
+       protected abstract TaxonNameBase<?, ?> getName();\r

        \r
        protected void calculateErrors() {\r
                textViewer.clearErrors();\r
        \r
        protected void calculateErrors() {\r
                textViewer.clearErrors();\r


@@ -252,7 +244,7 @@ public abstract class NameComposite extends GroupedComposite{
                                ("New Heterotypic Synonym", editor.getUndoContext(), editor.getTaxon(), text, editor));\r
        }\r
        \r
                                ("New Heterotypic Synonym", editor.getUndoContext(), editor.getTaxon(), text, editor));\r
        }\r
        \r

-       protected IPropertySource getPropertySourceByName(TaxonNameBase name) {\r
+       protected IPropertySource getPropertySourceByName(TaxonNameBase<?, ?> name) {\r

                if (name == null) {\r
                        return null;\r
                }\r
                if (name == null) {\r
                        return null;\r
                }\r


@@ -264,7 +256,7 @@ public abstract class NameComposite extends GroupedComposite{
                        return new ZoologicalNamePropertySource((ZoologicalName) name);\r
                }\r
                if (name instanceof NonViralName) {\r
                        return new ZoologicalNamePropertySource((ZoologicalName) name);\r
                }\r
                if (name instanceof NonViralName) {\r

-                       return new NonViralNamePropertySource((NonViralName) name);\r
+                       return new NonViralNamePropertySource((NonViralName<?>) name);\r

                }\r
                \r
                return null;\r
                }\r
                \r
                return null;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSearchDialog.java
index bc54c87b74a907021942723d9a8b0a041c932a2e..2a134780c1462369904a14d16a6ec4f6faabae81 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSearchDialog.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 \r
 import java.util.List;\r
 \r
 \r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r


@@ -45,8 +44,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class NameSearchDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class NameSearchDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameSearchDialog.class);\r

        \r
        private Table resultsTable;\r
        protected Text searchTermText;\r
        \r
        private Table resultsTable;\r
        protected Text searchTermText;\r


@@ -55,16 +52,12 @@ public class NameSearchDialog extends Dialog {
        protected Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r
        protected Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r

-       private TaxonNameBase selectedName;\r
-       private int searchType;\r
-       \r
+       private TaxonNameBase<?, ?> selectedName;\r

        protected String dialogTitle = "Search for a name in datasource";\r
        protected String dialogMessage = "Enter a search term for a scientific name, using '*' as a wildcard.";\r
        \r
        public NameSearchDialog(Shell parent, int searchType) {\r
                super(parent, SWT.NONE);\r
        protected String dialogTitle = "Search for a name in datasource";\r
        protected String dialogMessage = "Enter a search term for a scientific name, using '*' as a wildcard.";\r
        \r
        public NameSearchDialog(Shell parent, int searchType) {\r
                super(parent, SWT.NONE);\r

-               \r
-               this.searchType = searchType;\r

        }\r
 \r
        public NameSearchDialog(Shell parent) {\r
        }\r
 \r
        public NameSearchDialog(Shell parent) {\r


@@ -239,11 +232,12 @@ public class NameSearchDialog extends Dialog {
         */\r
        protected String getText(Object element) {\r
                if (element instanceof TaxonNameBase) {\r
         */\r
        protected String getText(Object element) {\r
                if (element instanceof TaxonNameBase) {\r

-                       return ((TaxonNameBase) element).getTitleCache();\r
+                       return ((TaxonNameBase<?, ?>) element).getTitleCache();\r

                }\r
                return null;\r
        }\r
 \r
                }\r
                return null;\r
        }\r
 \r

+       // FIXME loose typification \r

        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = doSearch();\r
        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = doSearch();\r


@@ -260,6 +254,7 @@ public class NameSearchDialog extends Dialog {
                okButton.setEnabled(false);             \r
        }\r
        \r
                okButton.setEnabled(false);             \r
        }\r
        \r

+       // FIXME loose typification\r

        protected List doSearch() {\r
                return CdmStore.searchNameString(searchTermText.getText());\r
        }\r
        protected List doSearch() {\r
                return CdmStore.searchNameString(searchTermText.getText());\r
        }\r


@@ -272,11 +267,11 @@ public class NameSearchDialog extends Dialog {
                shell.dispose();\r
        }\r
        \r
                shell.dispose();\r
        }\r
        \r

-       private void setSelectedName(TaxonNameBase selectedName) {\r
+       private void setSelectedName(TaxonNameBase<?, ?> selectedName) {\r

                this.selectedName = selectedName;\r
        }\r
        \r
                this.selectedName = selectedName;\r
        }\r
        \r

-       private TaxonNameBase getSelectedName() {\r
+       private TaxonNameBase<?, ?> getSelectedName() {\r

                return selectedName;\r
        }\r
 }\r
                return selectedName;\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSelectComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSelectComposite.java
index acf7a2b0f7c7c193cc33a3cf870bde2d1d4d70f3..cf5f1f11cb70f157acc652920a734cc3b09e5e20 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSelectComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSelectComposite.java
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyChangeSupport;\r
 \r
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyChangeSupport;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.ModifyEvent;\r
 import org.eclipse.swt.events.ModifyListener;\r


@@ -37,10 +36,8 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @version 1.0\r
  */\r
 public class NameSelectComposite extends Composite {\r
  * @version 1.0\r
  */\r
 public class NameSelectComposite extends Composite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameSelectComposite.class);\r

        \r
        \r

-       private TaxonNameBase savedName;\r
+       private TaxonNameBase<?, ?> savedName;\r

        private Text txtName;\r
        private Button btnClearName;\r
        \r
        private Text txtName;\r
        private Button btnClearName;\r
        \r


@@ -132,7 +129,7 @@ public class NameSelectComposite extends Composite {
                propertyChangeSupport.addPropertyChangeListener(NAME, listener);\r
        }\r
        \r
                propertyChangeSupport.addPropertyChangeListener(NAME, listener);\r
        }\r
        \r

-       public void setName(TaxonNameBase name) {\r
+       public void setName(TaxonNameBase<?, ?> name) {\r

                savedName = name;\r
                txtName.setText(name.getTitleCache());\r
                txtName.setEditable(false);\r
                savedName = name;\r
                txtName.setText(name.getTitleCache());\r
                txtName.setEditable(false);\r


@@ -148,14 +145,14 @@ public class NameSelectComposite extends Composite {
         Object value = ((NameSearchDialog) dialog).open();\r
         \r
                if (value instanceof TaxonNameBase) {\r
         Object value = ((NameSearchDialog) dialog).open();\r
         \r
                if (value instanceof TaxonNameBase) {\r

-                       setSavedName((TaxonNameBase) value);\r
+                       setSavedName((TaxonNameBase<?, ?>) value);\r

                }\r
        }\r
 \r
        /**\r
         * @param value\r
         */\r
                }\r
        }\r
 \r
        /**\r
         * @param value\r
         */\r

-       private void setSavedName(TaxonNameBase name) {\r
+       private void setSavedName(TaxonNameBase<?, ?> name) {\r

                \r
                savedName = name;\r
                \r
                \r
                savedName = name;\r
                \r


@@ -181,8 +178,8 @@ public class NameSelectComposite extends Composite {
         *  \r
         * @return\r
         */\r
         *  \r
         * @return\r
         */\r

-       public TaxonNameBase getName() {\r
-               TaxonNameBase name = null;\r
+       public TaxonNameBase<?, ?> getName() {\r
+               TaxonNameBase<?, ?> name = null;\r

            if (savedName != null) {\r
                name = savedName;\r
                } else {\r
            if (savedName != null) {\r
                name = savedName;\r
                } else {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
index cca9480226c812ec93e4ed7b816bacff900d6e8e..024e626e10b43a7a025a478888691b09fc17dd48 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
@@ -13,12 +13,7 @@ import java.util.Iterator;
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r

-import org.eclipse.core.resources.IMarker;\r
-import org.eclipse.core.resources.IWorkspaceRunnable;\r
-import org.eclipse.core.resources.ResourcesPlugin;\r

 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.core.runtime.Assert;\r

-import org.eclipse.core.runtime.CoreException;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r

 import org.eclipse.jface.text.Document;\r
 import org.eclipse.jface.text.IUndoManager;\r
 import org.eclipse.jface.text.IUndoManagerExtension;\r
 import org.eclipse.jface.text.Document;\r
 import org.eclipse.jface.text.IUndoManager;\r
 import org.eclipse.jface.text.IUndoManagerExtension;\r


@@ -28,7 +23,6 @@ import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.AnnotationModel;\r
 import org.eclipse.jface.text.source.AnnotationPainter;\r
 import org.eclipse.jface.text.source.IAnnotationAccess;\r
 import org.eclipse.jface.text.source.AnnotationModel;\r
 import org.eclipse.jface.text.source.AnnotationPainter;\r
 import org.eclipse.jface.text.source.IAnnotationAccess;\r

-import org.eclipse.jface.text.source.IAnnotationModel;\r

 import org.eclipse.jface.text.source.IVerticalRuler;\r
 import org.eclipse.jface.text.source.SourceViewer;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.jface.text.source.IVerticalRuler;\r
 import org.eclipse.jface.text.source.SourceViewer;\r
 import org.eclipse.swt.SWT;\r


@@ -41,7 +35,6 @@ import org.eclipse.swt.widgets.Layout;
 import org.eclipse.ui.IActionBars;\r
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.ui.actions.ActionFactory;\r
 import org.eclipse.ui.IActionBars;\r
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.ui.actions.ActionFactory;\r

-import org.eclipse.ui.editors.text.EditorsUI;\r

 import org.eclipse.ui.forms.widgets.TableWrapData;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
 import org.eclipse.ui.operations.OperationHistoryActionHandler;\r
 import org.eclipse.ui.forms.widgets.TableWrapData;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
 import org.eclipse.ui.operations.OperationHistoryActionHandler;\r


@@ -49,7 +42,6 @@ import org.eclipse.ui.operations.RedoActionHandler;
 import org.eclipse.ui.operations.UndoActionHandler;\r
 import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;\r
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;\r
 import org.eclipse.ui.operations.UndoActionHandler;\r
 import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;\r
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;\r

-import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;\r

 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r


@@ -75,8 +67,6 @@ public class NameViewer extends SourceViewer {
        private IVerticalRuler ruler;\r
        private AnnotationModel annotationModel;\r
 \r
        private IVerticalRuler ruler;\r
        private AnnotationModel annotationModel;\r
 \r

-       private SourceViewerDecorationSupport decorationSupport;\r
-\r

        public NameViewer(Composite parent) {\r
                super(parent, new RulerWithIcon(RULER_WIDTH), SWT.WRAP | SWT.MULTI | SWT.RESIZE);\r
                                                                                        \r
        public NameViewer(Composite parent) {\r
                super(parent, new RulerWithIcon(RULER_WIDTH), SWT.WRAP | SWT.MULTI | SWT.RESIZE);\r
                                                                                        \r


@@ -109,15 +99,6 @@ public class NameViewer extends SourceViewer {
                **/\r
        }\r
        \r
                **/\r
        }\r
        \r

-/**\r
-        * \r
-        */\r
-       private void setDecorationSupport() {\r
-               decorationSupport = new SourceViewerDecorationSupport(this, null, null, EditorsUI.getSharedTextColors());\r
-               decorationSupport.setCursorLinePainterPreferenceKeys("currentLine", "currentLineColor");\r
-               decorationSupport.install(EditorsUI.getPreferenceStore());\r
-       }\r
-\r

        public void setBackground(Color color) {\r
                // Set background color of ruler\r
                ruler.getControl().setBackground(color);\r
        public void setBackground(Color color) {\r
                // Set background color of ruler\r
                ruler.getControl().setBackground(color);\r


@@ -191,7 +172,7 @@ public class NameViewer extends SourceViewer {
         * \r
         * @param name\r
         */\r
         * \r
         * @param name\r
         */\r

-       public void setShowParsingError(TaxonNameBase name) {\r
+       public void setShowParsingError(TaxonNameBase<?, ?> name) {\r

                \r
 //             testMarkers();\r
                \r
                \r
 //             testMarkers();\r
                \r


@@ -231,33 +212,13 @@ public class NameViewer extends SourceViewer {
                        \r
                        String text = "This taxon requires a sec. reference.";\r
                        \r
                        \r
                        String text = "This taxon requires a sec. reference.";\r
                        \r

-                       IAnnotationModel model = this.getAnnotationModel();\r

                        this.getAnnotationModel().addAnnotation(\r
                                        new ErrorAnnotation(0, text),\r
                                        new Position(0, 0));\r
 //                                     new Position(0, getTextWidget().getText().length()));\r
                }\r
        }\r
                        this.getAnnotationModel().addAnnotation(\r
                                        new ErrorAnnotation(0, text),\r
                                        new Position(0, 0));\r
 //                                     new Position(0, getTextWidget().getText().length()));\r
                }\r
        }\r

-       \r
-       private void testMarkers() {\r
-               // Successful test of markers which show up in ProblemView \r
-               try {\r
-                       IWorkspaceRunnable editorMarker = new IWorkspaceRunnable() {\r
-                               public void run(IProgressMonitor monitor) throws CoreException { \r
-                                       IMarker marker = ResourcesPlugin.getWorkspace().getRoot().createMarker(IMarker.PROBLEM);\r
-                                       marker.setAttribute(IMarker.MESSAGE, "Testeroo");\r
-                                       marker.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);\r
-                                       marker.setAttribute(IMarker.LINE_NUMBER, 1);\r
-                                       marker.setAttribute(IMarker.TRANSIENT, false);\r
-                                       marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);                                          \r
-                               }\r
-                       };\r
-                       ResourcesPlugin.getWorkspace().run(editorMarker, null); \r
-                       \r
-               } catch (CoreException e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
+\r

                        \r
        public void setText(String text) {\r
                if (text == null) {\r
                        \r
        public void setText(String text) {\r
                if (text == null) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/RulerWithIcon.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/RulerWithIcon.java
index a61d10f8406ff2495d3a2eb645e4388e562dde71..4a49a6693ff48d82296a97c5616936f97b5ab682 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/RulerWithIcon.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/RulerWithIcon.java
@@ -44,7 +44,6 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.graphics.Point;\r
 import org.eclipse.swt.graphics.Rectangle;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.graphics.Point;\r
 import org.eclipse.swt.graphics.Rectangle;\r

-import org.eclipse.swt.layout.GridData;\r

 import org.eclipse.swt.widgets.Canvas;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Canvas;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r


@@ -337,7 +336,7 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
                int maxLayer= 1;        // loop at least once though layers.\r
 \r
                for (int layer= 0; layer < maxLayer; layer++) {\r
                int maxLayer= 1;        // loop at least once though layers.\r
 \r
                for (int layer= 0; layer < maxLayer; layer++) {\r

-                       Iterator iter= fModel.getAnnotationIterator();\r
+                       Iterator<?> iter= fModel.getAnnotationIterator();\r

                        while (iter.hasNext()) {\r
                                IAnnotationPresentation annotationPresentation= null;\r
                                Annotation annotation= (Annotation) iter.next();\r
                        while (iter.hasNext()) {\r
                                IAnnotationPresentation annotationPresentation= null;\r
                                Annotation annotation= (Annotation) iter.next();\r


@@ -424,7 +423,7 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
                int maxLayer= 1;        // loop at least once through layers.\r
 \r
                for (int layer= 0; layer < maxLayer; layer++) {\r
                int maxLayer= 1;        // loop at least once through layers.\r
 \r
                for (int layer= 0; layer < maxLayer; layer++) {\r

-                       Iterator iter= fModel.getAnnotationIterator();\r
+                       Iterator<?> iter= fModel.getAnnotationIterator();\r

                        while (iter.hasNext()) {\r
                                IAnnotationPresentation annotationPresentation= null;\r
                                Annotation annotation= (Annotation) iter.next();\r
                        while (iter.hasNext()) {\r
                                IAnnotationPresentation annotationPresentation= null;\r
                                Annotation annotation= (Annotation) iter.next();\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
index d4df27f25a62e4d63d77f8ebd1a872de40c22208..8052078e0c54964e0b6828ca457b01666c434720 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
@@ -119,7 +119,7 @@ public class SynonymComposite extends NameComposite {
        }\r
 \r
        @Override\r
        }\r
 \r
        @Override\r

-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r

                return synonym.getName();\r
        }\r
        \r
                return synonym.getName();\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonSearchDialog.java
index 10f1261be7f241960d73842d5364b08830bed838..1e732a92bd92f4660dca1c7d0cfebdc17f4d7301 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonSearchDialog.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 \r
 import java.util.List;\r
 \r
 \r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.widgets.Shell;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import org.eclipse.swt.widgets.Shell;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r


@@ -24,8 +23,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class TaxonSearchDialog extends NameSearchDialog {\r
  * @version 1.0\r
  */\r
 public class TaxonSearchDialog extends NameSearchDialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonSearchDialog.class);\r

        \r
        protected String dialogTitle = "Search for a taxib in datasource";\r
        protected String dialogMessage = "Enter a search term for a taxon, using '*' as a wildcard.";\r
        \r
        protected String dialogTitle = "Search for a taxib in datasource";\r
        protected String dialogMessage = "Enter a search term for a taxon, using '*' as a wildcard.";\r


@@ -49,8 +46,8 @@ public class TaxonSearchDialog extends NameSearchDialog {
                this.excludeTaxon = excludeTaxon;\r
        }\r
        \r
                this.excludeTaxon = excludeTaxon;\r
        }\r
        \r

-       protected List doSearch() {\r
-               List results = CdmStore.searchTaxaByName(searchTermText.getText(), true);\r
+       protected List<?> doSearch() {\r
+               List<?> results = CdmStore.searchTaxaByName(searchTermText.getText(), true);\r

                if (excludeTaxon != null) {\r
                        results.remove(excludeTaxon);\r
                }\r
                if (excludeTaxon != null) {\r
                        results.remove(excludeTaxon);\r
                }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeConceptRelationshipTypeMenu.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeConceptRelationshipTypeMenu.java
index 1469cca23d334ae7231bc812cab057398c8f55a4..a1abb78d93d69da482c2519d78cce64a866c95c1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeConceptRelationshipTypeMenu.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeConceptRelationshipTypeMenu.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.editor.name.handler;
 
 
 package eu.etaxonomy.taxeditor.editor.name.handler;
 

-import org.apache.log4j.Logger;

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
index 3d3315f5ff2453efde0c3cdc0ccf32ae13498e5e..2ae289ec87c0e448f8d9b143522e0984d423c731 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.reference;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r


@@ -47,8 +46,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class ReferenceSearchDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class ReferenceSearchDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ReferenceSearchDialog.class);\r

        \r
        private Table resultsTable;\r
        private Text searchTermText;\r
        \r
        private Table resultsTable;\r
        private Text searchTermText;\r


@@ -57,7 +54,7 @@ public class ReferenceSearchDialog extends Dialog {
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r

-       private ReferenceBase selectedReference;\r
+       private ReferenceBase<?> selectedReference;\r

        private int searchType;\r
        \r
        public ReferenceSearchDialog(Shell parent, int searchType) {\r
        private int searchType;\r
        \r
        public ReferenceSearchDialog(Shell parent, int searchType) {\r


@@ -158,7 +155,7 @@ public class ReferenceSearchDialog extends Dialog {
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r

-                                       return ((ReferenceBase) element).getTitleCache();\r
+                                       return ((ReferenceBase<?>) element).getTitleCache();\r

                                }\r
                                return super.getText(element);\r
                        }\r
                                }\r
                                return super.getText(element);\r
                        }\r


@@ -176,7 +173,7 @@ public class ReferenceSearchDialog extends Dialog {
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof ReferenceBase) {\r
 \r
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof ReferenceBase) {\r
 \r

-                                       setSelectedReference((ReferenceBase) data);\r
+                                       setSelectedReference((ReferenceBase<?>) data);\r

                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r
                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r


@@ -225,6 +222,7 @@ public class ReferenceSearchDialog extends Dialog {
 \r
        }\r
        \r
 \r
        }\r
        \r

+       // FIXME strange typification\r

        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.getReferencesByTitle(searchTermText.getText());\r
        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.getReferencesByTitle(searchTermText.getText());\r


@@ -260,11 +258,11 @@ public class ReferenceSearchDialog extends Dialog {
                shell.dispose();\r
        }\r
        \r
                shell.dispose();\r
        }\r
        \r

-       private void setSelectedReference(ReferenceBase selectedReference) {\r
+       private void setSelectedReference(ReferenceBase<?> selectedReference) {\r

                this.selectedReference = selectedReference;\r
        }\r
        \r
                this.selectedReference = selectedReference;\r
        }\r
        \r

-       private ReferenceBase getSelectedReference() {\r
+       private ReferenceBase<?> getSelectedReference() {\r

                return selectedReference;\r
        }\r
 }\r
                return selectedReference;\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSelectComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSelectComposite.java
index dcd9d997ed65e5ed6c57ae95ff22e28ef2b45e33..c979906c7641a4572c3414f4d766800052326d16 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSelectComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSelectComposite.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.editor.reference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.editor.reference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r


@@ -33,9 +32,7 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @version 1.0\r
  */\r
 public class ReferenceSelectComposite extends Composite {\r
  * @version 1.0\r
  */\r
 public class ReferenceSelectComposite extends Composite {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ReferenceSelectComposite.class);\r
-       private ReferenceBase savedReference;\r
+       private ReferenceBase<?> savedReference;\r

        private Text txtReference;\r
        private Button btnClearReference;\r
        private Text txtMicroRef;\r
        private Text txtReference;\r
        private Button btnClearReference;\r
        private Text txtMicroRef;\r


@@ -113,7 +110,7 @@ public class ReferenceSelectComposite extends Composite {
                txtMicroRef.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));\r
        }\r
        \r
                txtMicroRef.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));\r
        }\r
        \r

-       public void setReference(ReferenceBase reference) {\r
+       public void setReference(ReferenceBase<?> reference) {\r

                savedReference = reference;\r
                txtReference.setText(reference.getTitleCache());\r
                txtReference.setEditable(false);\r
                savedReference = reference;\r
                txtReference.setText(reference.getTitleCache());\r
                txtReference.setEditable(false);\r


@@ -134,14 +131,14 @@ public class ReferenceSelectComposite extends Composite {
         Object value = ((ReferenceSearchDialog) dialog).open();\r
         \r
                if (value instanceof ReferenceBase) {\r
         Object value = ((ReferenceSearchDialog) dialog).open();\r
         \r
                if (value instanceof ReferenceBase) {\r

-                       setSavedReference((ReferenceBase) value);\r
+                       setSavedReference((ReferenceBase<?>) value);\r

                }\r
        }\r
 \r
        /**\r
         * @param value\r
         */\r
                }\r
        }\r
 \r
        /**\r
         * @param value\r
         */\r

-       private void setSavedReference(ReferenceBase reference) {\r
+       private void setSavedReference(ReferenceBase<?> reference) {\r

                \r
                savedReference = reference;\r
                \r
                \r
                savedReference = reference;\r
                \r


@@ -167,8 +164,8 @@ public class ReferenceSelectComposite extends Composite {
         *  \r
         * @return\r
         */\r
         *  \r
         * @return\r
         */\r

-       public ReferenceBase getReference() {\r
-               ReferenceBase reference = null;\r
+       public ReferenceBase<?> getReference() {\r
+               ReferenceBase<?> reference = null;\r

            if (savedReference != null) {\r
                reference = savedReference;\r
                } else {\r
            if (savedReference != null) {\r
                reference = savedReference;\r
                } else {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
index 8f9d5d3b65a87237be291295679f4a87f5e7656c..333b95e0ae4571d885ef9351987e735e67b4376d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r


@@ -20,8 +19,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0\r
  */\r
 abstract public class AbstractEditorPropertySheet implements IPropertySource {\r
  * @version 1.0\r
  */\r
 abstract public class AbstractEditorPropertySheet implements IPropertySource {\r

-       private static Logger logger = Logger\r
-                       .getLogger(AbstractEditorPropertySheet.class);\r

 \r
        /** \r
         * A reference to the taxon the concrete operation is working on \r
 \r
        /** \r
         * A reference to the taxon the concrete operation is working on \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java
index 733c9aa088f0aa86a081a4b30e83b48ad2736abf..58708238c03b53309b597c0bf63c9f88c47545ff 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java
@@ -2,15 +2,11 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \r
 import java.util.Collection;\r
 \r
 \r
 import java.util.Collection;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.common.Annotation;\r
 \r
 public class AnnotationPropertySource extends CollectionPropertySource {\r
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 \r
 public class AnnotationPropertySource extends CollectionPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(AnnotationPropertySource.class);\r

 \r
 \r

-       public AnnotationPropertySource(Collection collection) {\r
+       public AnnotationPropertySource(Collection<?> collection) {\r

                super(collection);\r
        }\r
        \r
                super(collection);\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsDialog.java
index e67f69c27359e00164db1c34d6ab4d6b4da77a9b..99c3295d0fa0024812a5dd581ebeae22e0ec562f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsDialog.java
@@ -3,7 +3,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r


@@ -37,13 +36,10 @@ public class AnnotationsDialog extends Dialog {
 \r
        private Text text;\r
        private Table table;\r
 \r
        private Text text;\r
        private Table table;\r

-       private static final Logger logger = Logger\r
-                       .getLogger(AnnotationsDialog.class);\r

        protected Object result;\r
        protected Shell shell;\r
        \r
        private WritableList list = new WritableList();\r
        protected Object result;\r
        protected Shell shell;\r
        \r
        private WritableList list = new WritableList();\r

-       private Annotation selectedAnnotation;\r

        private AnnotatableEntity entity;\r
 \r
        /**\r
        private AnnotatableEntity entity;\r
 \r
        /**\r


@@ -172,7 +168,7 @@ public class AnnotationsDialog extends Dialog {
                okButton.addMouseListener(new MouseAdapter() {\r
                        @Override\r
                        public void mouseUp(MouseEvent e) {\r
                okButton.addMouseListener(new MouseAdapter() {\r
                        @Override\r
                        public void mouseUp(MouseEvent e) {\r

-                               result = new HashSet(list);\r
+                               result = new HashSet<Object>(list);\r

                                shell.dispose();\r
                        }\r
                });\r
                                shell.dispose();\r
                        }\r
                });\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsPropertyDescriptor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsPropertyDescriptor.java
index 089405652629bbd9451290360f3d51dcda579b79..6e487b014bc1ff63e11793f08ea50a4e5da62ea2 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsPropertyDescriptor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsPropertyDescriptor.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \r
 import java.util.Set;\r
 \r
 \r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r


@@ -20,7 +19,6 @@ import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r

-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r

 \r
 /**\r
  * Property sheet descriptor that pops up a dialog window\r
 \r
 /**\r
  * Property sheet descriptor that pops up a dialog window\r


@@ -31,8 +29,6 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  * @version 1.0\r
  */\r
 abstract public class AnnotationsPropertyDescriptor extends PropertyDescriptor {\r
  * @version 1.0\r
  */\r
 abstract public class AnnotationsPropertyDescriptor extends PropertyDescriptor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(AnnotationsPropertyDescriptor.class);\r

        \r
        private AnnotatableEntity entity;\r
        \r
        \r
        private AnnotatableEntity entity;\r
        \r


@@ -53,7 +49,7 @@ abstract public class AnnotationsPropertyDescriptor extends PropertyDescriptor {
                        Object value = ((AnnotationsDialog) dialog).open();\r
                                if (value instanceof Set) {\r
                                        \r
                        Object value = ((AnnotationsDialog) dialog).open();\r
                                if (value instanceof Set) {\r
                                        \r

-                                       Set annotations = (Set) value;\r
+                                       Set<?> annotations = (Set<?>) value;\r

                                        saveAnnotations(annotations);\r
                                        return new AnnotationPropertySource(annotations);\r
                                }\r
                                        saveAnnotations(annotations);\r
                                        return new AnnotationPropertySource(annotations);\r
                                }\r


@@ -67,5 +63,5 @@ abstract public class AnnotationsPropertyDescriptor extends PropertyDescriptor {
         return editor;\r
     }\r
         \r
         return editor;\r
     }\r
         \r

-    abstract protected void saveAnnotations(Set set);  \r
+    abstract protected void saveAnnotations(Set<?> set);       \r

 }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxCellEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxCellEditor.java
index 14bed301be0320877288a224d47c7140ea59efe0..5684a455ce30151ec044610e5d334a220b10747f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxCellEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxCellEditor.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;\r
 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;\r


@@ -27,8 +26,6 @@ import org.eclipse.swt.widgets.Control;
  * @version 1.0\r
  */\r
 public class CheckboxCellEditor extends CellEditor {\r
  * @version 1.0\r
  */\r
 public class CheckboxCellEditor extends CellEditor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CheckboxCellEditor.class);\r

 \r
     /**\r
      * The checkbox value.\r
 \r
     /**\r
      * The checkbox value.\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxPropertyDescriptor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxPropertyDescriptor.java
index 77a418a88493c01e2b0ebf3aeeafed159ccd3ebc..2ae9b0daeb51a8b19145a24b1236d24de8ff70a3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxPropertyDescriptor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxPropertyDescriptor.java
@@ -1,13 +1,10 @@
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 public class CheckboxPropertyDescriptor extends PropertyDescriptor {\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 public class CheckboxPropertyDescriptor extends PropertyDescriptor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CheckboxPropertyDescriptor.class);\r

        \r
        public CheckboxPropertyDescriptor(Object id, String displayName) {\r
                super(id, displayName);\r
        \r
        public CheckboxPropertyDescriptor(Object id, String displayName) {\r
                super(id, displayName);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
index 452af1331cd4b2271798c7219c319a0ec853c5f4..91489b3600214d99b5f051ec54c9c7be0e3cd600 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
@@ -3,7 +3,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 import java.util.Collection;\r
 import java.util.Vector;\r
 \r
 import java.util.Collection;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r


@@ -14,21 +13,19 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
  * @version 1.0\r
  */\r
 abstract public class CollectionPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 abstract public class CollectionPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CollectionPropertySource.class);\r

 \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
 \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r

-       protected Collection collection;\r
+       protected Collection<?> collection;\r

        private Object collectionOwner;\r
        \r
        private Object collectionOwner;\r
        \r

-       public CollectionPropertySource(Collection collection) {\r
+       public CollectionPropertySource(Collection<?> collection) {\r

                this.collection = collection;\r
                for (Object item : collection) {\r
                        addDescriptor(item);\r
                }\r
        }\r
 \r
                this.collection = collection;\r
                for (Object item : collection) {\r
                        addDescriptor(item);\r
                }\r
        }\r
 \r

-       public CollectionPropertySource(Collection collection, Object collectionOwner) {\r
+       public CollectionPropertySource(Collection<?> collection, Object collectionOwner) {\r

                this.collection = collection;\r
                this.collectionOwner = collectionOwner;\r
                for (Object item : collection) {\r
                this.collection = collection;\r
                this.collectionOwner = collectionOwner;\r
                for (Object item : collection) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java
index 6f8353e66a892de2675e6a6833487b4212f975d6..34be6ef7b1e598ac0030150797c095d4a6e47fda 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java
@@ -23,6 +23,8 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 \r
 /**\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 \r
 /**\r

+ * FIXME This looks very incomplete\r
+ * \r

  * @author p.ciardelli\r
  * @created 19.05.2008\r
  * @version 1.0\r
  * @author p.ciardelli\r
  * @created 19.05.2008\r
  * @version 1.0\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
index d0bfe102ca1c9c6def1d47dd4c20e5adaff95f33..70fff20b676b7a65b373b3668b01dadf22791f96 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ICellEditorValidator;\r
 \r
 /**\r
 import org.eclipse.jface.viewers.ICellEditorValidator;\r
 \r
 /**\r


@@ -18,7 +17,6 @@ import org.eclipse.jface.viewers.ICellEditorValidator;
  * @version 1.0\r
  */\r
 public class DayValidator implements ICellEditorValidator {\r
  * @version 1.0\r
  */\r
 public class DayValidator implements ICellEditorValidator {\r

-       private static final Logger logger = Logger.getLogger(DayValidator.class);\r

 \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)\r
 \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java
index 9e3ada44883df24c18bb812f42c5153c71594ed5..5b1eb0d0e3623b8597d39eb5bf7c9ff1c59c6db0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java
@@ -8,7 +8,6 @@
 */\r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 */\r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.PropertySheetEntry;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import org.eclipse.ui.views.properties.PropertySheetEntry;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r


@@ -22,8 +21,6 @@ import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;
  * @version 1.0\r
  */\r
 public class EditorPropertySheetEntry extends PropertySheetEntry {\r
  * @version 1.0\r
  */\r
 public class EditorPropertySheetEntry extends PropertySheetEntry {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(EditorPropertySheetEntry.class);\r

        \r
        private AbstractTaxonEditor taxonEditor;\r
        \r
        \r
        private AbstractTaxonEditor taxonEditor;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java
index e87e71def79ca13c5689f5d72775f8836476a6c2..80775007986c7fcbd0a87d019723324afb339564 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java
@@ -13,7 +13,7 @@ public class MarkersPropertySource extends CollectionPropertySource {
                        .getLogger(MarkersPropertySource.class);\r
 \r
 \r
                        .getLogger(MarkersPropertySource.class);\r
 \r
 \r

-       public MarkersPropertySource(Collection collection) {\r
+       public MarkersPropertySource(Collection<?> collection) {\r

                super(collection);\r
 //             logger.warn("Markers collection contains " + collection.size() + " elements.");\r
        }\r
                super(collection);\r
 //             logger.warn("Markers collection contains " + collection.size() + " elements.");\r
        }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
index 22301e4d997d5c5cec51dae52eeb9ab2344128de..09584c155341b8db8e0ca96af48a63ec3d08f44f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
@@ -75,6 +75,7 @@ public class PropertySheetUtil {
                 * The property sheet listener ensures only property sheets\r
                 *      with data cause the Property Sheet to be updated.\r
                 */\r
                 * The property sheet listener ensures only property sheets\r
                 *      with data cause the Property Sheet to be updated.\r
                 */\r

+               @Deprecated // FIXME looks unused and does not make sense\r

                public static void addPropertySheetInputListener() {\r
                        IViewPart propertySheet = getPropertySheet();\r
        //              propertySheet.get\r
                public static void addPropertySheetInputListener() {\r
                        IViewPart propertySheet = getPropertySheet();\r
        //              propertySheet.get\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
index fce92a9ebea0a7143c8a28ab54919084e0538ebf..2b300129aa0f0c2cafbf89bac28724ae4f71dc11 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
@@ -11,11 +11,8 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \r
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyChangeSupport;\r
 \r
 import java.beans.PropertyChangeListener;\r
 import java.beans.PropertyChangeSupport;\r

-import java.text.DateFormat;\r
-import java.text.SimpleDateFormat;\r

 import java.util.Vector;\r
 \r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r


@@ -31,8 +28,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @version 1.0\r
  */\r
 public class TimePeriodPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class TimePeriodPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TimePeriodPropertySource.class);\r

        \r
        private TimePeriod timePeriod;\r
        \r
        \r
        private TimePeriod timePeriod;\r
        \r


@@ -76,10 +71,6 @@ public class TimePeriodPropertySource implements IPropertySource {
                }\r
        }\r
                \r
                }\r
        }\r
                \r

-    //static date formatter\r
-    private static final DateFormat formatter = new SimpleDateFormat(\r
-            "EEEE, MMMM d, yyyy"); //$NON-NLS-1$\r
-\r

     private Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
     \r
     private void addDescriptor(String id) {\r
     private Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
     \r
     private void addDescriptor(String id) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/YearValidator.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/YearValidator.java
index acbd2d65cb1e2b77ddbc03b1da433ad5f1377366..c11298180c8b9aa97b3abc02973f6bf52429ca31 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/YearValidator.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/YearValidator.java
@@ -9,10 +9,8 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ICellEditorValidator;\r
 \r
 import org.eclipse.jface.viewers.ICellEditorValidator;\r
 \r

-import eu.etaxonomy.cdm.model.common.TimePeriod;\r

 import eu.etaxonomy.taxeditor.store.model.TimeUtil;\r
 \r
 /**\r
 import eu.etaxonomy.taxeditor.store.model.TimeUtil;\r
 \r
 /**\r


@@ -21,7 +19,6 @@ import eu.etaxonomy.taxeditor.store.model.TimeUtil;
  * @version 1.0\r
  */\r
 public class YearValidator implements ICellEditorValidator {\r
  * @version 1.0\r
  */\r
 public class YearValidator implements ICellEditorValidator {\r

-       private static final Logger logger = Logger.getLogger(YearValidator.class);\r

 \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)\r
 \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)\r


@@ -32,7 +29,7 @@ public class YearValidator implements ICellEditorValidator {
                        return null;\r
                }\r
                try {\r
                        return null;\r
                }\r
                try {\r

-                       TimePeriod datePublished = TimeUtil.convertTimePeriod(year);\r
+                       TimeUtil.convertTimePeriod(year);\r

                } catch (NumberFormatException e) {\r
                        return "Year must be between 1750 and 2030. Two years can also be given in the format 'xxxx-xxxx'.";\r
                }\r
                } catch (NumberFormatException e) {\r
                        return "Year must be between 1750 and 2030. Two years can also be given in the format 'xxxx-xxxx'.";\r
                }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
index 4dfd9bc7e1b9e3d43e837a0e72fcd866424d5529..93ab31c268f1668c566e3926985e63cd3e5c7312 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
@@ -15,7 +15,6 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.Vector;\r
 \r
 import java.util.Map;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r


@@ -34,7 +33,6 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.DescriptionUtil;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;\r
 import eu.etaxonomy.taxeditor.store.model.DescriptionUtil;\r

-import eu.etaxonomy.taxeditor.store.model.ReferenceUtil;\r

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


@@ -42,8 +40,6 @@ import eu.etaxonomy.taxeditor.store.model.ReferenceUtil;
  * @version 1.0\r
  */\r
 public class DescriptionElementPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class DescriptionElementPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionElementPropertySource.class);\r

        \r
        /**\r
         * The DescriptionElement whose properties are being displayed\r
        \r
        /**\r
         * The DescriptionElement whose properties are being displayed\r


@@ -80,7 +76,6 @@ public class DescriptionElementPropertySource implements IPropertySource {
                        P_ID_MICROREF};\r
        \r
        private String[] P_FEATURE_CLASS_NAME_MENU;\r
                        P_ID_MICROREF};\r
        \r
        private String[] P_FEATURE_CLASS_NAME_MENU;\r

-       private Class[] P_FEATURE_CLASSES;\r

        \r
        /**\r
         * Constructor for top level property fields. All fields that are not subfields\r
        \r
        /**\r
         * Constructor for top level property fields. All fields that are not subfields\r


@@ -94,7 +89,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
        public DescriptionElementPropertySource(DescriptionElementBase descriptionElement, String parentid, \r
                        String[] keys) {\r
                this.descriptionElement = descriptionElement;\r
        public DescriptionElementPropertySource(DescriptionElementBase descriptionElement, String parentid, \r
                        String[] keys) {\r
                this.descriptionElement = descriptionElement;\r

-               this.parentid = parentid;\r
+               this.setParentid(parentid);\r

                for (String key : keys) {\r
                        addDescriptor(key);\r
                }\r
                for (String key : keys) {\r
                        addDescriptor(key);\r
                }\r


@@ -122,7 +117,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
                if (id.equals(P_ID_ELEMENT_CLASS)) {\r
                        \r
                        Feature feature = descriptionElement.getFeature();\r
                if (id.equals(P_ID_ELEMENT_CLASS)) {\r
                        \r
                        Feature feature = descriptionElement.getFeature();\r

-                       Map<Class, String> supportedClasses = new HashMap<Class, String>();\r
+                       Map<Class<?>, String> supportedClasses = new HashMap<Class<?>, String>();\r

                        \r
                        // Populate feature class arrays with classes supported by this feature\r
                        if (feature.supportsCommonTaxonName()) {\r
                        \r
                        // Populate feature class arrays with classes supported by this feature\r
                        if (feature.supportsCommonTaxonName()) {\r


@@ -145,7 +140,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
                        } \r
                        \r
                        P_FEATURE_CLASS_NAME_MENU = supportedClasses.values().toArray((new String[supportedClasses.size()]));\r
                        } \r
                        \r
                        P_FEATURE_CLASS_NAME_MENU = supportedClasses.values().toArray((new String[supportedClasses.size()]));\r

-                       P_FEATURE_CLASSES = supportedClasses.keySet().toArray(new Class[supportedClasses.size()]);\r
+                       supportedClasses.keySet().toArray(new Class[supportedClasses.size()]);\r

                        \r
                        descriptors.addElement(                         \r
                                        new ComboBoxPropertyDescriptor(P_ID_ELEMENT_CLASS, P_ELEMENT_CLASS, P_FEATURE_CLASS_NAME_MENU)\r
                        \r
                        descriptors.addElement(                         \r
                                        new ComboBoxPropertyDescriptor(P_ID_ELEMENT_CLASS, P_ELEMENT_CLASS, P_FEATURE_CLASS_NAME_MENU)\r


@@ -180,7 +175,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
         * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()\r
         */\r
        public IPropertyDescriptor[] getPropertyDescriptors() {\r
         * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()\r
         */\r
        public IPropertyDescriptor[] getPropertyDescriptors() {\r

-               return (IPropertyDescriptor[]) descriptors.toArray(\r
+               return descriptors.toArray(\r

                 new IPropertyDescriptor[descriptors.size()]);\r
        }\r
 \r
                 new IPropertyDescriptor[descriptors.size()]);\r
        }\r
 \r


@@ -210,11 +205,11 @@ public class DescriptionElementPropertySource implements IPropertySource {
                }\r
 \r
                if (id.equals(P_ID_BIBREF)) {\r
                }\r
 \r
                if (id.equals(P_ID_BIBREF)) {\r

-                       ReferenceBase citation = descriptionElement.getCitation();\r
+                       ReferenceBase<?> citation = descriptionElement.getCitation();\r

                        ReferencePropertySource bibRefPropertySource = new ReferencePropertySource(citation);\r
                        bibRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                        ReferencePropertySource bibRefPropertySource = new ReferencePropertySource(citation);\r
                        bibRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r

-                                       descriptionElement.setCitation((ReferenceBase) evt.getNewValue());\r
+                                       descriptionElement.setCitation((ReferenceBase<?>) evt.getNewValue());\r

                                }\r
                        });\r
                        return bibRefPropertySource;\r
                                }\r
                        });\r
                        return bibRefPropertySource;\r


@@ -253,7 +248,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
                \r
                if (id.equals(P_ID_BIBREF)) {\r
                        if (value instanceof ReferenceBase) {\r
                \r
                if (id.equals(P_ID_BIBREF)) {\r
                        if (value instanceof ReferenceBase) {\r

-                               descriptionElement.setCitation((ReferenceBase) value);\r
+                               descriptionElement.setCitation((ReferenceBase<?>) value);\r

                        }\r
                }\r
                \r
                        }\r
                }\r
                \r


@@ -274,4 +269,18 @@ public class DescriptionElementPropertySource implements IPropertySource {
        public DescriptionElementBase getDescriptionElement() {\r
                return descriptionElement;\r
        }\r
        public DescriptionElementBase getDescriptionElement() {\r
                return descriptionElement;\r
        }\r

+\r
+       /**\r
+        * @param parentid the parentid to set\r
+        */\r
+       public void setParentid(String parentid) {\r
+               this.parentid = parentid;\r
+       }\r
+\r
+       /**\r
+        * @return the parentid\r
+        */\r
+       public String getParentid() {\r
+               return parentid;\r
+       }\r

 }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
index 128c1464c5ea3abc9c412b34b2ba27ca5e9ad8e2..9b0c81e77db54cd7ae1a8aad284b842ae2ae2a84 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
@@ -11,11 +11,9 @@ package eu.etaxonomy.taxeditor.propertysheet.description;
 \r
 import java.util.Vector;\r
 \r
 \r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r

-import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r

 \r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 \r
 \r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 \r


@@ -25,8 +23,6 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
  * @version 1.0\r
  */\r
 public class TaxonDescriptionPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class TaxonDescriptionPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonDescriptionPropertySource.class);\r

        \r
        // The TaxonDescription whose properties are being displayed    \r
        private TaxonDescription taxonDescription;\r
        \r
        // The TaxonDescription whose properties are being displayed    \r
        private TaxonDescription taxonDescription;\r


@@ -62,7 +58,7 @@ public class TaxonDescriptionPropertySource implements IPropertySource {
                }\r
                \r
                this.taxonDescription = taxonDescription;\r
                }\r
                \r
                this.taxonDescription = taxonDescription;\r

-               this.parentid = parentid;\r
+               this.setParentid(parentid);\r

                for (String key : keys) {\r
                        addDescriptor(key);\r
                }\r
                for (String key : keys) {\r
                        addDescriptor(key);\r
                }\r


@@ -145,4 +141,18 @@ public class TaxonDescriptionPropertySource implements IPropertySource {
                        taxonDescription.setTitleCache((String) value);\r
                }\r
        }\r
                        taxonDescription.setTitleCache((String) value);\r
                }\r
        }\r

+\r
+       /**\r
+        * @param parentid the parentid to set\r
+        */\r
+       public void setParentid(String parentid) {\r
+               this.parentid = parentid;\r
+       }\r
+\r
+       /**\r
+        * @return the parentid\r
+        */\r
+       public String getParentid() {\r
+               return parentid;\r
+       }\r

 }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
index 6a05c72d1f28ecfc7d6e8a18441351ce061329fa..9b79702d042f645758f13ac1c5b994279abb2431 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
@@ -16,7 +16,6 @@ import org.apache.log4j.Logger;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r

-import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r

 \r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r


@@ -44,7 +43,7 @@ public class ImagePropertySource implements IPropertySource {
         * @param url\r
         */\r
        public ImagePropertySource(Taxon taxon, ImageFile imageFile) {\r
         * @param url\r
         */\r
        public ImagePropertySource(Taxon taxon, ImageFile imageFile) {\r

-               this.taxon = taxon;\r
+               this.setTaxon(taxon);\r

                this.imageFile = imageFile;\r
                \r
                addDescriptor(P_ID_IMAGE);\r
                this.imageFile = imageFile;\r
                \r
                addDescriptor(P_ID_IMAGE);\r


@@ -119,4 +118,18 @@ public class ImagePropertySource implements IPropertySource {
        public ImageFile getImageFile(){\r
                return imageFile;\r
        }\r
        public ImageFile getImageFile(){\r
                return imageFile;\r
        }\r

+\r
+       /**\r
+        * @param taxon the taxon to set\r
+        */\r
+       public void setTaxon(Taxon taxon) {\r
+               this.taxon = taxon;\r
+       }\r
+\r
+       /**\r
+        * @return the taxon\r
+        */\r
+       public Taxon getTaxon() {\r
+               return taxon;\r
+       }\r

 }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/BotanicalNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/BotanicalNamePropertySource.java
index b24e1ac83e6af533907e23f454c368a5f0b6653c..819f1ae4de973bf330b9623416966647ec4665fd 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/BotanicalNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/BotanicalNamePropertySource.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r


@@ -23,8 +22,6 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
  * @version 1.0\r
  */\r
 public class BotanicalNamePropertySource extends NonViralNamePropertySource {\r
  * @version 1.0\r
  */\r
 public class BotanicalNamePropertySource extends NonViralNamePropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(BotanicalNamePropertySource.class);\r

        \r
     // Property unique keys\r
        public static final String P_ID_REFERENCEYEAR = "referenceyear";        \r
        \r
     // Property unique keys\r
        public static final String P_ID_REFERENCEYEAR = "referenceyear";        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/EditorComboBoxPropertyDescriptor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/EditorComboBoxPropertyDescriptor.java
index 26541646d040bba6a21132a65c902626c61e0464..8202ffeb779aae35d39c8cdf6122398930fa5c4b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/EditorComboBoxPropertyDescriptor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/EditorComboBoxPropertyDescriptor.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.ComboBoxCellEditor;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.ComboBoxCellEditor;\r
 import org.eclipse.swt.SWT;\r


@@ -25,8 +24,6 @@ import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
  */\r
 public class EditorComboBoxPropertyDescriptor extends\r
                ComboBoxPropertyDescriptor {\r
  */\r
 public class EditorComboBoxPropertyDescriptor extends\r
                ComboBoxPropertyDescriptor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(EditorComboBoxPropertyDescriptor.class);\r

        private String[] labels;\r
        \r
        /**\r
        private String[] labels;\r
        \r
        /**\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameRelationsPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameRelationsPropertySource.java
index cdc45b4e25374bc21502bb48eee3f18c5ed02dc4..cb442252276982533a32bb9c8b67f09ed328eb6d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameRelationsPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameRelationsPropertySource.java
@@ -11,8 +11,6 @@ package eu.etaxonomy.taxeditor.propertysheet.name;
 import java.util.Collection;\r
 import java.util.Set;\r
 \r
 import java.util.Collection;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r


@@ -21,22 +19,20 @@ import eu.etaxonomy.taxeditor.propertysheet.CollectionPropertySource;
 import eu.etaxonomy.taxeditor.store.model.NameRelationsUtil;\r
 \r
 public class NameRelationsPropertySource extends CollectionPropertySource {\r
 import eu.etaxonomy.taxeditor.store.model.NameRelationsUtil;\r
 \r
 public class NameRelationsPropertySource extends CollectionPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsPropertySource.class);\r

        \r
        \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

        private boolean isZoological = false;\r
 \r
        private boolean isZoological = false;\r
 \r

-       private Set nameRelations;\r
+       private Set<?> nameRelations;\r

 \r
 \r

-       public NameRelationsPropertySource(TaxonNameBase name, Collection collection) {\r
+       public NameRelationsPropertySource(TaxonNameBase<?, ?> name, Collection<?> collection) {\r

                super(collection, name);\r
                this.name = name;\r
                if (name instanceof ZoologicalName) {\r
                        isZoological = true;\r
                }\r
                \r
                super(collection, name);\r
                this.name = name;\r
                if (name instanceof ZoologicalName) {\r
                        isZoological = true;\r
                }\r
                \r

-               this.nameRelations = name.getNameRelations();\r
+               this.setNameRelations(name.getNameRelations());\r

        }\r
        \r
        @Override\r
        }\r
        \r
        @Override\r


@@ -71,7 +67,7 @@ public class NameRelationsPropertySource extends CollectionPropertySource {
        @Override\r
        public Object getPropertyValue(Object id) {\r
                if (id instanceof NameRelationship) {\r
        @Override\r
        public Object getPropertyValue(Object id) {\r
                if (id instanceof NameRelationship) {\r

-                       TaxonNameBase relatedName;\r
+                       TaxonNameBase<?, ?> relatedName;\r

                        if (((NameRelationship) id).getFromName().equals(name)) {\r
                                relatedName = ((NameRelationship) id).getToName();\r
                        } else {\r
                        if (((NameRelationship) id).getFromName().equals(name)) {\r
                                relatedName = ((NameRelationship) id).getToName();\r
                        } else {\r


@@ -92,4 +88,18 @@ public class NameRelationsPropertySource extends CollectionPropertySource {
                // "Name Relations" header has no value\r
                return "";\r
        }\r
                // "Name Relations" header has no value\r
                return "";\r
        }\r

+\r
+       /**\r
+        * @param nameRelations the nameRelations to set\r
+        */\r
+       public void setNameRelations(Set<?> nameRelations) {\r
+               this.nameRelations = nameRelations;\r
+       }\r
+\r
+       /**\r
+        * @return the nameRelations\r
+        */\r
+       public Set<?> getNameRelations() {\r
+               return nameRelations;\r
+       }\r

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomStatusPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomStatusPropertySource.java
index 42bf0f913b66f7eaf56f99bcefb029b432779155..c1f5ffae093d79485a1113f3c5aa276772659997 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomStatusPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomStatusPropertySource.java
@@ -9,16 +9,11 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r

-import java.util.ArrayList;\r

 import java.util.Collection;\r
 import java.util.Collection;\r

-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r

 \r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.taxeditor.propertysheet.CollectionPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.taxeditor.propertysheet.CollectionPropertySource;\r

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

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


@@ -26,36 +21,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class NomStatusPropertySource extends CollectionPropertySource {\r
  * @version 1.0\r
  */\r
 public class NomStatusPropertySource extends CollectionPropertySource {\r

-       private static final Logger logger = Logger.\r
-                       getLogger(NomStatusPropertySource.class);\r

 \r
 \r

-       public NomStatusPropertySource(Collection collection) {\r
+       public NomStatusPropertySource(Collection<?> collection) {\r

                super(collection);\r
        }\r
 \r
        static NomenclaturalStatusType[] nomStatusTypes = null;\r
                super(collection);\r
        }\r
 \r
        static NomenclaturalStatusType[] nomStatusTypes = null;\r

-       static String[] P_NOMSTATUS_MENU = null;\r
-       private static void populateNomStatusTypes() {\r
-               \r
-               // Get terms from nom status vocabulary\r
-               List<NomenclaturalStatusType> nomStatusTypesList = new ArrayList<NomenclaturalStatusType>();\r
-               nomStatusTypesList.addAll(\r
-                               CdmStore.getDefault().getNomStatus().getTerms());\r
-                               \r
-               // Populate nom status type menu labels \r
-               List<String> nomStatusTypesMenuList = new ArrayList<String>();\r
-               for (NomenclaturalStatusType nomStatusType : nomStatusTypesList) {\r
-                       nomStatusTypesMenuList.add(nomStatusType.getLabel());\r
-               }\r
-               \r
-               // Add an empty element for "nothing selected" in the rank drop-down \r
-               nomStatusTypesList.add(0, null);\r
-               nomStatusTypesMenuList.add(0, "");\r
-               \r
-               // Convert rank lists to array\r
-               nomStatusTypes = nomStatusTypesList.toArray(new NomenclaturalStatusType[nomStatusTypesList.size()]);\r
-               P_NOMSTATUS_MENU = nomStatusTypesMenuList.toArray(new String[nomStatusTypesMenuList.size()]);   \r
-       }               \r
+       static String[] P_NOMSTATUS_MENU = null;                \r

        \r
 \r
        @Override\r
        \r
 \r
        @Override\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
index c50ba213793e487657343d080574392ffc11a36a..33825936fe7ff0a7b41942641b3d711538b36318 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.List;\r
 import java.util.Vector;\r
 \r
 import java.util.List;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r


@@ -32,8 +31,6 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
  * @version 1.0\r
  */\r
 public class NomenclaturalAuthorshipPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class NomenclaturalAuthorshipPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NomenclaturalAuthorshipPropertySource.class);\r

 \r
        // Property unique keys\r
        public static final String P_ID_EDITABLECACHE = "P_ID_EDITABLECACHE";           \r
 \r
        // Property unique keys\r
        public static final String P_ID_EDITABLECACHE = "P_ID_EDITABLECACHE";           \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
index 13f9c6126a550e1b0576a235609234b013de3873..b36776e0728eb2fb58482aa7f32e5b5bf14ad7b3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Set;\r
 import java.util.Vector;\r
 \r
 import java.util.Set;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r


@@ -48,11 +47,9 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @version 1.0\r
  */\r
 public class NonViralNamePropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class NonViralNamePropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NonViralNamePropertySource.class);\r

 \r
        // The name whose properties are being displayed\r
 \r
        // The name whose properties are being displayed\r

-       NonViralName name;\r
+       NonViralName<?> name;\r

        \r
        // If this is a property with a parent, the parent's property ID\r
        private String parentid = "";\r
        \r
        // If this is a property with a parent, the parent's property ID\r
        private String parentid = "";\r


@@ -309,11 +306,11 @@ public class NonViralNamePropertySource implements IPropertySource {
         *  should be listed here.\r
         * @param name\r
         */\r
         *  should be listed here.\r
         * @param name\r
         */\r

-       public NonViralNamePropertySource(NonViralName name) {\r
+       public NonViralNamePropertySource(NonViralName<?> name) {\r

                this(name, null, TOP_LEVEL_PROPERTIES);\r
        }\r
 \r
                this(name, null, TOP_LEVEL_PROPERTIES);\r
        }\r
 \r

-       public NonViralNamePropertySource(NonViralName name, \r
+       public NonViralNamePropertySource(NonViralName<?> name, \r

                        String parentid, String[] keys) {\r
                this.name = name;\r
                this.parentid = parentid;\r
                        String parentid, String[] keys) {\r
                this.name = name;\r
                this.parentid = parentid;\r


@@ -456,7 +453,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                // Nomenclatural reference        \r
         if (id.equals(P_ID_NOMENCLATURAL_REF)) {\r
                \r
                // Nomenclatural reference        \r
         if (id.equals(P_ID_NOMENCLATURAL_REF)) {\r
                \r

-               ReferenceBase nomRef = (ReferenceBase) name.getNomenclaturalReference();\r
+               ReferenceBase<?> nomRef = (ReferenceBase<?>) name.getNomenclaturalReference();\r

                        \r
                        // Create nom. reference as necessary\r
                        if (nomRef == null) {\r
                        \r
                        // Create nom. reference as necessary\r
                        if (nomRef == null) {\r


@@ -470,7 +467,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                        nomRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof INomenclaturalReference) {\r
                        nomRefPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof INomenclaturalReference) {\r

-                                               name.setNomenclaturalReference((ReferenceBase) evt.getNewValue());\r
+                                               name.setNomenclaturalReference((ReferenceBase<?>) evt.getNewValue());\r

                                        }\r
                                }\r
                        });\r
                                        }\r
                                }\r
                        });\r


@@ -543,7 +540,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                // Nomenclatural reference        \r
         if (id.equals(P_ID_NOMENCLATURAL_REF)) {\r
                if (value instanceof INomenclaturalReference) {\r
                // Nomenclatural reference        \r
         if (id.equals(P_ID_NOMENCLATURAL_REF)) {\r
                if (value instanceof INomenclaturalReference) {\r

-                       name.setNomenclaturalReference((ReferenceBase) value);\r
+                       name.setNomenclaturalReference((ReferenceBase<?>) value);\r

                }\r
         }\r
         \r
                }\r
         }\r
         \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
index eb1b332dfdb2e5c71f29d13fd47810594227b6a6..43e9ea805e93c531d12cae12caf0cdd55b2e90d9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
@@ -43,7 +43,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        private static final Logger logger = Logger\r
                        .getLogger(TaxonBasePropertySource.class);\r
        \r
        private static final Logger logger = Logger\r
                        .getLogger(TaxonBasePropertySource.class);\r
        \r

-       private TaxonBase taxonBase;\r
+       private TaxonBase<?> taxonBase;\r

 \r
     // Property unique keys\r
        public static final String P_ID_TAXONNAME = "P_ID_TAXONNAME";\r
 \r
     // Property unique keys\r
        public static final String P_ID_TAXONNAME = "P_ID_TAXONNAME";\r


@@ -55,7 +55,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        public static final String P_TAXONSEC = "Secundum";\r
        public String P_TYPES = "Name Types";   \r
        \r
        public static final String P_TAXONSEC = "Secundum";\r
        public String P_TYPES = "Name Types";   \r
        \r

-       public TaxonBasePropertySource(TaxonBase taxon, String nameTitle) {\r
+       public TaxonBasePropertySource(TaxonBase<?> taxon, String nameTitle) {\r

                this.taxonBase = taxon;\r
                \r
                this.P_TAXONNAME = nameTitle;\r
                this.taxonBase = taxon;\r
                \r
                this.P_TAXONNAME = nameTitle;\r


@@ -122,7 +122,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                                logger.warn("no taxon");\r
                                return null;\r
                        }\r
                                logger.warn("no taxon");\r
                                return null;\r
                        }\r

-                       TaxonNameBase name = taxonBase.getName();\r
+                       TaxonNameBase<?, ?> name = taxonBase.getName();\r

                        \r
                        // Create taxon name as necessary\r
                        if (name == null) {\r
                        \r
                        // Create taxon name as necessary\r
                        if (name == null) {\r


@@ -137,7 +137,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                                return new ZoologicalNamePropertySource((ZoologicalName) name);\r
                        }\r
                        if (name instanceof NonViralName) {\r
                                return new ZoologicalNamePropertySource((ZoologicalName) name);\r
                        }\r
                        if (name instanceof NonViralName) {\r

-                               return new NonViralNamePropertySource((NonViralName) name);\r
+                               return new NonViralNamePropertySource((NonViralName<?>) name);\r

                        }\r
                        \r
                }               \r
                        }\r
                        \r
                }               \r


@@ -148,7 +148,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                        if (taxonBase == null) {\r
                                return null;\r
                        }\r
                        if (taxonBase == null) {\r
                                return null;\r
                        }\r

-                       ReferenceBase sec = taxonBase.getSec();\r
+                       ReferenceBase<?> sec = taxonBase.getSec();\r

                        \r
                        // Create property source for submenu\r
                        ReferencePropertySource secPropertySource = new ReferencePropertySource(sec);\r
                        \r
                        // Create property source for submenu\r
                        ReferencePropertySource secPropertySource = new ReferencePropertySource(sec);\r


@@ -157,7 +157,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                        secPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof ReferenceBase) {       \r
                        secPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof ReferenceBase) {       \r

-                                               taxonBase.setSec((ReferenceBase) evt.getNewValue());\r
+                                               taxonBase.setSec((ReferenceBase<?>) evt.getNewValue());\r

                                        }\r
                                }\r
                        });\r
                                        }\r
                                }\r
                        });\r


@@ -167,8 +167,8 @@ public class TaxonBasePropertySource implements IPropertySource {
                if (id.equals(P_ID_TYPES)) {\r
                        if (taxonBase.getName() != null) {\r
                                // TODO return NameTypeDesignations\r
                if (id.equals(P_ID_TYPES)) {\r
                        if (taxonBase.getName() != null) {\r
                                // TODO return NameTypeDesignations\r

-                               TaxonNameBase name = taxonBase.getName();\r
-                               Set typeDesignations = null;\r
+                               TaxonNameBase<?, ?> name = taxonBase.getName();\r
+                               Set<?> typeDesignations = null;\r

                                if (NameUtil.isNameSupraSpecific(name)) {\r
                                        typeDesignations = name.getNameTypeDesignations();\r
                                } else {\r
                                if (NameUtil.isNameSupraSpecific(name)) {\r
                                        typeDesignations = name.getNameTypeDesignations();\r
                                } else {\r


@@ -199,7 +199,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        public void setPropertyValue(Object id, Object value) {\r
         if (id.equals(P_ID_TAXONSEC)) {\r
                if (value instanceof ReferenceBase) {\r
        public void setPropertyValue(Object id, Object value) {\r
         if (id.equals(P_ID_TAXONSEC)) {\r
                if (value instanceof ReferenceBase) {\r

-                       taxonBase.setSec((ReferenceBase) value);\r
+                       taxonBase.setSec((ReferenceBase<?>) value);\r

                }\r
         }\r
        }\r
                }\r
         }\r
        }\r


@@ -207,7 +207,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        /**\r
         * @return the taxonBase\r
         */\r
        /**\r
         * @return the taxonBase\r
         */\r

-       public TaxonBase getTaxonBase() {\r
+       public TaxonBase<?> getTaxonBase() {\r

                return taxonBase;\r
        }\r
 }\r
                return taxonBase;\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java
index 12f1e3585442b6b1f1317c88aa0f90e04eba0f14..dc192e4fa5dba1ac0494127de9276ec7b8ff9664 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 \r
 /**\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 \r
 /**\r


@@ -21,8 +19,6 @@ import eu.etaxonomy.cdm.model.name.ZoologicalName;
  * @version 1.0\r
  */\r
 public class ZoologicalNamePropertySource extends NonViralNamePropertySource {\r
  * @version 1.0\r
  */\r
 public class ZoologicalNamePropertySource extends NonViralNamePropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ZoologicalNamePropertySource.class);\r

 \r
        private ZoologicalName zoologicalName;\r
        \r
 \r
        private ZoologicalName zoologicalName;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
index 77dd4575f1359321103527970d9ac43472cefaf6..0005597f3e461f7e86f71b2473c4d674ae7569af 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeListener;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r


@@ -49,8 +48,6 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class ChooseRelationWizardPage extends WizardPage {\r
  * @version 1.0\r
  */\r
 public class ChooseRelationWizardPage extends WizardPage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ChooseRelationWizardPage.class);\r

 \r
        private List<NameRelationshipType> relationTypes;\r
 \r
 \r
        private List<NameRelationshipType> relationTypes;\r
 \r


@@ -81,10 +78,10 @@ public class ChooseRelationWizardPage extends WizardPage {
 \r
        private boolean nameSelected;\r
 \r
 \r
        private boolean nameSelected;\r
 \r

-       private TaxonNameBase baseName;\r
-       private TaxonNameBase relatedName; \r
-       private TaxonNameBase fromName;\r
-       private TaxonNameBase toName;\r
+       private TaxonNameBase<?, ?> baseName;\r
+       private TaxonNameBase<?, ?> relatedName; \r
+       private TaxonNameBase<?, ?> fromName;\r
+       private TaxonNameBase<?, ?> toName;\r

 \r
        private NameRelationshipType type;\r
 \r
 \r
        private NameRelationshipType type;\r
 \r


@@ -94,7 +91,7 @@ public class ChooseRelationWizardPage extends WizardPage {
 \r
        private WritableList nameRelationsList;\r
 \r
 \r
        private WritableList nameRelationsList;\r
 \r

-       public ChooseRelationWizardPage(TaxonNameBase name, WritableList nameRelationsList) {\r
+       public ChooseRelationWizardPage(TaxonNameBase<?, ?> name, WritableList nameRelationsList) {\r

                super("");\r
                \r
                this.baseName = name;\r
                super("");\r
                \r
                this.baseName = name;\r


@@ -273,12 +270,10 @@ public class ChooseRelationWizardPage extends WizardPage {
        \r
        public class TemporaryNameRelationship extends NameRelationship {\r
 \r
        \r
        public class TemporaryNameRelationship extends NameRelationship {\r
 \r

-               private TaxonNameBase tempToName;\r
-               private TaxonNameBase tempFromName;\r
-               private NameRelationshipType tempType;\r
-               private ReferenceBase tempCitation;\r
-               private String tempCitationMicroReference;\r
-               private String tempRuleConsidered;\r
+               /**\r
+                * \r
+                */\r
+               private static final long serialVersionUID = 1231912353305134080L;\r

 \r
                /**\r
                 * @param toName\r
 \r
                /**\r
                 * @param toName\r


@@ -288,31 +283,11 @@ public class ChooseRelationWizardPage extends WizardPage {
                 * @param citationMicroReference\r
                 * @param ruleConsidered\r
                 */\r
                 * @param citationMicroReference\r
                 * @param ruleConsidered\r
                 */\r

-               protected TemporaryNameRelationship(TaxonNameBase toName,\r
-                               TaxonNameBase fromName, NameRelationshipType type,\r
-                               ReferenceBase citation, String citationMicroReference,\r
+               protected TemporaryNameRelationship(TaxonNameBase<?, ?> toName,\r
+                               TaxonNameBase<?, ?> fromName, NameRelationshipType type,\r
+                               ReferenceBase<?> citation, String citationMicroReference,\r

                                String ruleConsidered) {\r
                        super(toName, fromName, type, citation, citationMicroReference, ruleConsidered);\r
                                String ruleConsidered) {\r
                        super(toName, fromName, type, citation, citationMicroReference, ruleConsidered);\r

-//                     super(null, null, null, null, null, null);\r
-//                     \r
-//                     this.tempToName = toName;\r
-//                     this.tempFromName = fromName;\r
-//                     this.tempType = type;\r
-//                     this.tempCitation = citation;\r
-//                     this.tempCitationMicroReference = citationMicroReference;\r
-//                     this.tempRuleConsidered = ruleConsidered;\r

                }\r
                }\r

-               \r
-//             public TaxonNameBase getToName(){\r
-//                     return tempToName;\r
-//             }\r
-//             \r
-//             public TaxonNameBase getFromName(){\r
-//                     return tempFromName;\r
-//             }\r
-//             \r
-//             public String getRuleConsidered(){\r
-//                     return tempRuleConsidered;\r
-//             }\r

        }\r
 }
\ No newline at end of file
        }\r
 }
\ No newline at end of file

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java
index 04f102e49c6990c204b8bb5d9aff3dda9a8a9a5f..dc28d8c2ee434d7f2d34b2231790874dc96b91df 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r


@@ -31,7 +30,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Table;\r
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Table;\r

-import org.eclipse.swt.widgets.TableItem;\r

 \r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 \r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r


@@ -48,12 +46,10 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class ListNameRelationsWizardPage extends WizardPage {\r
  * @version 1.0\r
  */\r
 public class ListNameRelationsWizardPage extends WizardPage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ListNameRelationsWizardPage.class);\r

 \r
        private Table nameRelationsTable;\r
        private WritableList nameRelationsList = new WritableList();\r
 \r
        private Table nameRelationsTable;\r
        private WritableList nameRelationsList = new WritableList();\r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

 \r
        private Button btnRemove;\r
        private Button btnEdit;\r
 \r
        private Button btnRemove;\r
        private Button btnEdit;\r


@@ -62,7 +58,7 @@ public class ListNameRelationsWizardPage extends WizardPage {
 \r
        private boolean isZoological = false;\r
 \r
 \r
        private boolean isZoological = false;\r
 \r

-       public ListNameRelationsWizardPage(TaxonNameBase name, WritableList nameRelationsList) {\r
+       public ListNameRelationsWizardPage(TaxonNameBase<?, ?> name, WritableList nameRelationsList) {\r

                super("");\r
 \r
                this.name = name;\r
                super("");\r
 \r
                this.name = name;\r


@@ -117,7 +113,6 @@ public class ListNameRelationsWizardPage extends WizardPage {
                        public void widgetSelected(SelectionEvent e) {\r
                                // TODO: As long as onNameBase.removeNameRelationship() doesn't work, "Remove" stays disabled ... \r
                                setEnableExistingRelationButtons(true);\r
                        public void widgetSelected(SelectionEvent e) {\r
                                // TODO: As long as onNameBase.removeNameRelationship() doesn't work, "Remove" stays disabled ... \r
                                setEnableExistingRelationButtons(true);\r

-                               TableItem[] selectedItem = nameRelationsTable.getSelection();\r

                                if (e.item.getData() instanceof NameRelationship) {\r
                                        setSelectedRelation((NameRelationship) e.item.getData());\r
                                }\r
                                if (e.item.getData() instanceof NameRelationship) {\r
                                        setSelectedRelation((NameRelationship) e.item.getData());\r
                                }\r


@@ -153,6 +148,7 @@ public class ListNameRelationsWizardPage extends WizardPage {
                        public void doubleClick(DoubleClickEvent event) {\r
                                if (((StructuredSelection) event.getSelection())\r
                                                .getFirstElement() instanceof NameRelationship) {\r
                        public void doubleClick(DoubleClickEvent event) {\r
                                if (((StructuredSelection) event.getSelection())\r
                                                .getFirstElement() instanceof NameRelationship) {\r

+                                       // FIXME nothing is happening here\r

                                        NameRelationship relation = (NameRelationship) ((StructuredSelection) event\r
                                                        .getSelection()).getFirstElement();\r
                                        // Editing existing relations disabled\r
                                        NameRelationship relation = (NameRelationship) ((StructuredSelection) event\r
                                                        .getSelection()).getFirstElement();\r
                                        // Editing existing relations disabled\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java
index 62ae0c540eaa5eb097fea074f8b352287c48f489..0dd4c9fb84717e5faf6fd946b117d3294a5d0176 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java
@@ -9,9 +9,7 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r

-import org.eclipse.jface.wizard.IWizardPage;\r

 import org.eclipse.jface.wizard.Wizard;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import org.eclipse.jface.wizard.Wizard;\r
 \r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r


@@ -22,19 +20,17 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  * @version 1.0\r
  */\r
 public class NameRelationWizard extends Wizard {\r
  * @version 1.0\r
  */\r
 public class NameRelationWizard extends Wizard {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationWizard.class);\r

        \r
        public static final String ID = "eu.etaxonomy.taxeditor.namerelationwizard";\r
 \r
        \r
        public static final String ID = "eu.etaxonomy.taxeditor.namerelationwizard";\r
 \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

        private WritableList nameRelationsList;\r
 \r
        private ChooseRelationWizardPage chooseRelationPage;\r
 \r
 //     private NameRelationWizardModel relationModel;\r
 \r
        private WritableList nameRelationsList;\r
 \r
        private ChooseRelationWizardPage chooseRelationPage;\r
 \r
 //     private NameRelationWizardModel relationModel;\r
 \r

-       public NameRelationWizard(TaxonNameBase name, WritableList nameRelationsList) {\r
+       public NameRelationWizard(TaxonNameBase<?, ?> name, WritableList nameRelationsList) {\r

                super();\r
                \r
                this.name = name;\r
                super();\r
                \r
                this.name = name;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java
index eff170bd3723e588ed3a842922fd5a33dbc545d8..1d68f012a1f8012571e12caffbdc40586c856bb1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.IWizardPage;\r
 import org.eclipse.jface.wizard.Wizard;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.IWizardPage;\r
 import org.eclipse.jface.wizard.Wizard;\r


@@ -27,14 +26,12 @@ import eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard.ChooseRelationW
  * @version 1.0\r
  */\r
 public class NameRelationsListWizard extends Wizard {\r
  * @version 1.0\r
  */\r
 public class NameRelationsListWizard extends Wizard {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsListWizard.class);\r

        \r
        \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

 \r
        private WritableList nameRelationsTemp;\r
 \r
 \r
        private WritableList nameRelationsTemp;\r
 \r

-       public NameRelationsListWizard(TaxonNameBase name) {\r
+       public NameRelationsListWizard(TaxonNameBase<?, ?> name) {\r

                super();\r
                \r
                this.name = name;\r
                super();\r
                \r
                this.name = name;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationshipTemp.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationshipTemp.java
index 8b7f1176e91ebbd5295596dc97415610636c3a5c..c86fc17969f7fe290a8255cea382498c08a3363e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationshipTemp.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationshipTemp.java
@@ -10,12 +10,7 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r

-import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r

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


@@ -23,8 +18,11 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @version 1.0\r
  */\r
 public class NameRelationshipTemp extends NameRelationship {\r
  * @version 1.0\r
  */\r
 public class NameRelationshipTemp extends NameRelationship {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationshipTemp.class);\r
+       \r
+       /**\r
+        * \r
+        */\r
+       private static final long serialVersionUID = -6363291628338131236L;\r

        \r
        private NameRelationship relationPersistent;\r
        \r
        \r
        private NameRelationship relationPersistent;\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java
index 312f9f32548ae421ca1f88694d4badf878de2d0b..640cc4515034c3fbaecbdee2974f685b3532e0e0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java
@@ -13,8 +13,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;\r
 import java.util.Set;\r
 \r
 import java.util.LinkedHashMap;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.Book;\r
 import eu.etaxonomy.cdm.model.reference.BookSection;\r
 import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.Book;\r
 import eu.etaxonomy.cdm.model.reference.BookSection;\r


@@ -31,19 +29,17 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  */\r
 public class NomenclaturalReferencePropertySource extends\r
                ReferencePropertySource {\r
  */\r
 public class NomenclaturalReferencePropertySource extends\r
                ReferencePropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NomenclaturalReferencePropertySource.class);\r

        \r
        \r

-       public NomenclaturalReferencePropertySource(ReferenceBase reference) {\r
+       public NomenclaturalReferencePropertySource(ReferenceBase<?> reference) {\r

                super(reference);\r
        }\r
        \r
                super(reference);\r
        }\r
        \r

-       protected static HashMap<Class, String> nomReferenceTypeMap = null;\r
+       protected static HashMap<Class<?>, String> nomReferenceTypeMap = null;\r

        \r
        protected void populateReferenceTypes() {\r
                \r
                // LinkedHashMap maintains insertion order\r
        \r
        protected void populateReferenceTypes() {\r
                \r
                // LinkedHashMap maintains insertion order\r

-               nomReferenceTypeMap = new LinkedHashMap<Class, String>();\r
+               nomReferenceTypeMap = new LinkedHashMap<Class<?>, String>();\r

                \r
                nomReferenceTypeMap.put(ReferenceBase.class, "");\r
 //             referenceTypeMap.put(BibtexReference.class, "BibTeX Reference");\r
                \r
                nomReferenceTypeMap.put(ReferenceBase.class, "");\r
 //             referenceTypeMap.put(BibtexReference.class, "BibTeX Reference");\r


@@ -60,7 +56,7 @@ public class NomenclaturalReferencePropertySource extends
                return nomReferenceTypeMap.values().toArray(new String[] {});\r
        }\r
        \r
                return nomReferenceTypeMap.values().toArray(new String[] {});\r
        }\r
        \r

-       protected Set<Class> getReferenceClassSet() {\r
+       protected Set<Class<?>> getReferenceClassSet() {\r

                return nomReferenceTypeMap.keySet();\r
        }\r
        \r
                return nomReferenceTypeMap.keySet();\r
        }\r
        \r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
index 4e0808b0419c858006660aa372c45628eea65645..93dda0aec93dc0c9dbc285c6227be3ec851505ee 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
@@ -32,7 +32,6 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor;
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.agent.Team;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r

-import eu.etaxonomy.cdm.model.common.CdmBase;\r

 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.BibtexReference;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.BibtexReference;\r


@@ -100,7 +99,7 @@ public class ReferencePropertySource implements IPropertySource {
        private static final Logger logger = Logger\r
                        .getLogger(ReferencePropertySource.class);\r
 \r
        private static final Logger logger = Logger\r
                        .getLogger(ReferencePropertySource.class);\r
 \r

-       ReferenceBase reference;\r
+       ReferenceBase<?> reference;\r

        \r
     // Property unique keys\r
        public static final String P_ID_SEARCH = "P_ID_SEARCH";\r
        \r
     // Property unique keys\r
        public static final String P_ID_SEARCH = "P_ID_SEARCH";\r


@@ -186,7 +185,7 @@ public class ReferencePropertySource implements IPropertySource {
        public static final String P_NOTE = "Note";\r
        public static final String P_CROSSREF = "BibTeX Crossref";              \r
        \r
        public static final String P_NOTE = "Note";\r
        public static final String P_CROSSREF = "BibTeX Crossref";              \r
        \r

-       protected static HashMap<Class, String> referenceTypeMap = null;\r
+       protected static HashMap<Class<?>, String> referenceTypeMap = null;\r

        \r
        private static final String[] P_BIBTEX_ENTRYTYPE_MENU = new String[] {"ARTICLE", "BOOK", "BOOKLET", "INBOOK", "INCOLLECTION", "PROCEEDINGS", "INPROCEEDINGS", "CONFERENCE", "MANUAL", "MASTERTHESIS", "PHDTHESIS", "TECHREPORT", "UNPUBLISHED", "MISC"};\r
 \r
        \r
        private static final String[] P_BIBTEX_ENTRYTYPE_MENU = new String[] {"ARTICLE", "BOOK", "BOOKLET", "INBOOK", "INCOLLECTION", "PROCEEDINGS", "INPROCEEDINGS", "CONFERENCE", "MANUAL", "MASTERTHESIS", "PHDTHESIS", "TECHREPORT", "UNPUBLISHED", "MISC"};\r
 \r


@@ -196,7 +195,7 @@ public class ReferencePropertySource implements IPropertySource {
        protected void populateReferenceTypes() {\r
                \r
                // LinkedHashMap maintains insertion order\r
        protected void populateReferenceTypes() {\r
                \r
                // LinkedHashMap maintains insertion order\r

-               referenceTypeMap = new LinkedHashMap<Class, String>();\r
+               referenceTypeMap = new LinkedHashMap<Class<?>, String>();\r

                \r
                referenceTypeMap.put(ReferenceBase.class, "");\r
 //             referenceTypeMap.put(BibtexReference.class, "BibTeX Reference");\r
                \r
                referenceTypeMap.put(ReferenceBase.class, "");\r
 //             referenceTypeMap.put(BibtexReference.class, "BibTeX Reference");\r


@@ -225,11 +224,11 @@ public class ReferencePropertySource implements IPropertySource {
                return referenceTypeMap.values().toArray(new String[] {});\r
        }\r
        \r
                return referenceTypeMap.values().toArray(new String[] {});\r
        }\r
        \r

-       protected Set<Class> getReferenceClassSet() {\r
+       protected Set<Class<?>> getReferenceClassSet() {\r

                return referenceTypeMap.keySet();\r
        }\r
                \r
                return referenceTypeMap.keySet();\r
        }\r
                \r

-       public ReferencePropertySource(ReferenceBase reference) {\r
+       public ReferencePropertySource(ReferenceBase<?> reference) {\r

                \r
                // Default type of ReferenceBase is Generic\r
                if (reference == null) {\r
                \r
                // Default type of ReferenceBase is Generic\r
                if (reference == null) {\r


@@ -255,7 +254,7 @@ public class ReferencePropertySource implements IPropertySource {
                displayFields.add(P_ID_AUTHORTEAM);\r
                displayFields.add(P_ID_URI);\r
                \r
                displayFields.add(P_ID_AUTHORTEAM);\r
                displayFields.add(P_ID_URI);\r
                \r

-               Class referenceClass = reference.getClass();\r
+               Class<?> referenceClass = reference.getClass();\r

                \r
 //             if (reference instanceof BibtexReference) {\r
 //                                             \r
                \r
 //             if (reference instanceof BibtexReference) {\r
 //                                             \r


@@ -665,10 +664,10 @@ public class ReferencePropertySource implements IPropertySource {
                                \r
                // Reference Type: get integer index of drop-down menu\r
                if (id.equals(P_ID_REFERENCETYPE)) {\r
                                \r
                // Reference Type: get integer index of drop-down menu\r
                if (id.equals(P_ID_REFERENCETYPE)) {\r

-                       Class referenceClass = reference.getClass();\r
+                       Class<?> referenceClass = reference.getClass();\r

                        int menuIndex = 0;\r
 //                     for (Class clazz : referenceTypeMap.keySet()) {\r
                        int menuIndex = 0;\r
 //                     for (Class clazz : referenceTypeMap.keySet()) {\r

-                       for (Class clazz : getReferenceClassSet()) {\r
+                       for (Class<?> clazz : getReferenceClassSet()) {\r

                                if (clazz == referenceClass) {\r
                                        return menuIndex;\r
                                }\r
                                if (clazz == referenceClass) {\r
                                        return menuIndex;\r
                                }\r


@@ -696,7 +695,7 @@ public class ReferencePropertySource implements IPropertySource {
                // Author Team: for now, just edit the cache\r
                // TODO AuthorTeamPropertySource\r
                if (id.equals(P_ID_AUTHORTEAM)) {\r
                // Author Team: for now, just edit the cache\r
                // TODO AuthorTeamPropertySource\r
                if (id.equals(P_ID_AUTHORTEAM)) {\r

-                       TeamOrPersonBase authorTeam = reference.getAuthorTeam();\r
+                       TeamOrPersonBase<?> authorTeam = reference.getAuthorTeam();\r

                        \r
                        if (authorTeam == null) {\r
                                return "";\r
                        \r
                        if (authorTeam == null) {\r
                                return "";\r


@@ -929,7 +928,7 @@ public class ReferencePropertySource implements IPropertySource {
                // Search result\r
                if (id.equals(P_ID_SEARCH)) {\r
                        if (value instanceof ReferenceBase) {\r
                // Search result\r
                if (id.equals(P_ID_SEARCH)) {\r
                        if (value instanceof ReferenceBase) {\r

-                               reference = (ReferenceBase) value;\r
+                               reference = (ReferenceBase<?>) value;\r

                        }\r
                }\r
 \r
                        }\r
                }\r
 \r


@@ -961,7 +960,7 @@ public class ReferencePropertySource implements IPropertySource {
                                logger.error(e.getMessage());\r
                                return;\r
                        }                       \r
                                logger.error(e.getMessage());\r
                                return;\r
                        }                       \r

-                       Class referenceClass = (Class)(getReferenceClassSet().toArray())[menuIndex];\r
+                       Class<?> referenceClass = (Class<?>)(getReferenceClassSet().toArray())[menuIndex];\r

                        \r
                        // Make a new reference using the class\r
                        reference = makeNewReference(referenceClass);\r
                        \r
                        // Make a new reference using the class\r
                        reference = makeNewReference(referenceClass);\r


@@ -972,7 +971,7 @@ public class ReferencePropertySource implements IPropertySource {
                \r
                // Author Team\r
                if (id.equals(P_ID_AUTHORTEAM)) {\r
                \r
                // Author Team\r
                if (id.equals(P_ID_AUTHORTEAM)) {\r

-                       TeamOrPersonBase authorTeam = reference.getAuthorTeam();\r
+                       TeamOrPersonBase<?> authorTeam = reference.getAuthorTeam();\r

                        if (authorTeam == null) {\r
                                authorTeam = Team.NewInstance();\r
                                reference.setAuthorTeam(authorTeam);\r
                        if (authorTeam == null) {\r
                                authorTeam = Team.NewInstance();\r
                                reference.setAuthorTeam(authorTeam);\r


@@ -1096,10 +1095,10 @@ public class ReferencePropertySource implements IPropertySource {
                                        yearsPublished = TimeUtil.convertTimePeriod(year);\r
                                        \r
                                        // Update reference's dataPublished field\r
                                        yearsPublished = TimeUtil.convertTimePeriod(year);\r
                                        \r
                                        // Update reference's dataPublished field\r

-                                       TimePeriod datePublished = ((StrictReferenceBase) reference).getDatePublished();\r
+                                       TimePeriod datePublished = ((StrictReferenceBase<?>) reference).getDatePublished();\r

                                        \r
                                        if (datePublished == null) {\r
                                        \r
                                        if (datePublished == null) {\r

-                                               ((StrictReferenceBase) reference).setDatePublished(yearsPublished);\r
+                                               ((StrictReferenceBase<?>) reference).setDatePublished(yearsPublished);\r

                                        } else {\r
                                                \r
                                                // Any months or days should be left as is - only update years \r
                                        } else {\r
                                                \r
                                                // Any months or days should be left as is - only update years \r


@@ -1107,7 +1106,7 @@ public class ReferencePropertySource implements IPropertySource {
                                                datePublished.setEndYear(yearsPublished.getEndYear());\r
                                        }\r
                                } else {\r
                                                datePublished.setEndYear(yearsPublished.getEndYear());\r
                                        }\r
                                } else {\r

-                                       ((StrictReferenceBase) reference).setDatePublished(null);\r
+                                       ((StrictReferenceBase<?>) reference).setDatePublished(null);\r

                                }\r
                                \r
 \r
                                }\r
                                \r
 \r


@@ -1133,17 +1132,17 @@ public class ReferencePropertySource implements IPropertySource {
         * @param referenceClass\r
         * @return\r
         */\r
         * @param referenceClass\r
         * @return\r
         */\r

-       private ReferenceBase makeNewReference(Class referenceClass) {\r
+       private ReferenceBase<?> makeNewReference(Class<?> referenceClass) {\r

                                \r
                // Check whether the class has a method "NewInstance()";\r
                try {\r
                        Method method = referenceClass.getMethod("NewInstance", null);\r
                                \r
                // Check whether the class has a method "NewInstance()";\r
                try {\r
                        Method method = referenceClass.getMethod("NewInstance", null);\r

-                       reference = (ReferenceBase) method.invoke(null, null);\r
+                       reference = (ReferenceBase<?>) method.invoke(null, null);\r

                } catch (NoSuchMethodException e) {\r
                        try {\r
                                // If not, use its constructor\r
                } catch (NoSuchMethodException e) {\r
                        try {\r
                                // If not, use its constructor\r

-                               Constructor constructor = referenceClass.getConstructor(null);\r
-                               reference = (ReferenceBase) constructor.newInstance(null);\r
+                               Constructor<?> constructor = referenceClass.getConstructor(null);\r
+                               reference = (ReferenceBase<?>) constructor.newInstance(null);\r

                        } catch (SecurityException e1) {\r
                                e1.printStackTrace();\r
                        } catch (NoSuchMethodException e1) {\r
                        } catch (SecurityException e1) {\r
                                e1.printStackTrace();\r
                        } catch (NoSuchMethodException e1) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDescriptor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDescriptor.java
index 8e0cae8471cad4daa7642d6fcf2aa8434cb57d28..b566f6db560677193bac50c028f2b1dbe44da962 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDescriptor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDescriptor.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.reference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.reference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.swt.widgets.Composite;\r


@@ -25,8 +24,6 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @version 1.0\r
  */\r
 abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {\r
  * @version 1.0\r
  */\r
 abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ReferenceSearchDescriptor.class);\r

                \r
        int searchType;\r
        \r
                \r
        int searchType;\r
        \r


@@ -46,7 +43,7 @@ abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {
                        Object value = ((ReferenceSearchDialog) dialog).open();\r
                                if (value instanceof ReferenceBase) {\r
                                        \r
                        Object value = ((ReferenceSearchDialog) dialog).open();\r
                                if (value instanceof ReferenceBase) {\r
                                        \r

-                                       ReferenceBase reference = (ReferenceBase) value;\r
+                                       ReferenceBase<?> reference = (ReferenceBase<?>) value;\r

                                        saveReference(reference);\r
                                        return new ReferencePropertySource(reference);\r
                                }\r
                                        saveReference(reference);\r
                                        return new ReferencePropertySource(reference);\r
                                }\r


@@ -59,5 +56,5 @@ abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {
         return editor;\r
     }\r
         \r
         return editor;\r
     }\r
         \r

-    abstract protected void saveReference(ReferenceBase reference);    \r
+    abstract protected void saveReference(ReferenceBase<?> reference); \r

 }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDialog.java
index 225f7a98ff8adf3e787a0c48ee308232e3b20f5f..4b8f97a2604ae8e809e7093daeefbcce59909129 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDialog.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.propertysheet.reference;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r


@@ -47,8 +46,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class ReferenceSearchDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class ReferenceSearchDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ReferenceSearchDialog.class);\r

        \r
        private Table resultsTable;\r
        private Text searchTermText;\r
        \r
        private Table resultsTable;\r
        private Text searchTermText;\r


@@ -57,7 +54,7 @@ public class ReferenceSearchDialog extends Dialog {
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r

-       private ReferenceBase selectedReference;\r
+       private ReferenceBase<?> selectedReference;\r

        private int searchType;\r
        \r
        public ReferenceSearchDialog(Shell parent, int searchType) {\r
        private int searchType;\r
        \r
        public ReferenceSearchDialog(Shell parent, int searchType) {\r


@@ -158,7 +155,7 @@ public class ReferenceSearchDialog extends Dialog {
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r

-                                       return ((ReferenceBase) element).getTitleCache();\r
+                                       return ((ReferenceBase<?>) element).getTitleCache();\r

                                }\r
                                return super.getText(element);\r
                        }\r
                                }\r
                                return super.getText(element);\r
                        }\r


@@ -176,7 +173,7 @@ public class ReferenceSearchDialog extends Dialog {
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof ReferenceBase) {\r
 \r
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof ReferenceBase) {\r
 \r

-                                       setSelectedReference((ReferenceBase) data);\r
+                                       setSelectedReference((ReferenceBase<?>) data);\r

                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r
                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r


@@ -225,6 +222,7 @@ public class ReferenceSearchDialog extends Dialog {
 \r
        }\r
        \r
 \r
        }\r
        \r

+       // FIXME typification very loose\r

        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.getReferencesByTitle(searchTermText.getText());\r
        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.getReferencesByTitle(searchTermText.getText());\r


@@ -260,11 +258,11 @@ public class ReferenceSearchDialog extends Dialog {
                shell.dispose();\r
        }\r
        \r
                shell.dispose();\r
        }\r
        \r

-       private void setSelectedReference(ReferenceBase selectedReference) {\r
+       private void setSelectedReference(ReferenceBase<?> selectedReference) {\r

                this.selectedReference = selectedReference;\r
        }\r
        \r
                this.selectedReference = selectedReference;\r
        }\r
        \r

-       private ReferenceBase getSelectedReference() {\r
+       private ReferenceBase<?> getSelectedReference() {\r

                return selectedReference;\r
        }\r
 }\r
                return selectedReference;\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/SingleRefTypePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/SingleRefTypePropertySource.java
index 1d71189e3eb07d1da69b4da3a78637565c008332..be9e672f4af0e9f7eeff3e942679ec635cf06f4e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/SingleRefTypePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/SingleRefTypePropertySource.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.reference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.reference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ILabelProvider;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r
 import org.eclipse.jface.viewers.ILabelProvider;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 \r


@@ -30,15 +29,13 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @version 1.0\r
  */\r
 public class SingleRefTypePropertySource extends ReferencePropertySource {\r
  * @version 1.0\r
  */\r
 public class SingleRefTypePropertySource extends ReferencePropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(SingleRefTypePropertySource.class);\r

        \r
        public static final String BOOK = "Book";\r
        public static final String JOURNAL = "Journal";\r
 \r
        private String referenceType;\r
        \r
        \r
        public static final String BOOK = "Book";\r
        public static final String JOURNAL = "Journal";\r
 \r
        private String referenceType;\r
        \r

-       public SingleRefTypePropertySource(ReferenceBase reference, String referenceType) {\r
+       public SingleRefTypePropertySource(ReferenceBase<?> reference, String referenceType) {\r

                super(reference);\r
                \r
                this.referenceType = referenceType;\r
                super(reference);\r
                \r
                this.referenceType = referenceType;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
index 836888e16167f6b38b86a6e3bb85def22db6f21c..bd87190ff1e0e7a9e21e185dbbe0ecaf8394c9ef 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
@@ -25,11 +25,11 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
        private static final Logger logger = Logger\r
                        .getLogger(TypeCollectionPropertySource.class);\r
        \r
        private static final Logger logger = Logger\r
                        .getLogger(TypeCollectionPropertySource.class);\r
        \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

 \r
 \r

-       public TypeCollectionPropertySource(TaxonNameBase name, Collection collection) {\r
+       public TypeCollectionPropertySource(TaxonNameBase<?, ?> name, Collection<?> collection) {\r

                super(collection);\r
                super(collection);\r

-               this.name = name;\r
+               this.setName(name);\r

        }\r
        \r
        protected void addDescriptor(Object item) {\r
        }\r
        \r
        protected void addDescriptor(Object item) {\r


@@ -52,7 +52,7 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
 \r
                if (item instanceof SpecimenTypeDesignation) {\r
                        \r
 \r
                if (item instanceof SpecimenTypeDesignation) {\r
                        \r

-                       TypeDesignationStatusBase status = ((TypeDesignationBase) item).getTypeStatus();\r
+                       TypeDesignationStatusBase<?> status = ((TypeDesignationBase<?>) item).getTypeStatus();\r

                        \r
                        if (status != null) {\r
                                str = status.getLabel();\r
                        \r
                        if (status != null) {\r
                                str = status.getLabel();\r


@@ -77,7 +77,7 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
        public Object getPropertyValue(Object id) {\r
                \r
                if (id instanceof TypeDesignationBase) {\r
        public Object getPropertyValue(Object id) {\r
                \r
                if (id instanceof TypeDesignationBase) {\r

-                       return new TypeDesignationPropertySource((TypeDesignationBase) id);\r
+                       return new TypeDesignationPropertySource((TypeDesignationBase<?>) id);\r

                }\r
                return null;\r
        }       \r
                }\r
                return null;\r
        }       \r


@@ -103,4 +103,18 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
        public String toString() {\r
                return "";\r
        }\r
        public String toString() {\r
                return "";\r
        }\r

+\r
+       /**\r
+        * @param name the name to set\r
+        */\r
+       public void setName(TaxonNameBase<?, ?> name) {\r
+               this.name = name;\r
+       }\r
+\r
+       /**\r
+        * @return the name\r
+        */\r
+       public TaxonNameBase<?, ?> getName() {\r
+               return name;\r
+       }\r

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
index f84d5f14c1345572443e422520c95a428364c498..df242c36a2bddc8e93a834f3bb1762db3145ce1f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;\r
 import java.util.Vector;\r
 \r
 import java.beans.PropertyChangeListener;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r


@@ -34,10 +33,8 @@ import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;
  * @version 1.0\r
  */\r
 public class TypeDesignationPropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class TypeDesignationPropertySource implements IPropertySource {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TypeDesignationPropertySource.class);\r

 \r
 \r

-       private TypeDesignationBase typeDesignation;\r
+       private TypeDesignationBase<?> typeDesignation;\r

 \r
     /**\r
      * Property unique keys\r
 \r
     /**\r
      * Property unique keys\r


@@ -53,7 +50,7 @@ public class TypeDesignationPropertySource implements IPropertySource {
        \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
        \r
        \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
        \r

-       TypeDesignationPropertySource(TypeDesignationBase typeDesignation) {\r
+       TypeDesignationPropertySource(TypeDesignationBase<?> typeDesignation) {\r

                this.typeDesignation = typeDesignation;\r
                \r
                addDescriptor(P_ID_CITATION);\r
                this.typeDesignation = typeDesignation;\r
                \r
                addDescriptor(P_ID_CITATION);\r


@@ -94,7 +91,7 @@ public class TypeDesignationPropertySource implements IPropertySource {
                \r
                if (id.equals(P_ID_CITATION)) {\r
                \r
                \r
                if (id.equals(P_ID_CITATION)) {\r
                \r

-                       ReferenceBase reference = typeDesignation.getCitation();\r
+                       ReferenceBase<?> reference = typeDesignation.getCitation();\r

                        if (reference == null) {\r
                                reference = Generic.NewInstance();\r
                        }\r
                        if (reference == null) {\r
                                reference = Generic.NewInstance();\r
                        }\r


@@ -102,7 +99,7 @@ public class TypeDesignationPropertySource implements IPropertySource {
                        referencePropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof ReferenceBase) {       \r
                        referencePropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof ReferenceBase) {       \r

-                                               typeDesignation.setCitation((ReferenceBase) evt.getNewValue());\r
+                                               typeDesignation.setCitation((ReferenceBase<?>) evt.getNewValue());\r

                                        }\r
                                }\r
                        });\r
                                        }\r
                                }\r
                        });\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertyDescriptor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertyDescriptor.java
index 3b13da444a854ea1f5548bb1032a7725e4a89f82..8b518af44cf48ccc67c3d04a9d57e61dd75cc889 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertyDescriptor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertyDescriptor.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.jface.window.Window;\r
 import org.eclipse.jface.viewers.CellEditor;\r
 import org.eclipse.jface.viewers.DialogCellEditor;\r
 import org.eclipse.jface.window.Window;\r


@@ -33,12 +32,10 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class TypePropertyDescriptor extends PropertyDescriptor {\r
  * @version 1.0\r
  */\r
 public class TypePropertyDescriptor extends PropertyDescriptor {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TypePropertyDescriptor.class);\r

        \r
        \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

        \r
        \r

-       public TypePropertyDescriptor(Object id, String displayName, TaxonNameBase name) {\r
+       public TypePropertyDescriptor(Object id, String displayName, TaxonNameBase<?, ?> name) {\r

                super(id, displayName);\r
                this.name = name;\r
        }\r
                super(id, displayName);\r
                this.name = name;\r
        }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
index 5e58561039e6f8dc25c197d5c128560e93d92c47..3e48419acf9dfc2fef6cd6595385334ec45bc64f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.propertysheet.type;
 import java.util.Set;\r
 import java.util.Vector;\r
 \r
 import java.util.Set;\r
 import java.util.Vector;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertyDescriptor;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 import org.eclipse.ui.views.properties.PropertyDescriptor;\r


@@ -25,19 +24,13 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  * @version 1.0\r
  */\r
 public class TypePropertySource implements IPropertySource {\r
  * @version 1.0\r
  */\r
 public class TypePropertySource implements IPropertySource {\r

-       private static Logger logger = Logger.getLogger(TypePropertySource.class);\r

        \r
        /**\r
         * The name whose types are being displayed.\r
         */\r
        \r
        /**\r
         * The name whose types are being displayed.\r
         */\r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

        \r
        /**\r
        \r
        /**\r

-        * If this is a property with a parent, the parent's property ID\r
-        */\r
-       private String parentid;\r
-       \r
-    /**\r

      * Property unique keys\r
      */\r
        public static final String P_ID_NAMETYPES = "nametypes";\r
      * Property unique keys\r
      */\r
        public static final String P_ID_NAMETYPES = "nametypes";\r


@@ -52,7 +45,7 @@ public class TypePropertySource implements IPropertySource {
        \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
        \r
        \r
        protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();\r
        \r

-       public TypePropertySource(TaxonNameBase name) {\r
+       public TypePropertySource(TaxonNameBase<?, ?> name) {\r

                this.name = name;\r
                \r
                addDescriptor(P_ID_NAMETYPES);\r
                this.name = name;\r
                \r
                addDescriptor(P_ID_NAMETYPES);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
index 73810bd4ffab7b724e86cd6cfa456f012da45566..9cd3db9f20c22d3ce3201a34c14b8ac19200edad 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r

-import java.util.Set;\r
-\r

 import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.runtime.Assert;\r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.runtime.Assert;\r


@@ -45,9 +43,9 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        private static Logger logger = Logger\r
                        .getLogger(ChooseNameTypeWizardPage.class);\r
 \r
        private static Logger logger = Logger\r
                        .getLogger(ChooseNameTypeWizardPage.class);\r
 \r

-       private TaxonNameBase name;     \r
+       private TaxonNameBase<?, ?> name;       \r

        private NameTypeDesignation typeDesignation;\r
        private NameTypeDesignation typeDesignation;\r

-       private TaxonNameBase savedName;\r
+       private TaxonNameBase<?, ?> savedName;\r

        \r
        private Text txtName;\r
        private Button btnClearName;\r
        \r
        private Text txtName;\r
        private Button btnClearName;\r


@@ -65,8 +63,8 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         * @param name\r
         * @param typeDesignationsList \r
         */\r
         * @param name\r
         * @param typeDesignationsList \r
         */\r

-       public ChooseNameTypeWizardPage(TypeDesignationBase typeDesignation,\r
-                       TaxonNameBase name, WritableList typeDesignationsList) {\r
+       public ChooseNameTypeWizardPage(TypeDesignationBase<?> typeDesignation,\r
+                       TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r

                super("");\r
                \r
                Assert.isTrue(typeDesignation == null || typeDesignation instanceof NameTypeDesignation);\r
                super("");\r
                \r
                Assert.isTrue(typeDesignation == null || typeDesignation instanceof NameTypeDesignation);\r


@@ -77,6 +75,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
                \r
                setTitle("Create or edit type designation");\r
                setDescription("Create or edit type designation for '" + name.getTitleCache() + "\".");\r
                \r
                setTitle("Create or edit type designation");\r
                setDescription("Create or edit type designation for '" + name.getTitleCache() + "\".");\r

+               logger.trace(this.getClass().getSimpleName() + " created.");\r

        }\r
        \r
        \r
        }\r
        \r
        \r


@@ -218,7 +217,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         Object value = ((NameSearchDialog) dialog).open();\r
         \r
                if (value instanceof TaxonNameBase) {\r
         Object value = ((NameSearchDialog) dialog).open();\r
         \r
                if (value instanceof TaxonNameBase) {\r

-                       setSavedName((TaxonNameBase) value);\r
+                       setSavedName((TaxonNameBase<?, ?>) value);\r

                        updatePage();\r
                }\r
        }\r
                        updatePage();\r
                }\r
        }\r


@@ -226,7 +225,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        /**\r
         * @param value\r
         */\r
        /**\r
         * @param value\r
         */\r

-       private void setSavedName(TaxonNameBase savedName) {\r
+       private void setSavedName(TaxonNameBase<?, ?> savedName) {\r

                \r
                this.savedName = savedName;\r
                \r
                \r
                this.savedName = savedName;\r
                \r


@@ -267,7 +266,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         \r
         if (complete) {\r
                \r
         \r
         if (complete) {\r
                \r

-               TaxonNameBase typeName = null;\r
+               TaxonNameBase<?, ?> typeName = null;\r

                if (savedName != null) {\r
                        typeName = savedName;\r
                } else {\r
                if (savedName != null) {\r
                        typeName = savedName;\r
                } else {\r


@@ -277,7 +276,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
                        }\r
                }\r
                \r
                        }\r
                }\r
                \r

-               ReferenceBase citation = referenceComposite.getReference();\r
+               ReferenceBase<?> citation = referenceComposite.getReference();\r

                String citationMicroReference = referenceComposite.getMicroReference();\r
                                \r
                if (typeDesignation == null) {\r
                String citationMicroReference = referenceComposite.getMicroReference();\r
                                \r
                if (typeDesignation == null) {\r


@@ -301,7 +300,12 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        public class TemporaryNameTypeDesignation extends\r
                        NameTypeDesignation {\r
                                \r
        public class TemporaryNameTypeDesignation extends\r
                        NameTypeDesignation {\r
                                \r

-               public TemporaryNameTypeDesignation(TaxonNameBase typeName, ReferenceBase citation, String citationMicroReference,\r
+               /**\r
+                * \r
+                */\r
+               private static final long serialVersionUID = 7309597024482795166L;\r
+\r
+               public TemporaryNameTypeDesignation(TaxonNameBase<?, ?> typeName, ReferenceBase<?> citation, String citationMicroReference,\r

                                String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isLectoType, boolean isNotDesignated) {\r
                        super(typeName, citation, citationMicroReference, originalNameString, \r
                                        isRejectedType, isConservedType,  isLectoType, isNotDesignated);\r
                                String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isLectoType, boolean isNotDesignated) {\r
                        super(typeName, citation, citationMicroReference, originalNameString, \r
                                        isRejectedType, isConservedType,  isLectoType, isNotDesignated);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
index 66876c27e406a2120611e94503ac09828354aebd..bf6fe55b41fe4b4417e743ffd86e7ede266f7e2e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
@@ -9,12 +9,10 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r

-import org.eclipse.swt.custom.CCombo;\r

 import org.eclipse.swt.events.KeyAdapter;\r
 import org.eclipse.swt.events.KeyEvent;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.KeyAdapter;\r
 import org.eclipse.swt.events.KeyEvent;\r
 import org.eclipse.swt.events.SelectionAdapter;\r


@@ -27,7 +25,6 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;\r
 \r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import org.eclipse.swt.widgets.Text;\r
 \r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r

-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r

 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r


@@ -44,10 +41,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class ChooseSpecimenTypeWizardPage extends WizardPage {\r
  * @version 1.0\r
  */\r
 public class ChooseSpecimenTypeWizardPage extends WizardPage {\r

-       private static Logger logger = Logger\r
-                       .getLogger(ChooseSpecimenTypeWizardPage.class);\r

 \r
 \r

-       private TaxonNameBase name;     \r

        private SpecimenTypeDesignation typeDesignation;\r
        private WritableList typeDesignationsList;\r
 \r
        private SpecimenTypeDesignation typeDesignation;\r
        private WritableList typeDesignationsList;\r
 \r


@@ -62,13 +56,12 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
         * @param typeDesignationsList \r
         */\r
        public ChooseSpecimenTypeWizardPage(\r
         * @param typeDesignationsList \r
         */\r
        public ChooseSpecimenTypeWizardPage(\r

-                       TypeDesignationBase typeDesignation, TaxonNameBase name, WritableList typeDesignationsList) {\r
+                       TypeDesignationBase<?> typeDesignation, TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r

                super("");\r
                                \r
                Assert.isTrue(typeDesignation == null || typeDesignation instanceof SpecimenTypeDesignation,"");\r
                \r
                this.typeDesignation = (SpecimenTypeDesignation) typeDesignation;\r
                super("");\r
                                \r
                Assert.isTrue(typeDesignation == null || typeDesignation instanceof SpecimenTypeDesignation,"");\r
                \r
                this.typeDesignation = (SpecimenTypeDesignation) typeDesignation;\r

-               this.name = name;\r

                this.typeDesignationsList = typeDesignationsList;\r
                \r
                setTitle("Create or edit type designation");\r
                this.typeDesignationsList = typeDesignationsList;\r
                \r
                setTitle("Create or edit type designation");\r


@@ -92,7 +85,6 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
                // Create designation type status dropdown \r
                statusCombo = new Combo(container, SWT.BORDER);\r
                statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
                // Create designation type status dropdown \r
                statusCombo = new Combo(container, SWT.BORDER);\r
                statusCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r

-               TermVocabulary<SpecimenTypeDesignationStatus> typeStatusSet = CdmStore.getDefault().getSpecimenTypeDesignationStatus();\r

                typeStatusArray = new SpecimenTypeDesignationStatus[CdmStore.getDefault().getSpecimenTypeDesignationStatus().size()];\r
                int i = 0;\r
                int selectedIndex = -1;\r
                typeStatusArray = new SpecimenTypeDesignationStatus[CdmStore.getDefault().getSpecimenTypeDesignationStatus().size()];\r
                int i = 0;\r
                int selectedIndex = -1;\r


@@ -185,7 +177,7 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
         \r
         if (complete) {\r
                \r
         \r
         if (complete) {\r
                \r

-               ReferenceBase citation = referenceComposite.getReference();\r
+               ReferenceBase<?> citation = referenceComposite.getReference();\r

                String citationMicroReference = referenceComposite.getMicroReference();\r
                \r
                SpecimenTypeDesignationStatus status = typeStatusArray[statusCombo.getSelectionIndex()];\r
                String citationMicroReference = referenceComposite.getMicroReference();\r
                \r
                SpecimenTypeDesignationStatus status = typeStatusArray[statusCombo.getSelectionIndex()];\r


@@ -216,7 +208,12 @@ public class ChooseSpecimenTypeWizardPage extends WizardPage {
        public class TemporarySpecimenTypeDesignation extends\r
                        SpecimenTypeDesignation {\r
                \r
        public class TemporarySpecimenTypeDesignation extends\r
                        SpecimenTypeDesignation {\r
                \r

-               TemporarySpecimenTypeDesignation(DerivedUnitBase specimen, SpecimenTypeDesignationStatus status, ReferenceBase citation, String citationMicroReference, \r
+               /**\r
+                * \r
+                */\r
+               private static final long serialVersionUID = -8537111618591235148L;\r
+\r
+               TemporarySpecimenTypeDesignation(DerivedUnitBase<?> specimen, SpecimenTypeDesignationStatus status, ReferenceBase<?> citation, String citationMicroReference, \r

                                String originalNameString, boolean isNotDesignated) {\r
                        super(specimen, status, citation, citationMicroReference, \r
                                        originalNameString, isNotDesignated);\r
                                String originalNameString, boolean isNotDesignated) {\r
                        super(specimen, status, citation, citationMicroReference, \r
                                        originalNameString, isNotDesignated);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
index c4d5ed2221c9cd0194c03da079c8085e12677333..e31910e3e938daf0356a4d2c327f648ba6055123 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r


@@ -31,7 +30,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Table;\r
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Table;\r

-import org.eclipse.swt.widgets.TableItem;\r

 \r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 \r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r


@@ -46,13 +44,13 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class ListTypeWizardPage extends WizardPage {\r
  * @version 1.0\r
  */\r
 public class ListTypeWizardPage extends WizardPage {\r

-       private static Logger logger = Logger.getLogger(ListTypeWizardPage.class);\r
-       private TaxonNameBase name;\r
+       \r
+       private TaxonNameBase<?, ?> name;\r

 \r
        /**\r
         * @param name\r
         */\r
 \r
        /**\r
         * @param name\r
         */\r

-       public ListTypeWizardPage(TaxonNameBase name, WritableList typeDesignationsList) {\r
+       public ListTypeWizardPage(TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r

                super("");\r
                this.name = name;\r
                \r
                super("");\r
                this.name = name;\r
                \r


@@ -69,7 +67,7 @@ public class ListTypeWizardPage extends WizardPage {
        private Button btnRemove;\r
        private Button btnEdit;\r
 \r
        private Button btnRemove;\r
        private Button btnEdit;\r
 \r

-       private TypeDesignationBase typeDesignation;\r
+       private TypeDesignationBase<?> typeDesignation;\r

        private TableViewer tableViewer;\r
 \r
 \r
        private TableViewer tableViewer;\r
 \r
 \r


@@ -123,9 +121,8 @@ public class ListTypeWizardPage extends WizardPage {
                typeDesignationsTable.addSelectionListener(new SelectionAdapter() {\r
                        public void widgetSelected(SelectionEvent e) { \r
                                setEnableTypeDesignationButtons(true);\r
                typeDesignationsTable.addSelectionListener(new SelectionAdapter() {\r
                        public void widgetSelected(SelectionEvent e) { \r
                                setEnableTypeDesignationButtons(true);\r

-                               TableItem[] selectedItem = typeDesignationsTable.getSelection();\r

                                if (e.item.getData() instanceof TypeDesignationBase) {\r
                                if (e.item.getData() instanceof TypeDesignationBase) {\r

-                                       setSelectedTypeDesignation((TypeDesignationBase) e.item.getData());\r
+                                       setSelectedTypeDesignation((TypeDesignationBase<?>) e.item.getData());\r

                                }\r
                        }\r
                });\r
                                }\r
                        }\r
                });\r


@@ -143,14 +140,14 @@ public class ListTypeWizardPage extends WizardPage {
                                providerMaps) {\r
                        public String getColumnText(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r
                                providerMaps) {\r
                        public String getColumnText(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r

-                                       return getTypeDesignationString((TypeDesignationBase) element);\r
+                                       return getTypeDesignationString((TypeDesignationBase<?>) element);\r

                                }\r
                                return "";\r
                        }\r
 \r
                        public Image getColumnImage(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r
                                }\r
                                return "";\r
                        }\r
 \r
                        public Image getColumnImage(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r

-                                       return getTypeDesignationImage((TypeDesignationBase) element);\r
+                                       return getTypeDesignationImage((TypeDesignationBase<?>) element);\r

                                }\r
                                return null;\r
                        }\r
                                }\r
                                return null;\r
                        }\r


@@ -161,7 +158,7 @@ public class ListTypeWizardPage extends WizardPage {
                        public void doubleClick(DoubleClickEvent event) {\r
                                if (((StructuredSelection) event.getSelection())\r
                                                .getFirstElement() instanceof TypeDesignationBase) {\r
                        public void doubleClick(DoubleClickEvent event) {\r
                                if (((StructuredSelection) event.getSelection())\r
                                                .getFirstElement() instanceof TypeDesignationBase) {\r

-                                       TypeDesignationBase typeDesignation = (TypeDesignationBase) \r
+                                       TypeDesignationBase<?> typeDesignation = (TypeDesignationBase<?>) \r

                                                        ((StructuredSelection) event.getSelection()).getFirstElement();\r
                                        createTypeDesignationWizard(typeDesignation);\r
                                }\r
                                                        ((StructuredSelection) event.getSelection()).getFirstElement();\r
                                        createTypeDesignationWizard(typeDesignation);\r
                                }\r


@@ -169,15 +166,15 @@ public class ListTypeWizardPage extends WizardPage {
                });\r
        }\r
 \r
                });\r
        }\r
 \r

-       private void setSelectedTypeDesignation(TypeDesignationBase typeDesignation) {\r
+       private void setSelectedTypeDesignation(TypeDesignationBase<?> typeDesignation) {\r

                this.typeDesignation = typeDesignation;\r
        }\r
 \r
                this.typeDesignation = typeDesignation;\r
        }\r
 \r

-       private TypeDesignationBase getSelectedTypeDesignation() {\r
+       private TypeDesignationBase<?> getSelectedTypeDesignation() {\r

                return typeDesignation;\r
        }\r
        \r
                return typeDesignation;\r
        }\r
        \r

-       private void createTypeDesignationWizard(TypeDesignationBase typeDesignation) {\r
+       private void createTypeDesignationWizard(TypeDesignationBase<?> typeDesignation) {\r

                Wizard wizard = new TypeDesignationWizard(typeDesignation, name, typeDesignationsList);\r
                \r
                WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);\r
                Wizard wizard = new TypeDesignationWizard(typeDesignation, name, typeDesignationsList);\r
                \r
                WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);\r


@@ -191,11 +188,11 @@ public class ListTypeWizardPage extends WizardPage {
                btnEdit.setEnabled(enabled);\r
        }\r
 \r
                btnEdit.setEnabled(enabled);\r
        }\r
 \r

-       private Image getTypeDesignationImage(TypeDesignationBase typeDesignation) {\r
+       private Image getTypeDesignationImage(TypeDesignationBase<?> typeDesignation) {\r

                return null;\r
        }\r
 \r
                return null;\r
        }\r
 \r

-       private String getTypeDesignationString(TypeDesignationBase typeDesignation) {\r
+       private String getTypeDesignationString(TypeDesignationBase<?> typeDesignation) {\r

                String str = "";\r
                if (typeDesignation instanceof SpecimenTypeDesignation) {\r
                        if (((SpecimenTypeDesignation) typeDesignation).getTypeSpecimen() != null) {\r
                String str = "";\r
                if (typeDesignation instanceof SpecimenTypeDesignation) {\r
                        if (((SpecimenTypeDesignation) typeDesignation).getTypeSpecimen() != null) {\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/NameSearchDialog.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/NameSearchDialog.java
index a72df43756dd72d2bf3b8b1aaf082cd13ae571d2..654eef0b4c18572587680a2373c2ea8fe000eb8b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/NameSearchDialog.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/NameSearchDialog.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.propertysheet.type.wizard;
 \r
 import java.util.List;\r
 \r
 \r
 import java.util.List;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.viewers.LabelProvider;\r
 import org.eclipse.jface.viewers.TableViewer;\r


@@ -46,8 +45,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0\r
  */\r
 public class NameSearchDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class NameSearchDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameSearchDialog.class);\r

        \r
        private Table resultsTable;\r
        private Text searchTermText;\r
        \r
        private Table resultsTable;\r
        private Text searchTermText;\r


@@ -56,7 +53,7 @@ public class NameSearchDialog extends Dialog {
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r
        private Shell shell;\r
        private Button okButton;\r
        private TableViewer resultsTableViewer;\r

-       private TaxonNameBase selectedName;\r
+       private TaxonNameBase<?, ?> selectedName;\r

        \r
        public NameSearchDialog(Shell parent) {\r
                // TODO merge this with NameSearchDialog eu.etaxonomy.taxeditor.editor.name\r
        \r
        public NameSearchDialog(Shell parent) {\r
                // TODO merge this with NameSearchDialog eu.etaxonomy.taxeditor.editor.name\r


@@ -151,7 +148,7 @@ public class NameSearchDialog extends Dialog {
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r
                resultsTableViewer.setLabelProvider(new LabelProvider() {\r
                        public String getText(Object element) {\r
                                if (element instanceof ReferenceBase) {\r

-                                       return ((ReferenceBase) element).getTitleCache();\r
+                                       return ((ReferenceBase<?>) element).getTitleCache();\r

                                }\r
                                return super.getText(element);\r
                        }\r
                                }\r
                                return super.getText(element);\r
                        }\r


@@ -169,7 +166,7 @@ public class NameSearchDialog extends Dialog {
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof TaxonNameBase) {\r
 \r
                                // Make sure selection is a ReferenceBase\r
                                if (data instanceof TaxonNameBase) {\r
 \r

-                                       setSelectedName((TaxonNameBase) data);\r
+                                       setSelectedName((TaxonNameBase<?, ?>) data);\r

                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r
                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r


@@ -218,6 +215,7 @@ public class NameSearchDialog extends Dialog {
 \r
        }\r
        \r
 \r
        }\r
        \r

+       // FIXME loose typification\r

        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.searchNameString(searchTermText.getText());\r
        private void populateSearchResults() {\r
                // Get search results\r
                List resultsArray = CdmStore.searchNameString(searchTermText.getText());\r


@@ -242,11 +240,11 @@ public class NameSearchDialog extends Dialog {
                shell.dispose();\r
        }\r
        \r
                shell.dispose();\r
        }\r
        \r

-       private void setSelectedName(TaxonNameBase selectedName) {\r
+       private void setSelectedName(TaxonNameBase<?, ?> selectedName) {\r

                this.selectedName = selectedName;\r
        }\r
        \r
                this.selectedName = selectedName;\r
        }\r
        \r

-       private TaxonNameBase getSelectedName() {\r
+       private TaxonNameBase<?, ?> getSelectedName() {\r

                return selectedName;\r
        }\r
 }\r
                return selectedName;\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java
index da9a0746f3317ef78126fe53c6a53be3157fb894..c745eecf5b640b9f5a3e10822d19f4b3e7ccb70e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.Wizard;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.Wizard;\r
 import org.eclipse.jface.wizard.WizardPage;\r


@@ -26,11 +25,9 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  */\r
 public class TypeDesignationWizard extends Wizard {\r
        \r
  */\r
 public class TypeDesignationWizard extends Wizard {\r
        \r

-       private static Logger logger = Logger\r
-                       .getLogger(TypeDesignationWizard.class);\r

        \r
        \r

-       private TypeDesignationBase typeDesignation;\r
-       private TaxonNameBase name;\r
+       private TypeDesignationBase<?> typeDesignation;\r
+       private TaxonNameBase<?, ?> name;\r

        private WritableList typeDesignationsList;\r
        \r
        private WizardPage chooseTypePage;\r
        private WritableList typeDesignationsList;\r
        \r
        private WizardPage chooseTypePage;\r


@@ -39,7 +36,7 @@ public class TypeDesignationWizard extends Wizard {
         * @param typeDesignation\r
         * @param typeDesignationsList \r
         */\r
         * @param typeDesignation\r
         * @param typeDesignationsList \r
         */\r

-       public TypeDesignationWizard(TypeDesignationBase typeDesignation, TaxonNameBase name, WritableList typeDesignationsList) {\r
+       public TypeDesignationWizard(TypeDesignationBase<?> typeDesignation, TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r

 \r
                this.name = name;\r
                this.typeDesignation = typeDesignation;\r
 \r
                this.name = name;\r
                this.typeDesignation = typeDesignation;\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java
index 56be246c887d2133c40b6cd1a804a003c31eeb9d..029b6893a91b1f6a81eb5a876366d1f43df2a60f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java
@@ -9,13 +9,11 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.IWizardPage;\r
 import org.eclipse.jface.wizard.Wizard;\r
 \r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.IWizardPage;\r
 import org.eclipse.jface.wizard.Wizard;\r
 \r
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;\r

-import eu.etaxonomy.cdm.model.common.CdmBase;\r

 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r


@@ -29,15 +27,14 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class TypeListWizard extends Wizard {\r
  * @version 1.0\r
  */\r
 public class TypeListWizard extends Wizard {\r

-       private static Logger logger = Logger.getLogger(TypeListWizard.class);\r

 \r
 \r

-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r

        private WritableList typeDesignationsList;\r
        \r
        /**\r
         * @param name\r
         */\r
        private WritableList typeDesignationsList;\r
        \r
        /**\r
         * @param name\r
         */\r

-       public TypeListWizard(TaxonNameBase name) {\r
+       public TypeListWizard(TaxonNameBase<?, ?> name) {\r

                super();\r
                \r
                this.name = name;\r
                super();\r
                \r
                this.name = name;\r

diff --git a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java
index 7a06734caef13b520592b903f012d70fec0422b5..4c215712d6e911af4db88b63911290837f9b637d 100644 (file)
--- a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java
+++ b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java
@@ -1,8 +1,6 @@
 package eu.etaxonomy.taxeditor.editor;
 
 import org.eclipse.jface.action.IMenuManager;
 package eu.etaxonomy.taxeditor.editor;
 
 import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;

 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;

diff --git a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java
index f04f06a5b9c2a3590a4a24c2f80f5a8847bab107..c4b1bbb6f8ec8c534dd8fd9fe2b50e5d8f2444fb 100644 (file)
--- a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java
+++ b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java
@@ -16,6 +16,7 @@ import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.internal.ide.model.WorkbenchAdapterBuilder;
 import org.osgi.framework.Bundle;
 
 import org.eclipse.ui.internal.ide.model.WorkbenchAdapterBuilder;
 import org.osgi.framework.Bundle;
 

+@SuppressWarnings("restriction")

 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.editor.perspective";
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.editor.perspective";

diff --git a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java
index 25dce7435d960bb0655f8c6d4c802e91f3592aa7..96f11000e651db4d64ccb5f9e426d95e5d8c15db 100644 (file)
--- a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java
+++ b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java
@@ -1,16 +1,8 @@
 package eu.etaxonomy.taxeditor.editor;
 
 package eu.etaxonomy.taxeditor.editor;
 

-import org.eclipse.ui.IPageLayout;
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
-

 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IFolderLayout;

+import org.eclipse.ui.IPageLayout;

 import org.eclipse.ui.IPerspectiveFactory;
 import org.eclipse.ui.IPerspectiveFactory;

-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.WorkbenchException;
-
-import eu.etaxonomy.cdm.model.taxon.Taxon;

 
 public class Perspective implements IPerspectiveFactory {
 
 
 public class Perspective implements IPerspectiveFactory {
 

diff --git a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java b/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java
deleted file mode 100644 (file)
index e22cbb2..0000000
--- a/taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.editor;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
-
-/**
- * @author nho
- *
- */
-public class TestOpenHandler extends AbstractHandler implements IHandler {
-
-       public Object execute(ExecutionEvent event) throws ExecutionException {
-               
-               
-
-               Taxon taxon = Taxon.NewInstance(null, null);
-               
-//             TaxonEditorInput input = new TaxonEditorInput(taxon);
-               
-               IWorkbenchWindow def = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-               
-//             try {
-//                     def.openPage(input);
-//             } catch (WorkbenchException e1) {
-//                     e1.printStackTrace();
-//             }
-
-//             
-//             IWorkbenchPage page = def.getActivePage();
-//             
-//             try {
-//                     page.openEditor(input, "eu.etaxonomy.taxeditor.editor.editor");
-//             } catch (PartInitException e) {
-//                     e.printStackTrace();
-//             }
-//             return true;
-//             
-               return null;
-       }
-
-}

diff --git a/taxeditor-feature-dependencies/feature.xml b/taxeditor-feature-dependencies/feature.xml
index 712af5b6d20778ad99e80c28886df9c8e7dd89a2..3e06bd8444b5d07afb4dd2eca2f6ab7c41e128e8 100644 (file)
--- a/taxeditor-feature-dependencies/feature.xml
+++ b/taxeditor-feature-dependencies/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.dependencies"
       label="Taxeditor Dependencies"
 <feature
       id="eu.etaxonomy.taxeditor.feature.dependencies"
       label="Taxeditor Dependencies"

-      version="1.1.0"
+      version="2.0.0.v200906021611"

       os="macosx,win32">
 
    <description url="http://www.example.com/description">
       os="macosx,win32">
 
    <description url="http://www.example.com/description">

diff --git a/taxeditor-feature/feature.xml b/taxeditor-feature/feature.xml
index d2bf04068f0ec8bf1734ac68d982306a21776a6d..98f4e75c9d6dc897c68a79f5f30e0a89f0ade0e4 100644 (file)
--- a/taxeditor-feature/feature.xml
+++ b/taxeditor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor"
       label="Taxeditor Feature"
 <feature
       id="eu.etaxonomy.taxeditor"
       label="Taxeditor Feature"

-      version="1.1.0"
+      version="2.0.0.v200906021626"

       provider-name="EDIT">
 
    <description url="http://www.example.com/description">
       provider-name="EDIT">
 
    <description url="http://www.example.com/description">


@@ -28,36 +28,34 @@
 
    <includes
          id="eu.etaxonomy.taxeditor.feature.dependencies"
 
    <includes
          id="eu.etaxonomy.taxeditor.feature.dependencies"

-         version="1.1.0"
-         os="macosx,win32"
-         search-location="self"/>
+         version="0.0.0"/>

 
    <plugin
          id="eu.etaxonomy.taxeditor.application"
          download-size="0"
          install-size="0"
 
    <plugin
          id="eu.etaxonomy.taxeditor.application"
          download-size="0"
          install-size="0"

-         version="1.1.0"
+         version="2.0.0.v200906021612"

          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.editor"
          download-size="0"
          install-size="0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.editor"
          download-size="0"
          install-size="0"

-         version="1.1.0"
+         version="2.0.0.v200906021612"

          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.navigation"
          download-size="0"
          install-size="0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.navigation"
          download-size="0"
          install-size="0"

-         version="1.1.0"
+         version="2.0.0.v200906021612"

          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.store"
          download-size="0"
          install-size="0"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.store"
          download-size="0"
          install-size="0"

-         version="1.1.0"
+         version="2.0.0.v200906021612"

          unpack="false"/>
 
 </feature>
          unpack="false"/>
 
 </feature>

diff --git a/taxeditor-navigation/.settings/org.eclipse.jdt.core.prefs b/taxeditor-navigation/.settings/org.eclipse.jdt.core.prefs
index 5c1ec0b9a5f3b5850746b2fc4787ed63f0a7b1bd..4ab379a8ae08cdaa6661172aa3ac4e4ffb07ede0 100644 (file)
--- a/taxeditor-navigation/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-navigation/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
-#Tue Jun 02 13:01:37 CEST 2009
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+#Tue Jun 02 18:11:30 CEST 2009

 eclipse.preferences.version=1
 eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index c009ac09663eddc921d311dbeb33f189400a484a..21e38473289fc60233b082487d1145e7e19fa1f6 100644 (file)
--- a/taxeditor-navigation/META-INF/MANIFEST.MF
+++ b/taxeditor-navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true

-Bundle-Version: 1.1.0
+Bundle-Version: 2.0.0.v200906021612

 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.navigation,
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.navigation,


@@ -24,3 +24,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.1",
  org.eclipse.core.databinding;bundle-version="1.1.1",
  org.eclipse.jface.databinding;bundle-version="1.2.1"
 Bundle-ActivationPolicy: lazy
  org.eclipse.core.databinding;bundle-version="1.1.1",
  org.eclipse.jface.databinding;bundle-version="1.2.1"
 Bundle-ActivationPolicy: lazy

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/taxeditor-navigation/build.properties b/taxeditor-navigation/build.properties
index 308097626c6342f1df6d200264aa94a6d5beae5f..bff90f61a364e0212c209faa0a25dd5563da58e6 100644 (file)
--- a/taxeditor-navigation/build.properties
+++ b/taxeditor-navigation/build.properties
@@ -1,5 +1,6 @@
 source.. = src/main/java/,\
 source.. = src/main/java/,\

-           src/test/java/
+           src/test/java/,\
+           src/test/resources/

 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\

diff --git a/taxeditor-navigation/plugin.xml b/taxeditor-navigation/plugin.xml
index c8f59b729541973addcc5ecc357c888851eb9a09..7304cc0c6e41d7f51b4fb0bb2251b13649173f7e 100644 (file)
--- a/taxeditor-navigation/plugin.xml
+++ b/taxeditor-navigation/plugin.xml
@@ -102,6 +102,11 @@
                label="Taxonomic Tree"
                style="push">
          </command>
                label="Taxonomic Tree"
                style="push">
          </command>

+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.command.showTreeView"
+               label="Tree"
+               style="push">
+         </command>

       </menuContribution>
    </extension>
    <extension
       </menuContribution>
    </extension>
    <extension

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 a33637f8bc3cc4ded3f8122c9c01e18f6d790b44..8805a542e100edfc6a00dead2053383c0cdededc 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
@@ -32,7 +32,6 @@ import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.cdm.model.taxon.TaxonBase;

 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;


@@ -57,7 +56,7 @@ public class NavigationUtil extends AbstractUtility{
         * 
         * @param uuid
         */
         * 
         * @param uuid
         */

-       public static void openEditor(IdentifiableEntity selection) {
+       public static void openEditor(IdentifiableEntity<?> selection) {

                try {
                        UUID entityUuid = selection.getUuid();                  
                        EditorUtil.open(entityUuid);
                try {
                        UUID entityUuid = selection.getUuid();                  
                        EditorUtil.open(entityUuid);

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java
index 8edb69b1823da8b39d635257e6afe3e3ea04c4e0..509aa3b1fd21360af81fd8a0eb23914ac48e5ad1 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java
@@ -10,18 +10,11 @@
 \r
 package eu.etaxonomy.taxeditor.navigation;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.navigation;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.action.ContributionItem;\r
 import org.eclipse.jface.action.IContributionItem;\r
 import org.eclipse.jface.action.IContributionManager;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.ui.actions.ContributionItemFactory;\r
 import org.eclipse.jface.action.ContributionItem;\r
 import org.eclipse.jface.action.IContributionItem;\r
 import org.eclipse.jface.action.IContributionManager;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.ui.actions.ContributionItemFactory;\r

-import org.eclipse.ui.internal.IPreferenceConstants;\r
-import org.eclipse.ui.internal.WorkbenchPlugin;\r
-\r
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;\r
-import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;\r
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r

 \r
 /**\r
  * This is a wrapper for Eclipse's recently opened editors functionality. IsDirty()\r
 \r
 /**\r
  * This is a wrapper for Eclipse's recently opened editors functionality. IsDirty()\r


@@ -32,24 +25,13 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0\r
  */\r
 public class RecentNamesContributionItem extends ContributionItem {\r
  * @version 1.0\r
  */\r
 public class RecentNamesContributionItem extends ContributionItem {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(RecentNamesContributionItem.class);\r

 \r
        private IContributionItem recentWindows;\r
        private IContributionManager parent;\r
 \r
 \r
        private IContributionItem recentWindows;\r
        private IContributionManager parent;\r
 \r

-//     @SuppressWarnings("restriction")\r
-//     RecentNamesContributionItem() {\r
-////           WorkbenchPlugin.getDefault().getPreferenceStore().setValue(IPreferenceConstants.RECENT_FILES, 10);\r
-//             TaxeditorNavigationPlugin.getDefault().getPreferenceStore().setValue("RECENT_FILES", 10);\r
-//     }\r

        \r
        private IContributionItem getRecentWindows() {\r
        \r
        private IContributionItem getRecentWindows() {\r

-               if (recentWindows == null) {\r
-                       \r
-               int itemsToShow = TaxeditorNavigationPlugin.getDefault().getPreferenceStore()\r
-                       .getInt("RECENT_FILES");\r
-                       \r
+               if (recentWindows == null) {                    \r

                        recentWindows = ContributionItemFactory.REOPEN_EDITORS.create(NavigationUtil.getActiveWindow());\r
                        recentWindows.setParent(parent);\r
                }\r
                        recentWindows = ContributionItemFactory.REOPEN_EDITORS.create(NavigationUtil.getActiveWindow());\r
                        recentWindows.setParent(parent);\r
                }\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/CreateChildTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/CreateChildTaxonHandler.java
index 38440539204be580f7eef5f4c8e5f1033d1338cf..f3ca8a71f4b2dbe43232dadd848913396b6780d9 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/CreateChildTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/CreateChildTaxonHandler.java
@@ -9,7 +9,6 @@
 
 package eu.etaxonomy.taxeditor.navigation.handler;
 
 
 package eu.etaxonomy.taxeditor.navigation.handler;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;


@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
  */
 public class CreateChildTaxonHandler extends AbstractHandler implements
                IHandler {
  */
 public class CreateChildTaxonHandler extends AbstractHandler implements
                IHandler {

-       private static final Logger logger = Logger
-                       .getLogger(CreateChildTaxonHandler.class);

 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

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 7e119488a4d194b703da7a381cd7a2472b3c454d..ecf668b5e001dd0b1e5c69469b0a22103b08a56d 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
@@ -17,9 +17,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.commands.operations.IUndoableOperation;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.commands.operations.IUndoableOperation;

-import org.eclipse.ui.handlers.HandlerUtil;

 
 

-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;

 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation;


@@ -34,8 +32,7 @@ public class DeleteTaxonHandler extends AbstractHandler implements IHandler{
                        .getLogger(DeleteTaxonHandler.class);
 
        public Object execute(ExecutionEvent event) throws ExecutionException {
                        .getLogger(DeleteTaxonHandler.class);
 
        public Object execute(ExecutionEvent event) throws ExecutionException {

-               IConversationEnabled part =  (IConversationEnabled) HandlerUtil.getActivePart(event);
-                               
+               

                Taxon taxon = NavigationUtil.getCurrentSelection(event);
                
                IUndoableOperation operation;
                Taxon taxon = NavigationUtil.getCurrentSelection(event);
                
                IUndoableOperation operation;

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/EditTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/EditTaxonHandler.java
index 6063fed441d87a8315a0d8aa3eabd51d6169828c..8ee1c6f568153d6b87d865ff77d9e8f0a10b86fd 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/EditTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/EditTaxonHandler.java
@@ -9,7 +9,6 @@
 
 package eu.etaxonomy.taxeditor.navigation.handler;
 
 
 package eu.etaxonomy.taxeditor.navigation.handler;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;


@@ -26,8 +25,6 @@ import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
  * @version 1.0
  */
 public class EditTaxonHandler extends AbstractHandler {
  * @version 1.0
  */
 public class EditTaxonHandler extends AbstractHandler {

-       private static final Logger logger = Logger
-                       .getLogger(EditTaxonHandler.class);

 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)

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 d826976bb5315648a297d355e7272357dd8a4879..374fc8128385d36276f5953623d1089dc9eae93a 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
@@ -63,7 +63,7 @@ public class QuickCreateChildTaxonHandler extends AbstractHandler implements
                        
                        //TaxonUtil.addChildTaxonBaseIsolated(parentTaxon.getUuid(), dialog.getValue());
 
                        
                        //TaxonUtil.addChildTaxonBaseIsolated(parentTaxon.getUuid(), dialog.getValue());
 

-                       TaxonNameBase name = CdmParserUtil.parseFullReference(dialog.getValue(), null, null);
+                       TaxonNameBase<?, ?> name = CdmParserUtil.parseFullReference(dialog.getValue(), null, null);

                        
                        IUndoableOperation operation;
                        try {
                        
                        IUndoableOperation operation;
                        try {

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
index 8f26e8413868d4ef2487adf4f152122a876656f7..3acf610b84c8acd8ab62a1c7f138f5ed3f02a425 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
@@ -15,12 +15,8 @@ import org.apache.log4j.Logger;
 import org.eclipse.jface.action.GroupMarker;\r
 import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r
 import org.eclipse.jface.action.GroupMarker;\r
 import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.jface.viewers.ArrayContentProvider;\r

-import org.eclipse.jface.viewers.BaseLabelProvider;\r
-import org.eclipse.jface.viewers.CellLabelProvider;\r

 import org.eclipse.jface.viewers.DoubleClickEvent;\r
 import org.eclipse.jface.viewers.IDoubleClickListener;\r
 import org.eclipse.jface.viewers.DoubleClickEvent;\r
 import org.eclipse.jface.viewers.IDoubleClickListener;\r

-import org.eclipse.jface.viewers.ILabelProvider;\r
-import org.eclipse.jface.viewers.ITableLabelProvider;\r

 import org.eclipse.jface.viewers.StructuredSelection;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.jface.viewers.StructuredSelection;\r
 import org.eclipse.jface.viewers.TableViewer;\r
 import org.eclipse.swt.SWT;\r


@@ -33,7 +29,6 @@ import org.eclipse.ui.part.ViewPart;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r

-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r

 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r


@@ -91,7 +86,7 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{
        }\r
        \r
        protected void performSearch(String queryString) {\r
        }\r
        \r
        protected void performSearch(String queryString) {\r

-               List searchResult = CdmStore.searchTaxaByName(queryString);\r
+               List<?> searchResult = CdmStore.searchTaxaByName(queryString);\r

                \r
                resultViewer.setInput(searchResult); \r
                setPartName("Search: '" + queryString + "'");\r
                \r
                resultViewer.setInput(searchResult); \r
                setPartName("Search: '" + queryString + "'");\r


@@ -122,4 +117,11 @@ public class SearchResultView extends ViewPart implements IConversationEnabled{
                \r
        }\r
 \r
                \r
        }\r
 \r

+       /**\r
+        * @return the queryString\r
+        */\r
+       public String getQueryString() {\r
+               return queryString;\r
+       }\r
+\r

 }\r
 }\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java
index 0c2d939cdc7a1af39264d5e97949421f2c124e7f..cbf51763a378b1ad08d49272eb77a9b3f8a3d289 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java
@@ -9,9 +9,7 @@
 package eu.etaxonomy.taxeditor.navigation.taxonomictree;\r
 \r
 import java.util.List;\r
 package eu.etaxonomy.taxeditor.navigation.taxonomictree;\r
 \r
 import java.util.List;\r

-import java.util.Set;\r

 \r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.viewers.ITreeContentProvider;\r
 import org.eclipse.jface.viewers.Viewer;\r
 import org.eclipse.core.runtime.Assert;\r
 import org.eclipse.jface.viewers.ITreeContentProvider;\r
 import org.eclipse.jface.viewers.Viewer;\r


@@ -27,8 +25,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @author n.hoffmann\r
  */\r
 public class TaxonomicTreeContentProvider implements ITreeContentProvider {\r
  * @author n.hoffmann\r
  */\r
 public class TaxonomicTreeContentProvider implements ITreeContentProvider {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonomicTreeContentProvider.class);\r

 \r
        /*\r
         * (non-Javadoc)\r
 \r
        /*\r
         * (non-Javadoc)\r


@@ -49,10 +45,6 @@ public class TaxonomicTreeContentProvider implements ITreeContentProvider {
                return null;\r
        }\r
 \r
                return null;\r
        }\r
 \r

-       private Set<Taxon> getTaxonChildren(Taxon parentTaxon) {\r
-               return parentTaxon.getTaxonomicChildren();\r
-       }\r
-\r

        /*\r
         * (non-Javadoc)\r
         * \r
        /*\r
         * (non-Javadoc)\r
         * \r

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 2111d7524e5157cdd4cddd02ff07baa8abe219cd..221000a3c70a82e82b3a20d8591d98fe09376ada 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
@@ -76,8 +76,8 @@ public class TaxonomicTreeLabelProvider extends ColumnLabelProvider implements I
                String synonymyListDisplay = NameUtil
                                .getDisplayName(taxon);
                
                String synonymyListDisplay = NameUtil
                                .getDisplayName(taxon);
                

-               for (TaxonBase synonymOrMisName : synonymyList) {
-                       TaxonNameBase name = synonymOrMisName.getName();
+               for (TaxonBase<?> synonymOrMisName : synonymyList) {
+                       TaxonNameBase<?, ?> name = synonymOrMisName.getName();

                        if (name != null) {
                                synonymyListDisplay += "\n      "
                                                + NameUtil.getDisplayName(name);
                        if (name != null) {
                                synonymyListDisplay += "\n      "
                                                + NameUtil.getDisplayName(name);

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 085e6187312da1da40acb8ecc3e1c61ea3ad5c8e..46d9e2d54b9a62e30b2eacc2d497b46619e67b86 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
@@ -34,17 +34,10 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.layout.FillLayout;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.layout.FillLayout;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r

-import org.eclipse.swt.widgets.Display;\r

 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.swt.widgets.Tree;\r
 import org.eclipse.swt.widgets.TreeItem;\r
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.swt.widgets.Tree;\r
 import org.eclipse.swt.widgets.TreeItem;\r
 import org.eclipse.ui.IWorkbenchActionConstants;\r

-import org.eclipse.ui.forms.IManagedForm;\r
-import org.eclipse.ui.forms.ManagedForm;\r
-import org.eclipse.ui.forms.events.HyperlinkAdapter;\r
-import org.eclipse.ui.forms.events.HyperlinkEvent;\r
-import org.eclipse.ui.forms.widgets.Hyperlink;\r
-import org.eclipse.ui.forms.widgets.TableWrapLayout;\r

 import org.eclipse.ui.part.ViewPart;\r
 \r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
 import org.eclipse.ui.part.ViewPart;\r
 \r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r


@@ -78,8 +71,6 @@ public class TaxonomicTreeView extends ViewPart implements IConversationEnabled,
        private TreeViewer treeViewer;\r
 \r
        private ConversationHolder conversation;\r
        private TreeViewer treeViewer;\r
 \r
        private ConversationHolder conversation;\r

-       \r
-       private IManagedForm hyperlinkForm;\r

 \r
        private IDataChangeBehavior dataChangeBehavior;\r
 \r
 \r
        private IDataChangeBehavior dataChangeBehavior;\r
 \r


@@ -151,34 +142,6 @@ public class TaxonomicTreeView extends ViewPart implements IConversationEnabled,
                        \r
        }\r
        \r
                        \r
        }\r
        \r

-       /**\r
-        * inactive at the moment. I would not put to much effort in it either.\r
-        */\r
-       private void createNoRootTaxaHyperlinkForm(){\r
-       \r
-               // If there are no root taxa, provide a link to create this tree's initial root taxon\r
-               logger.warn("No root taxa found");\r
-               \r
-               hyperlinkForm = new ManagedForm(parent);\r
-               Composite linkBody = hyperlinkForm.getForm().getBody();\r
-               \r
-               TableWrapLayout linkLayout = new TableWrapLayout();\r
-               linkLayout.leftMargin = 20;\r
-               linkLayout.rightMargin = 20;\r
-               linkBody.setLayout(linkLayout);\r
-               linkBody.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               \r
-               Hyperlink link = hyperlinkForm.getToolkit().createHyperlink(linkBody, \r
-                               "Your data source is empty. Click here to create a root taxon.", SWT.WRAP);\r
-               \r
-               link.addHyperlinkListener(new HyperlinkAdapter() {\r
-                       public void linkActivated(HyperlinkEvent e) {\r
-                               NavigationUtil.openEmpty(null);\r
-                               logger.warn("New Editor should be opened with empty taxon.");\r
-                       }                               \r
-               });\r
-       }\r
-       \r

        /**\r
         * On double click, open name editor\r
         */\r
        /**\r
         * On double click, open name editor\r
         */\r

diff --git a/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java b/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java
index 8e81f2ce177cd307455d814219b175e701ee5531..9cca65dcd5a0394236b36afbfebe2e7f586c1f23 100644 (file)
--- a/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java
+++ b/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java
@@ -6,8 +6,6 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 

-import eu.etaxonomy.taxeditor.store.CdmStore;
-

 /**
  * This class controls all aspects of the application's execution
  */
 /**
  * This class controls all aspects of the application's execution
  */

diff --git a/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java b/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java
index a5fc9fa46776b183ffe3e1fe9a6141926052e1a4..d43ff8c0f09859f265555be5dab721a833af6106 100644 (file)
--- a/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java
+++ b/taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java
@@ -16,6 +16,7 @@ import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.internal.ide.model.WorkbenchAdapterBuilder;
 import org.osgi.framework.Bundle;
 
 import org.eclipse.ui.internal.ide.model.WorkbenchAdapterBuilder;
 import org.osgi.framework.Bundle;
 

+@SuppressWarnings("restriction")

 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.test.perspective";
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.test.perspective";

diff --git a/taxeditor-navigation/src/test/resources/log4j.properties b/taxeditor-navigation/src/test/resources/log4j.properties
deleted file mode 100644 (file)
index ff0c38a..0000000
--- a/taxeditor-navigation/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-### ************ APPENDER ***********************************###
-
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### direct messages to file hibernate.log ###
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=taxeditor.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### ************* LOG LEVELS *********************************###
-
-### set log levels - for more verbose logging change 'info' to 'debug' ###
-### levels: error, warn, debug, info
-log4j.rootLogger=INFO, stdout
-
-### set directory-specific levels below
-
-### basic level for editor directory
-log4j.logger.eu.etaxonomy.taxeditor.editor = WARN, stdout 
-
-log4j.logger.eu.etaxonomy.taxeditor.editor.handler = DEBUG, stdout
-
-### log level for conversation handler
-#log4j.logger.eu.etaxonomy.cdm.api.application = DEBUG, stdout

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 31d0852a580d17805dd187a31c44aae445cd1122..0d7446617a0fdb70250efac77c6d3f6857bf70fe 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true

-Bundle-Version: 1.1.0
+Bundle-Version: 2.0.0.v200906021612

 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.handler,
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.handler,

diff --git a/taxeditor-store/build.properties b/taxeditor-store/build.properties
index 2607cedb07daecd0280b805d9a6bd76275fd5ed1..a7c1b813faee3b6163b53b3614da8eed62bb72f5 100644 (file)
--- a/taxeditor-store/build.properties
+++ b/taxeditor-store/build.properties
@@ -1,5 +1,7 @@
 source.. = src/main/java/,\
 source.. = src/main/java/,\

-           src/test/java/
+           src/test/java/,\
+           src/main/resources/,\
+           src/test/resources/

 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index c357a8d8d7d634294e91b2860d59f1e585b59364..12863770b913a636ecdda4a86c0f61beacdf5c63 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -26,14 +26,12 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.impl.TaxonServiceConfiguratorImpl;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.impl.TaxonServiceConfiguratorImpl;

-import eu.etaxonomy.cdm.database.DataSourceNotFoundException;

 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;

-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;

 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;


@@ -134,7 +132,7 @@ public class CdmStore{
                return conceptRelationshipTypes;
        }
 
                return conceptRelationshipTypes;
        }
 

-       public ReferenceBase getDefaultSec() {
+       public ReferenceBase<?> getDefaultSec() {

                // TODO why is this returning null? and of course, replace w the real deal
                return applicationController.getReferenceService().getReferenceByUuid(
                                UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));
                // TODO why is this returning null? and of course, replace w the real deal
                return applicationController.getReferenceService().getReferenceByUuid(
                                UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));


@@ -281,7 +279,7 @@ public class CdmStore{
                return resultSet;
        }
        
                return resultSet;
        }
        

-       private List findTaxaByName(String queryString, boolean restrictToTaxonObjs) {
+       private List<IdentifiableEntity> findTaxaByName(String queryString, boolean restrictToTaxonObjs) {

 
                ITaxonServiceConfigurator configurator = new TaxonServiceConfiguratorImpl();
                
 
                ITaxonServiceConfigurator configurator = new TaxonServiceConfiguratorImpl();
                


@@ -305,11 +303,11 @@ public class CdmStore{
                return result;
        }
        
                return result;
        }
        

-       public static List searchTaxaByName(String queryString){
+       public static List<IdentifiableEntity> searchTaxaByName(String queryString){

                return getDefault().findTaxaByName(queryString, false);
        }
 
                return getDefault().findTaxaByName(queryString, false);
        }
 

-       public static List searchTaxaByName(String queryString, boolean restrictToTaxonObjs){
+       public static List<IdentifiableEntity> searchTaxaByName(String queryString, boolean restrictToTaxonObjs){

                return getDefault().findTaxaByName(queryString, restrictToTaxonObjs);
        }
        
                return getDefault().findTaxaByName(queryString, restrictToTaxonObjs);
        }
        

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
index efee920cf30331d67d91dee617c43678b52813d3..29056ab13922eed005efc8f7c4c496073f457b70 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store;
 
 
 package eu.etaxonomy.taxeditor.store;
 

-import org.apache.log4j.Logger;
-

 import eu.etaxonomy.taxeditor.store.model.AbstractUtility;
 
 /**
 import eu.etaxonomy.taxeditor.store.model.AbstractUtility;
 
 /**


@@ -19,6 +17,4 @@ import eu.etaxonomy.taxeditor.store.model.AbstractUtility;
  * @created 11.05.2009
  * @version 1.0
  */
  * @created 11.05.2009
  * @version 1.0
  */

-public class StoreUtil extends AbstractUtility {
-       private static final Logger logger = Logger.getLogger(StoreUtil.class);
-}
+public class StoreUtil extends AbstractUtility {}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java
index 31e6e3d22cc12cea1b27d56d5c2431299b38549f..bcd938a6b430c793967c35e97571a4f956214812 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java
@@ -12,11 +12,6 @@ package eu.etaxonomy.taxeditor.store.datasource.view;
 
 import java.util.List;
 
 
 import java.util.List;
 

-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.NotEnabledException;
-import org.eclipse.core.commands.NotHandledException;
-import org.eclipse.core.commands.common.NotDefinedException;

 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.MessageDialog;


@@ -32,13 +27,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.ui.handlers.IHandlerService;

 import org.eclipse.ui.part.ViewPart;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository;
 import org.eclipse.ui.part.ViewPart;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository;

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

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

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java
index e44cb5b4c5b889caf67378f53fa923d0515e0ece..2dad28c1265382388f11af7e0d676bb494c1dc9b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.datasource.wizard;
 
 
 package eu.etaxonomy.taxeditor.store.datasource.wizard;
 

-import org.apache.log4j.Logger;

 import org.eclipse.jface.dialogs.MessageDialog;
 
 import eu.etaxonomy.cdm.database.CdmDataSource;
 import org.eclipse.jface.dialogs.MessageDialog;
 
 import eu.etaxonomy.cdm.database.CdmDataSource;


@@ -22,12 +21,7 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
  * @version 1.0
  */
 public class CdmDataSourceH2WizardPage extends CdmDataSourceCredentialsWizardPage {
  * @version 1.0
  */
 public class CdmDataSourceH2WizardPage extends CdmDataSourceCredentialsWizardPage {

-
-
-       private static final Logger logger = Logger
-                       .getLogger(CdmDataSourceH2WizardPage.class);

        
        

-

        /**
         * @param pageName
         */
        /**
         * @param pageName
         */

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java
index 86e7becf76632768460379589e948f9a7cc2cf30..751dd10a0d786850b4842276ceb9541448de35a8 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.datasource.wizard;
 
 
 package eu.etaxonomy.taxeditor.store.datasource.wizard;
 

-import org.apache.log4j.Logger;

 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 


@@ -25,9 +24,6 @@ import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository;
  * @version 1.0
  */
 public class CdmDataSourceWizard extends Wizard {
  * @version 1.0
  */
 public class CdmDataSourceWizard extends Wizard {

-       private static final Logger logger = Logger
-                       .getLogger(CdmDataSourceWizard.class);
-

        
        private WizardPage dataSourcePage;
 
        
        private WizardPage dataSourcePage;
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java
index 0ac6f6cf5b0aaf4cb1cd9f974a82600d5b0f4e8e..994a82242e349116855e9cdcd24da81b591a65c9 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.store.datasource.wizard;
 
 import java.util.ArrayList;
 
 
 import java.util.ArrayList;
 

-import org.apache.log4j.Logger;

 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;


@@ -48,11 +47,6 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{
 
 
        private ICdmDataSource dataSource;
 
 
        private ICdmDataSource dataSource;

-
-
-       private Composite parent;
-       private static final Logger logger = Logger
-       .getLogger(CdmDataSourceWizardPage.class);

        
        protected CdmDataSourceWizardPage(ICdmDataSource dataSource) {
                super("DataSourceWizardPage");
        
        protected CdmDataSourceWizardPage(ICdmDataSource dataSource) {
                super("DataSourceWizardPage");


@@ -68,8 +62,7 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
         */
        public void createControl(Composite parent) {
         * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
         */
        public void createControl(Composite parent) {

-               this.parent = parent;
-               
+

                // Create top-level composite 
                composite = new Composite(parent, SWT.NONE);
                GridLayout gridLayout = new GridLayout();
                // Create top-level composite 
                composite = new Composite(parent, SWT.NONE);
                GridLayout gridLayout = new GridLayout();


@@ -152,22 +145,6 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{
                getContainer().updateButtons();
        }
 
                getContainer().updateButtons();
        }
 

-       
-       private void selectDatabaseType(DatabaseTypeEnum type) {
-               
-               int i = 0;
-               
-               // Go through types list until match is found
-               for (DatabaseTypeEnum typeInList : databaseTypes ) {
-                       if (typeInList.equals(type)) {
-                               
-                               // Set combo to the type
-                               databaseTypeCombo.select(i);
-                               break;
-                       }
-                       i++;
-               }
-       }

 
        /* (non-Javadoc)
         * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
 
        /* (non-Javadoc)
         * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java
index aa9803add754909544e61a4d2d348328002acfa1..13226e0c54f20041b74026c745e322b26c648763 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.model;
 
 
 package eu.etaxonomy.taxeditor.store.model;
 

-import org.apache.log4j.Logger;

 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.swt.widgets.Shell;


@@ -27,9 +26,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public abstract class AbstractUtility {
  * @version 1.0
  */
 public abstract class AbstractUtility {

-       private static final Logger logger = Logger
-                       .getLogger(AbstractUtility.class);
-       

        
        /**
         * @return
        
        /**
         * @return

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java
index 121eb3c5e01dbf341bfabebf10d5fa2238767332..35461ab4179a49f91af8b74b3ed2a86a2b554efa 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java
@@ -13,7 +13,6 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 
 import java.net.URI;
 import java.net.URL;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;


@@ -29,7 +28,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @version 1.0
  */
 public class ImageResources {
  * @version 1.0
  */
 public class ImageResources {

-       private static final Logger logger = Logger.getLogger(ImageResources.class);

        
        private static ImageResources instance;
        
        
        private static ImageResources instance;
        

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java
index 69884d4e21c628a7b388359152a0525244b2d21b..38dbaaf1fa90ca06225b61e7a653e58708af9aff 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java
@@ -14,8 +14,6 @@ import java.util.HashSet;
 import java.util.List;\r
 import java.util.Set;\r
 \r
 import java.util.List;\r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r


@@ -33,8 +31,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0\r
  */\r
 public class ImagesUtil {\r
  * @version 1.0\r
  */\r
 public class ImagesUtil {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ImagesUtil.class);\r

        \r
        public static Set<ImageFile> getImages(TaxonDescription description){\r
                Set<ImageFile> images = new HashSet<ImageFile>();\r
        \r
        public static Set<ImageFile> getImages(TaxonDescription description){\r
                Set<ImageFile> images = new HashSet<ImageFile>();\r


@@ -69,7 +65,7 @@ public class ImagesUtil {
         * @param taxon\r
         * @param imageFile\r
         */\r
         * @param taxon\r
         * @param imageFile\r
         */\r

-       public static void addTaxonImage(Taxon taxon, DescriptionBase imageGallery, ImageFile imageFile) {\r
+       public static void addTaxonImage(Taxon taxon, DescriptionBase<?> imageGallery, ImageFile imageFile) {\r

                \r
                DescriptionElementBase descriptionElement = TextData.NewInstance(Feature.IMAGE());\r
                \r
                \r
                DescriptionElementBase descriptionElement = TextData.NewInstance(Feature.IMAGE());\r
                \r


@@ -90,7 +86,7 @@ public class ImagesUtil {
         * @param taxon\r
         * @param imageFile\r
         */\r
         * @param taxon\r
         * @param imageFile\r
         */\r

-       public static void removeTaxonImage(Taxon taxon, DescriptionBase imageGallery, ImageFile imageFile) {\r
+       public static void removeTaxonImage(Taxon taxon, DescriptionBase<?> imageGallery, ImageFile imageFile) {\r

                Set<DescriptionElementBase> elementsToRemove = new HashSet<DescriptionElementBase>();\r
                \r
                Set<DescriptionElementBase> images = imageGallery.getElements();\r
                Set<DescriptionElementBase> elementsToRemove = new HashSet<DescriptionElementBase>();\r
                \r
                Set<DescriptionElementBase> images = imageGallery.getElements();\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java
index afa8b3325fda906ddf0e6da5b9bafadaaadb419e..f139f9092478516ffbf3a0751625569067153906 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  * @created 09.05.2008\r
  * @version 1.0\r
  */\r
  * @created 09.05.2008\r
  * @version 1.0\r
  */\r

+@SuppressWarnings("unchecked")\r

 public class IterableSynonymyList implements Iterable<TaxonBase> {\r
        \r
        private Taxon taxon;\r
 public class IterableSynonymyList implements Iterable<TaxonBase> {\r
        \r
        private Taxon taxon;\r


@@ -94,8 +95,8 @@ public class IterableSynonymyList implements Iterable<TaxonBase> {
                        return true;\r
                }\r
 \r
                        return true;\r
                }\r
 \r

-               public TaxonBase next() {\r
-                       TaxonBase next = synonymyList.get(index);\r
+               public TaxonBase<?> next() {\r
+                       TaxonBase<?> next = synonymyList.get(index);\r

                        index++;\r
                        return next;\r
                }\r
                        index++;\r
                        return next;\r
                }\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java
index 86439b8844effc2e5eb087f8a7004d2f855a9ce4..f7fd5221dcfe2ded2194cb5ced33b0f00b9be5ff 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java
@@ -10,8 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.model;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.model;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.common.Language;\r
 \r
 /**\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 \r
 /**\r


@@ -20,8 +18,6 @@ import eu.etaxonomy.cdm.model.common.Language;
  * @version 1.0\r
  */\r
 public class LanguageUtil {\r
  * @version 1.0\r
  */\r
 public class LanguageUtil {\r

-       private static final Logger logger = Logger.getLogger(LanguageUtil.class);\r
-\r

        /**\r
         * @param language\r
         * @return\r
        /**\r
         * @param language\r
         * @return\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java
index 105de36c4ef14e138764125ec136fcc8a123ef2d..333b41129a4563b3bdf51b11d1aab3e26fc47a7c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java
@@ -12,8 +12,6 @@ package eu.etaxonomy.taxeditor.store.model;
 \r
 import java.util.SortedSet;\r
 \r
 \r
 import java.util.SortedSet;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r


@@ -25,8 +23,6 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @version 1.0\r
  */\r
 public class NameRelationsUtil {\r
  * @version 1.0\r
  */\r
 public class NameRelationsUtil {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsUtil.class);\r

        \r
        /**\r
         * Get the type's label out of the session's name relations vocabulary, not directly\r
        \r
        /**\r
         * Get the type's label out of the session's name relations vocabulary, not directly\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java
index 2a5b864de74bb77d79c198c4cf6bc429e1edf6da..00f80d6bc24991cd54645cbbaa2260d57115535d 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java
@@ -33,7 +33,7 @@ public class NameUtil {
                return name.getTitleCache();
        }
        
                return name.getTitleCache();
        }
        

-       public static String getDisplayName(TaxonBase taxon){
+       public static String getDisplayName(TaxonBase<?> taxon){

                return getDisplayName(taxon.getName());
        }
        
                return getDisplayName(taxon.getName());
        }
        


@@ -108,7 +108,7 @@ public class NameUtil {
         * @param name
         * @return
         */
         * @param name
         * @return
         */

-       public static boolean isNameSupraSpecific(TaxonNameBase name) {
+       public static boolean isNameSupraSpecific(TaxonNameBase<?, ?> name) {

                
                if (name == null || name.getRank() == null) {
                        return false;
                
                if (name == null || name.getRank() == null) {
                        return false;


@@ -133,8 +133,8 @@ public class NameUtil {
         * @param taxon
         * @return
         */
         * @param taxon
         * @return
         */

-       public static boolean isNameHomotypic(TaxonNameBase name, Taxon taxon) {
-               TaxonNameBase taxonName = taxon.getName();
+       public static boolean isNameHomotypic(TaxonNameBase<?, ?> name, Taxon taxon) {
+               TaxonNameBase<?, ?> taxonName = taxon.getName();

                if (taxonName == null || name == null) {
                        return false;
                }
                if (taxonName == null || name == null) {
                        return false;
                }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java
index e5044a3aa9af7da8250f1d13bafcdb62bd911a02..be496f0f688860e0411247a38d69b59c98e7737c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java
@@ -10,8 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.model;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.model;\r
 \r

-import org.apache.log4j.Logger;\r
-\r

 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.reference.Generic;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r


@@ -22,9 +20,6 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @version 1.0\r
  */\r
 public class ReferenceUtil {\r
  * @version 1.0\r
  */\r
 public class ReferenceUtil {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ReferenceUtil.class);\r
-\r

        /**\r
         * Returns the entity's citation. If none exists, gives the\r
         * entity a Generic citation.\r
        /**\r
         * Returns the entity's citation. If none exists, gives the\r
         * entity a Generic citation.\r


@@ -32,8 +27,8 @@ public class ReferenceUtil {
         * @param entity \r
         * @return\r
         */\r
         * @param entity \r
         * @return\r
         */\r

-       public static ReferenceBase getOrCreateCitation(ReferencedEntityBase entity) {\r
-               ReferenceBase citation = entity.getCitation();\r
+       public static ReferenceBase<?> getOrCreateCitation(ReferencedEntityBase entity) {\r
+               ReferenceBase<?> citation = entity.getCitation();\r

                if (citation == null) {\r
                        citation = Generic.NewInstance();\r
                        entity.setCitation(citation);\r
                if (citation == null) {\r
                        citation = Generic.NewInstance();\r
                        entity.setCitation(citation);\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java
index 3f2072d0514070f6bf0378268cdf63e427cf58f3..7d00c4d070cf774774ce827e38495a76ac9a19cc 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java
@@ -140,7 +140,7 @@ public class Resources {
                
                int i = 0;
                String fontName = "italic";
                
                int i = 0;
                String fontName = "italic";

-               Set keySet = getInstance().getFontRegistry().getKeySet();
+               Set<?> keySet = getInstance().getFontRegistry().getKeySet();

                while (keySet.contains(fontName + i)) {
                        i++;
                }
                while (keySet.contains(fontName + i)) {
                        i++;
                }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java
index dbc172b1b7038c7b75ead20dc6d3f4a8d528eea2..f71e45a46901df8011c16e0f5c56bed6dd0570bb 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java
@@ -13,8 +13,6 @@ package eu.etaxonomy.taxeditor.store.model;
 import java.util.HashSet;
 import java.util.Set;
 
 import java.util.HashSet;
 import java.util.Set;
 

-import org.apache.log4j.Logger;
-

 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NameRelationship;


@@ -32,8 +30,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  * @version 1.0
  */
 public class SynonymUtil {
  * @version 1.0
  */
 public class SynonymUtil {

-       private static final Logger logger = Logger.getLogger(SynonymUtil.class);
-       

        
        /**
         * Creates a basionym relationship between basionymName and
        
        /**
         * Creates a basionym relationship between basionymName and


@@ -42,7 +38,7 @@ public class SynonymUtil {
         * @param basionymName
         * @deprecated TODO move this to cmdlib
         */
         * @param basionymName
         * @deprecated TODO move this to cmdlib
         */

-       public static void setGroupBasionym(TaxonNameBase basionymName) {
+       public static void setGroupBasionym(TaxonNameBase<?, ?> basionymName) {

 
                
                HomotypicalGroup homotypicalGroup = basionymName.getHomotypicalGroup();
 
                
                HomotypicalGroup homotypicalGroup = basionymName.getHomotypicalGroup();


@@ -54,7 +50,7 @@ public class SynonymUtil {
                Set<NameRelationship> relations = new HashSet<NameRelationship>();
                Set<NameRelationship> removeRelations = new HashSet<NameRelationship>();
                
                Set<NameRelationship> relations = new HashSet<NameRelationship>();
                Set<NameRelationship> removeRelations = new HashSet<NameRelationship>();
                

-               for(TaxonNameBase typifiedName : homotypicalGroup.getTypifiedNames()){
+               for(TaxonNameBase<?, ?> typifiedName : homotypicalGroup.getTypifiedNames()){

                        
                        Set<NameRelationship> nameRelations = typifiedName.getRelationsFromThisName();
                        
                        
                        Set<NameRelationship> nameRelations = typifiedName.getRelationsFromThisName();
                        


@@ -81,7 +77,7 @@ public class SynonymUtil {
                }
                
 
                }
                
 

-               for (TaxonNameBase name : homotypicalGroup.getTypifiedNames()) {
+               for (TaxonNameBase<?, ?> name : homotypicalGroup.getTypifiedNames()) {

                        if (!name.equals(basionymName)) {
                                
                                // First check whether the relationship already exists
                        if (!name.equals(basionymName)) {
                                
                                // First check whether the relationship already exists


@@ -102,7 +98,7 @@ public class SynonymUtil {
         * @param basionymName
         * @deprecated TODO move this to cmdlib
         */
         * @param basionymName
         * @deprecated TODO move this to cmdlib
         */

-       public static void removeGroupBasionym(TaxonNameBase basionymName) {
+       public static void removeGroupBasionym(TaxonNameBase<?, ?> basionymName) {

 
                HomotypicalGroup homotypicalGroup = basionymName.getHomotypicalGroup();
                
 
                HomotypicalGroup homotypicalGroup = basionymName.getHomotypicalGroup();
                


@@ -113,7 +109,7 @@ public class SynonymUtil {
                Set<NameRelationship> relations = new HashSet<NameRelationship>();
                Set<NameRelationship> removeRelations = new HashSet<NameRelationship>();
                
                Set<NameRelationship> relations = new HashSet<NameRelationship>();
                Set<NameRelationship> removeRelations = new HashSet<NameRelationship>();
                

-               for(TaxonNameBase typifiedName : homotypicalGroup.getTypifiedNames()){
+               for(TaxonNameBase<?, ?> typifiedName : homotypicalGroup.getTypifiedNames()){

                        
                        Set<NameRelationship> nameRelations = typifiedName.getRelationsFromThisName();
                        
                        
                        Set<NameRelationship> nameRelations = typifiedName.getRelationsFromThisName();
                        


@@ -152,7 +148,7 @@ public class SynonymUtil {
         */
        public static boolean isSynonymGroupBasionym(Synonym synonym) {
                
         */
        public static boolean isSynonymGroupBasionym(Synonym synonym) {
                

-               TaxonNameBase synonymName = synonym.getName();
+               TaxonNameBase<?, ?> synonymName = synonym.getName();

                return isNameGroupBasionym(synonymName);
        }
        
                return isNameGroupBasionym(synonymName);
        }
        


@@ -164,7 +160,7 @@ public class SynonymUtil {
         * @return
         * @deprecated TODO move this to cmdlib
         */     
         * @return
         * @deprecated TODO move this to cmdlib
         */     

-       public static boolean isNameGroupBasionym(TaxonNameBase name) {
+       public static boolean isNameGroupBasionym(TaxonNameBase<?, ?> name) {

                if (name == null) {
                        return false;
                }
                if (name == null) {
                        return false;
                }


@@ -181,7 +177,6 @@ public class SynonymUtil {
                        return false;
                }
                
                        return false;
                }
                

-               boolean isBasionymToAll = true;

                                
                for (TaxonNameBase taxonName : typifiedNames) {
                        if (!taxonName.equals(name)) {
                                
                for (TaxonNameBase taxonName : typifiedNames) {
                        if (!taxonName.equals(name)) {


@@ -201,7 +196,7 @@ public class SynonymUtil {
         * @return
         * @deprecated TODO move this to cmdlib
         */
         * @return
         * @deprecated TODO move this to cmdlib
         */

-       public static boolean isNameBasionymOf(TaxonNameBase fromName, TaxonNameBase toName) {
+       public static boolean isNameBasionymOf(TaxonNameBase<?, ?> fromName, TaxonNameBase toName) {

                Set<NameRelationship> relations = toName.getRelationsToThisName();
                for (NameRelationship relation : relations) {
                        if (relation.getType().equals(NameRelationshipType.BASIONYM()) &&
                Set<NameRelationship> relations = toName.getRelationsToThisName();
                for (NameRelationship relation : relations) {
                        if (relation.getType().equals(NameRelationshipType.BASIONYM()) &&

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java
index dbe93f5c6a2ecfdb8c76059ff2d7a02b91a27c4c..832157c9e28743946db77b833a512fae4a0b116c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java
@@ -21,7 +21,7 @@ public class TaxonTransfer extends ByteArrayTransfer {
        /*\r
         * The object associated with this transfer event\r
         */\r
        /*\r
         * The object associated with this transfer event\r
         */\r

-       private TaxonBase taxonBase;\r
+       private TaxonBase<?> taxonBase;\r

                \r
        /*\r
         * Returns the singleton\r
                \r
        /*\r
         * Returns the singleton\r


@@ -32,13 +32,13 @@ public class TaxonTransfer extends ByteArrayTransfer {
        /*\r
         * Set transfer data for local use\r
         */\r
        /*\r
         * Set transfer data for local use\r
         */\r

-       public void setTaxon(TaxonBase taxon) {\r
+       public void setTaxon(TaxonBase<?> taxon) {\r

                this.taxonBase = taxon;\r
        }\r
        /*\r
         * Returns the local transfer data\r
         */\r
                this.taxonBase = taxon;\r
        }\r
        /*\r
         * Returns the local transfer data\r
         */\r

-       public TaxonBase getTaxon() {\r
+       public TaxonBase<?> getTaxon() {\r

                return taxonBase;\r
        }\r
        \r
                return taxonBase;\r
        }\r
        \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java
index 125a4830808ba5b9e110cae2b976854dcb9f1cbd..b33e2d972e488b19db9ffb9419cb3e41b81e8dba 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java
@@ -42,7 +42,7 @@ public class TaxonUtil {
                // get a new conversation
                ConversationHolder conversation = CdmStore.NewTransactionalConversation();
                // find the taxonBase
                // get a new conversation
                ConversationHolder conversation = CdmStore.NewTransactionalConversation();
                // find the taxonBase

-               TaxonBase taxonBase = CdmStore.getTaxonService().findByUuid(taxonUuid);
+               TaxonBase<?> taxonBase = CdmStore.getTaxonService().findByUuid(taxonUuid);

                // delete the taxonBase
                CdmStore.getTaxonService().delete(taxonBase);
                // commit the conversation and throw it away
                // delete the taxonBase
                CdmStore.getTaxonService().delete(taxonBase);
                // commit the conversation and throw it away


@@ -50,7 +50,7 @@ public class TaxonUtil {
                return true;
        }
        
                return true;
        }
        

-       public static Taxon addChildTaxonBaseIsolated(UUID taxonUuid, TaxonNameBase newTaxonName){
+       public static Taxon addChildTaxonBaseIsolated(UUID taxonUuid, TaxonNameBase<?, ?> newTaxonName){

                // disallow saving of zero length names
                if(newTaxonName.getFullTitleCache().length() == 0){
                        return null;
                // disallow saving of zero length names
                if(newTaxonName.getFullTitleCache().length() == 0){
                        return null;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java
index b568c6653188a1173efa522c0a2953f598f48142..8d2c92fc6628b6ad0bb43cecfba3470efd7d9200 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java
@@ -13,14 +13,11 @@ package eu.etaxonomy.taxeditor.store.model;
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.dialogs.IInputValidator;\r
 import org.eclipse.jface.dialogs.InputDialog;\r
 import org.eclipse.jface.window.Window;\r
 import org.eclipse.swt.widgets.Shell;\r
 \r
 import org.eclipse.jface.dialogs.IInputValidator;\r
 import org.eclipse.jface.dialogs.InputDialog;\r
 import org.eclipse.jface.window.Window;\r
 import org.eclipse.swt.widgets.Shell;\r
 \r

-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r
-\r

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


@@ -29,8 +26,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * TODO make this extend TitleAreaDialog\r
  */\r
 public class UriDialog extends InputDialog {\r
  * TODO make this extend TitleAreaDialog\r
  */\r
 public class UriDialog extends InputDialog {\r

-       private static final Logger logger = Logger.getLogger(UriDialog.class);\r
-       private URI uri;\r

                \r
        /**\r
         * @param parentShell\r
                \r
        /**\r
         * @param parentShell\r


@@ -45,10 +40,9 @@ public class UriDialog extends InputDialog {
                                dialogMessage, "http://", new IInputValidator() {\r
 \r
                                        public String isValid(String text) {\r
                                dialogMessage, "http://", new IInputValidator() {\r
 \r
                                        public String isValid(String text) {\r

-                                               URI uri = null;\r

                                                \r
                                                try {\r
                                                \r
                                                try {\r

-                                                       uri = new URI(text);\r
+                                                       new URI(text);\r

                                                } catch (URISyntaxException e) {\r
                                                        return "URL not correctly formed.";\r
                                                }\r
                                                } catch (URISyntaxException e) {\r
                                                        return "URL not correctly formed.";\r
                                                }\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java
index 0d866792cb1ffcfd2e149b5d3d3a40702babb97a..17e7431dc27cac00616faa46da2b22da2bcf5b2a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IStatus;
 


@@ -24,8 +23,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0
  */
 public abstract class AbstractPersistentPostOperation extends AbstractPostOperation {
  * @version 1.0
  */
 public abstract class AbstractPersistentPostOperation extends AbstractPostOperation {

-       private static final Logger logger = Logger
-       .getLogger(AbstractPersistentPostOperation.class);

        private IConversationEnabled conversationEnabled;
        
        /**
        private IConversationEnabled conversationEnabled;
        
        /**

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java
index a0a3efd330aa882d1206b81e22301e4cc264a733..176e577cbf88f1e60083d1a1619c2d7f1d9efbaa 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java
@@ -9,9 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import java.util.HashSet;\r
-import java.util.Set;\r
-\r

 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java
index 05436f6ab7684b7e23d93c2e670a40092f44a50f..b853e5458dbc914fe064fa136c98b20bdc6f4b32 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -31,8 +30,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  */\r
 public class ChangeConceptToSynonymOperation extends\r
                AbstractPostOperation {\r
  */\r
 public class ChangeConceptToSynonymOperation extends\r
                AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeConceptToSynonymOperation.class);\r

        \r
        private Taxon concept;\r
 \r
        \r
        private Taxon concept;\r
 \r


@@ -55,7 +52,7 @@ public class ChangeConceptToSynonymOperation extends
                        throws ExecutionException {\r
                \r
                // Create new synonym using concept name\r
                        throws ExecutionException {\r
                \r
                // Create new synonym using concept name\r

-               TaxonNameBase synonymName = concept.getName();\r
+               TaxonNameBase<?, ?> synonymName = concept.getName();\r

                Synonym synonym = Synonym.NewInstance(synonymName, taxon.getSec());\r
                \r
                // Remove concept relation from taxon\r
                Synonym synonym = Synonym.NewInstance(synonymName, taxon.getSec());\r
                \r
                // Remove concept relation from taxon\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java
index cf32a4af716c8c488a3f15a436589738a93d0ef7..34b52b5c7faf5c281334da1578bc011f2b496ff7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java
@@ -69,7 +69,7 @@ public class ChangeHomotypicGroupOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
 \r
                // Get synonym name\r
                        throws ExecutionException {\r
 \r
                // Get synonym name\r

-               TaxonNameBase synonymName = this.synonym.getName();\r
+               TaxonNameBase<?, ?> synonymName = this.synonym.getName();\r

                \r
                // TODO pass in homotypical group's taxon in case we are dragging from one editor to another\r
                \r
                \r
                // TODO pass in homotypical group's taxon in case we are dragging from one editor to another\r
                \r


@@ -98,7 +98,7 @@ public class ChangeHomotypicGroupOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                // Get synonym name\r
                        throws ExecutionException {\r
                \r
                // Get synonym name\r

-               TaxonNameBase synonymName = this.synonym.getName();\r
+               TaxonNameBase<?, ?> synonymName = this.synonym.getName();\r

                if(synonymName == null){\r
                        // TODO\r
                }\r
                if(synonymName == null){\r
                        // TODO\r
                }\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java
index 6dece0db6d3c540bb2e1b71083347719fb2e4a9e..fafe76e9acc39b4c21b10e6cdf2f9efbb1c6349d 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.model.SynonymUtil;
  */\r
 public class ChangeHomotypicalGroupBasionymOperation extends\r
                AbstractPostOperation {\r
  */\r
 public class ChangeHomotypicalGroupBasionymOperation extends\r
                AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeHomotypicalGroupBasionymOperation.class);\r

        private Synonym synonym;\r
 \r
        public ChangeHomotypicalGroupBasionymOperation(String text,\r
        private Synonym synonym;\r
 \r
        public ChangeHomotypicalGroupBasionymOperation(String text,\r


@@ -46,7 +43,7 @@ public class ChangeHomotypicalGroupBasionymOperation extends
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r

-               TaxonNameBase oldSynonymName = synonym.getName();\r
+               TaxonNameBase<?, ?> oldSynonymName = synonym.getName();\r

                // TODO replace w method from cdmlib\r
                SynonymUtil.setGroupBasionym(oldSynonymName);\r
                                \r
                // TODO replace w method from cdmlib\r
                SynonymUtil.setGroupBasionym(oldSynonymName);\r
                                \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java
index f0c457cbc2d7b9c73af155caef849e00e451c657..323f9175655e45d2059eb88d68f8b6e4e2a0d141 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,8 +27,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  * @author n.hoffmann\r
  */\r
 public class ChangeSynonymToConceptOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class ChangeSynonymToConceptOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeSynonymToConceptOperation.class);\r

        private Synonym synonym;\r
        private TaxonRelationshipType taxonRelationshipType;\r
        \r
        private Synonym synonym;\r
        private TaxonRelationshipType taxonRelationshipType;\r
        \r


@@ -50,7 +47,7 @@ public class ChangeSynonymToConceptOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                // Get name from synonym\r
                        throws ExecutionException {\r
                \r
                // Get name from synonym\r

-               TaxonNameBase synonymName = synonym.getName();\r
+               TaxonNameBase<?, ?> synonymName = synonym.getName();\r

                \r
                // remove synonym from taxon\r
                taxon.removeSynonym(synonym);\r
                \r
                // remove synonym from taxon\r
                taxon.removeSynonym(synonym);\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java
index 2f7da0ca68509192edbcc9813f93f8ec5eaa02f1..8a4dca6219e3738252533c6e9622da6a6b1d9fb7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.store.operations;
 \r
 import java.util.Set;\r
 \r
 \r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -31,8 +30,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  * @author n.hoffmann\r
  */\r
 public class ChangeSynonymToMisapplicationOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class ChangeSynonymToMisapplicationOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeSynonymToMisapplicationOperation.class);\r

 \r
        private Synonym synonym;\r
        private Taxon misapplication;\r
 \r
        private Synonym synonym;\r
        private Taxon misapplication;\r


@@ -50,7 +47,7 @@ public class ChangeSynonymToMisapplicationOperation extends AbstractPostOperatio
                        throws ExecutionException {\r
                \r
                // get name from synonym\r
                        throws ExecutionException {\r
                \r
                // get name from synonym\r

-               TaxonNameBase synonymName = synonym.getName();\r
+               TaxonNameBase<?, ?> synonymName = synonym.getName();\r

                \r
                // make misapplied name with synonym name\r
                misapplication = Taxon.NewInstance(synonymName, null);\r
                \r
                // make misapplied name with synonym name\r
                misapplication = Taxon.NewInstance(synonymName, null);\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java
deleted file mode 100644 (file)
index b78abaa..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.store.operations;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.core.commands.operations.IUndoContext;\r
-import org.eclipse.core.runtime.IAdaptable;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.core.runtime.IStatus;\r
-\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 15.01.2009\r
- * @version 1.0\r
- * @author n.hoffmann\r
- */\r
-public class ChangeSynonymToTaxonOperation extends AbstractPostOperation {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeSynonymToTaxonOperation.class);\r
-       private Synonym synonym;\r
-\r
-       public ChangeSynonymToTaxonOperation(String text, IUndoContext undoContext,\r
-                       Taxon taxon, Synonym synonym) {\r
-               super(text, undoContext, taxon);\r
-               \r
-               this.synonym = synonym;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-\r
-               // Remove synonym from taxon\r
-               taxon.removeSynonym(synonym);\r
-               \r
-               // Create new taxon with synonym name\r
-               Taxon newTaxon = Taxon.NewInstance(synonym.getName(), synonym.getSec());\r
-                               \r
-               // Add new taxon to session data repository\r
-               taxon.setTaxonomicParent(null, null, null);\r
-               \r
-               // Open editor for new taxon\r
-               // TODO this will not work. maybe we have to extend the postExecute to allow a parameter (Object?)\r
-               //EditorController.open(newTaxon);\r
-               \r
-               \r
-               return postExecute(null);\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               return null;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               return null;\r
-       }\r
-}\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java
deleted file mode 100644 (file)
index f822833..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.store.operations;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.core.commands.operations.IUndoContext;\r
-import org.eclipse.core.runtime.IAdaptable;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.Status;\r
-\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-\r
-/**\r
- * @author n.hoffmann\r
- * @created 20.01.2009\r
- * @version 1.0\r
- * @author n.hoffmann\r
- */\r
-public class ChangeTaxonToSynonymOperation extends AbstractPostOperation{\r
-       \r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChangeTaxonToSynonymOperation.class);\r
-\r
-       private Taxon destinationTaxon;\r
-       \r
-       public ChangeTaxonToSynonymOperation(String label,\r
-                       IUndoContext undoContext, Taxon taxon) {\r
-               super(label, undoContext, taxon);\r
-       }\r
-\r
-       @Override\r
-       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-\r
-               // FIXME this is old code: reimplement\r
-//             IEditorPart editor = null;\r
-//             \r
-//             try {   \r
-//                     // Prompt user "Would you like to save?" before showing dialog\r
-//                     // "Cancel" cancels action - "No" does not\r
-//                     editor = EditorController.getEditorByTaxon(taxon);\r
-//                     if (editor.isDirty()) {\r
-//                             if (!MessageDialog.openConfirm(GlobalController.getShell(), "Save before proceeding", \r
-//                                             "All changes must be saved before proceeding with this action.\n\n" +\r
-//                                             "Press \"OK\" to save and continue, or \"Cancel\" to cancel this action.")) {\r
-//                                     return Status.CANCEL_STATUS;\r
-//                             }\r
-//                             editor.doSave(null);\r
-//                     }\r
-////                   if (UiUtil.getActivePage().saveEditor(oldEditor, true) == false) {\r
-////                           return;\r
-////                   }\r
-//             } catch (PartInitException e1) {\r
-//                     e1.printStackTrace();\r
-//             }\r
-//             \r
-//             // Get destination taxon from dialog\r
-//             Shell shell = GlobalController.getShell();\r
-//             SelectTaxonDialog dialog = new SelectTaxonDialog(shell, SelectTaxonDialog.TAXON_TO_SYNONYM);\r
-//             destinationTaxon = dialog.open(taxon);\r
-//             \r
-//             // Abort action if user cancelled dialog without choosing a taxon\r
-//             if (destinationTaxon == null) {\r
-//                     return Status.CANCEL_STATUS;\r
-//             }\r
-//                             \r
-//             \r
-//             return makeTaxonSynonym(taxon, destinationTaxon) ? Status.OK_STATUS : Status.CANCEL_STATUS;\r
-               return Status.CANCEL_STATUS;\r
-       }\r
-\r
-       // FIXME this is old code: reimplement\r
-//     private boolean makeTaxonSynonym(Taxon taxon, Taxon destinationTaxon){\r
-//             // Move taxon in CDM to new destinationTaxon\r
-//             TaxonNameBase synonymName = taxon.getName();\r
-//             SynonymRelationshipType synonymType;\r
-//             if (CdmUtil.isNameHomotypic(synonymName, destinationTaxon)) {\r
-//                     synonymType = SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF();\r
-//             } else {\r
-//                     synonymType = SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF();\r
-//             }\r
-//             CdmUtil.makeTaxonSynonym(taxon, destinationTaxon, synonymType,\r
-//                             null, null);\r
-//             \r
-//             // TODO move any children, descriptions, synonyms\r
-//             for (TaxonDescription description: taxon.getDescriptions()) {\r
-//                     destinationTaxon.addDescription(description);\r
-//                     taxon.removeDescription(description);\r
-//             }\r
-//             \r
-//             for (TaxonRelationship fromRelation : taxon.getRelationsFromThisTaxon()) {\r
-//                     fromRelation.setFromTaxon(destinationTaxon);\r
-//             }\r
-//             \r
-//             for (TaxonRelationship toRelation : taxon.getRelationsToThisTaxon()) {\r
-//                     toRelation.setToTaxon(destinationTaxon);\r
-//             }\r
-//                             \r
-//             CdmSessionDataRepository.getDefault().removeTaxon(taxon);       \r
-//                             \r
-//             // Close open editor for oldTaxon without forcing save.\r
-//             // User has already saved or declined to do so above.\r
-//             EditorController.close(taxon, false);\r
-//             CdmSessionDataRepository.getDefault().saveTaxon(destinationTaxon);\r
-//             // Open editor for destinationTaxon\r
-//             EditorController.open(destinationTaxon);\r
-//             \r
-//             return true;\r
-//     }\r
-       \r
-       @Override\r
-       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-//             return makeTaxonSynonym(taxon, destinationTaxon) ? Status.OK_STATUS : Status.CANCEL_STATUS;\r
-               return Status.CANCEL_STATUS;\r
-       }\r
-\r
-       @Override\r
-       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               // TODO implement undo\r
-               logger.warn("Not yet implemented.");\r
-               return Status.CANCEL_STATUS;\r
-       }\r
-}\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java
index cbef4d27a23dbacb9941b01c248ec120cd660a7c..d74accdec49887d68f2ffb75ff0b3b1862dca16c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java
@@ -33,7 +33,7 @@ public class CreateChildTaxonOperation extends AbstractPostOperation {
        private static final Logger logger = Logger
        .getLogger(CreateChildTaxonOperation.class);
        
        private static final Logger logger = Logger
        .getLogger(CreateChildTaxonOperation.class);
        

-       private TaxonNameBase newTaxonName;
+       private TaxonNameBase<?, ?> newTaxonName;

 
        private Taxon childTaxon;
 
 
        private Taxon childTaxon;
 


@@ -46,7 +46,7 @@ public class CreateChildTaxonOperation extends AbstractPostOperation {
         * @param conversationEnabled
         */
        public CreateChildTaxonOperation(String label, IUndoContext undoContext,
         * @param conversationEnabled
         */
        public CreateChildTaxonOperation(String label, IUndoContext undoContext,

-                       Taxon taxon, TaxonNameBase name, IPostOperationEnabled postOperationEnabled) {
+                       Taxon taxon, TaxonNameBase<?, ?> name, IPostOperationEnabled postOperationEnabled) {

                super(label, undoContext, taxon, postOperationEnabled);
                
                this.newTaxonName = name;
                super(label, undoContext, taxon, postOperationEnabled);
                
                this.newTaxonName = name;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java
index b3c1545d2f589b4af94a2f60960a42164876632b..5bf346d6daaf190df4fdd8184d3716b7dea0f21e 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java
@@ -9,14 +9,12 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
 \r

-import eu.etaxonomy.cdm.model.name.NonViralName;\r

 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r


@@ -29,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;
  * @author n.hoffmann\r
  */\r
 public class CreateConceptRelationOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class CreateConceptRelationOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateConceptRelationOperation.class);\r

        \r
        private Taxon concept;\r
        private TaxonRelationshipType taxonRelationshipType;\r
        \r
        private Taxon concept;\r
        private TaxonRelationshipType taxonRelationshipType;\r


@@ -51,7 +47,7 @@ public class CreateConceptRelationOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                // Create empty new name\r
                        throws ExecutionException {\r
                \r
                // Create empty new name\r

-               TaxonNameBase conceptName = CdmParserUtil.parseFullReference("", null, null);\r
+               TaxonNameBase<?, ?> conceptName = CdmParserUtil.parseFullReference("", null, null);\r

                \r
                // make concept name with concept name\r
                concept = Taxon.NewInstance(conceptName, null);\r
                \r
                // make concept name with concept name\r
                concept = Taxon.NewInstance(conceptName, null);\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java
index f3b0ffc170a51c49e681b2875211a50ed28d2fa9..7d6a77f97b34669491b6bfc7f5197bf4fdc9a358 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -29,8 +28,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @author n.hoffmann\r
  */\r
 public class CreateDescriptionElementOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class CreateDescriptionElementOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateDescriptionElementOperation.class);\r

        \r
        private TaxonDescription description;\r
        private Feature feature;\r
        \r
        private TaxonDescription description;\r
        private Feature feature;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java
index 04c79731b35502a06d7fa2604e9d9bfb2b3f7ff0..4b25737f2795a1838a8503af7e4686eaac936608 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,12 +27,10 @@ import eu.etaxonomy.taxeditor.store.model.ImagesUtil;
  * @version 1.0\r
  */\r
 public class CreateImageOperation extends AbstractPostOperation {\r
  * @version 1.0\r
  */\r
 public class CreateImageOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateImageOperation.class);\r

        \r
        private ImageFile imageFile;\r
 \r
        \r
        private ImageFile imageFile;\r
 \r

-       private DescriptionBase description;\r
+       private DescriptionBase<?> description;\r

 \r
        /**\r
         * @param text\r
 \r
        /**\r
         * @param text\r


@@ -42,7 +39,7 @@ public class CreateImageOperation extends AbstractPostOperation {
         * @param url\r
         */\r
        public CreateImageOperation(String label, IUndoContext undoContext,\r
         * @param url\r
         */\r
        public CreateImageOperation(String label, IUndoContext undoContext,\r

-                       Taxon taxon, DescriptionBase description, ImageFile imageFile, IPostOperationEnabled postOperationEnabled) {\r
+                       Taxon taxon, DescriptionBase<?> description, ImageFile imageFile, IPostOperationEnabled postOperationEnabled) {\r

                super(label, undoContext, taxon, postOperationEnabled);\r
                this.imageFile = imageFile;\r
                this.description = description;\r
                super(label, undoContext, taxon, postOperationEnabled);\r
                this.imageFile = imageFile;\r
                this.description = description;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java
index db9f4a0591e4e6f8784c943d946c4d0797368144..135580ea4bd6932834b1a484f883b74467e66d4a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;
  * @author n.hoffmann\r
  */\r
 public class CreateMisapplicationOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class CreateMisapplicationOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateMisapplicationOperation.class);\r

        \r
        private Taxon misapplication;\r
 \r
        \r
        private Taxon misapplication;\r
 \r


@@ -46,7 +43,7 @@ public class CreateMisapplicationOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                // Create empty new name\r
                        throws ExecutionException {\r
                \r
                // Create empty new name\r

-               TaxonNameBase misapplicationName = \r
+               TaxonNameBase<?, ?> misapplicationName = \r

                                CdmParserUtil.parseFullReference("", null, null);\r
                \r
                // make misapplication name with misapplication name\r
                                CdmParserUtil.parseFullReference("", null, null);\r
                \r
                // make misapplication name with misapplication name\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
index 4d80b0197e97711c53ce87b80e83392017ec0fab..577411764042ae07a62cea1a5864ed59d4a295e6 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -18,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 \r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 \r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r

-import eu.etaxonomy.cdm.model.taxon.Synonym;\r

 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r


@@ -30,8 +28,6 @@ import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;
  */\r
 public class CreateSynonymInExisitingHomotypicalGroupOperation extends\r
                AbstractPostOperation {\r
  */\r
 public class CreateSynonymInExisitingHomotypicalGroupOperation extends\r
                AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateSynonymInExisitingHomotypicalGroupOperation.class);\r

 \r
        private HomotypicalGroup group;\r
        private String newSynonymText;\r
 \r
        private HomotypicalGroup group;\r
        private String newSynonymText;\r


@@ -53,7 +49,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperation extends
                        throws ExecutionException {\r
                \r
                // Create synonym name using newSynonymText\r
                        throws ExecutionException {\r
                \r
                // Create synonym name using newSynonymText\r

-               TaxonNameBase synonymName = \r
+               TaxonNameBase<?, ?> synonymName = \r

                                CdmParserUtil.parseFullReference(newSynonymText, null, null);\r
                \r
                // Add name to given homotypic group\r
                                CdmParserUtil.parseFullReference(newSynonymText, null, null);\r
                \r
                // Add name to given homotypic group\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java
index e3b246c1ab0303f4e26cbddd1a0cb04448ad3549..1c0cc4d2d0acc7fee6afee45577bff9b4f6deb15 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -34,8 +33,6 @@ import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;
  * @author n.hoffmann\r
  */\r
 public class CreateSynonymInNewGroupOperation extends AbstractPostOperation {\r
  * @author n.hoffmann\r
  */\r
 public class CreateSynonymInNewGroupOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CreateSynonymInNewGroupOperation.class);\r

        \r
        private String newSynonymText;\r
        private SynonymRelationship newSynonymRelationship;\r
        \r
        private String newSynonymText;\r
        private SynonymRelationship newSynonymRelationship;\r


@@ -55,7 +52,7 @@ public class CreateSynonymInNewGroupOperation extends AbstractPostOperation {
                        throws ExecutionException {\r
                \r
                // Create synonym name using newSynonymText\r
                        throws ExecutionException {\r
                \r
                // Create synonym name using newSynonymText\r

-               TaxonNameBase synonymName = \r
+               TaxonNameBase<?, ?> synonymName = \r

                                CdmParserUtil.parseFullReference(newSynonymText, null, null);\r
                \r
                // Add name to new homotypic group\r
                                CdmParserUtil.parseFullReference(newSynonymText, null, null);\r
                \r
                // Add name to new homotypic group\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java
index 629f0ea96b5761cced8a9da161960d49f56daaf2..0b992d1d0c96aefb9d381212e84b8dea43752557 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -34,12 +33,10 @@ import eu.etaxonomy.taxeditor.store.model.TaxonUtil;
  * @version 1.0\r
  */\r
 public class DeleteConceptRelationOperation extends AbstractPostOperation {\r
  * @version 1.0\r
  */\r
 public class DeleteConceptRelationOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DeleteConceptRelationOperation.class);\r

        \r
        private Taxon relatedTaxon;\r
        private TaxonRelationshipType relationshipType;\r
        \r
        private Taxon relatedTaxon;\r
        private TaxonRelationshipType relationshipType;\r

-       private ReferenceBase citation;\r
+       private ReferenceBase<?> citation;\r

        private String microcitation;\r
        private TaxonRelationship relationship; \r
 \r
        private String microcitation;\r
        private TaxonRelationship relationship; \r
 \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java
index 2cd592c12b7f024c5f6da3c67d8b22a1c54d9c36..cdbf98d0b41e21f74669698f7f39f8def6f9e1c8 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java
@@ -10,7 +10,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,12 +27,10 @@ import eu.etaxonomy.taxeditor.store.model.ImagesUtil;
  * @version 1.0\r
  */\r
 public class DeleteImageOperation extends AbstractPostOperation {\r
  * @version 1.0\r
  */\r
 public class DeleteImageOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DeleteImageOperation.class);\r

        \r
        private ImageFile imageFile;\r
 \r
        \r
        private ImageFile imageFile;\r
 \r

-       private DescriptionBase description;\r
+       private DescriptionBase<?> description;\r

 \r
        /**\r
         * @param text\r
 \r
        /**\r
         * @param text\r


@@ -42,7 +39,7 @@ public class DeleteImageOperation extends AbstractPostOperation {
         * @param url\r
         */\r
        public DeleteImageOperation(String label, IUndoContext undoContext,\r
         * @param url\r
         */\r
        public DeleteImageOperation(String label, IUndoContext undoContext,\r

-                       Taxon taxon, DescriptionBase description, ImageFile imageFile, IPostOperationEnabled postOperationEnabled) {\r
+                       Taxon taxon, DescriptionBase<?> description, ImageFile imageFile, IPostOperationEnabled postOperationEnabled) {\r

                super(label, undoContext, taxon, postOperationEnabled);\r
                \r
                this.imageFile = imageFile;\r
                super(label, undoContext, taxon, postOperationEnabled);\r
                \r
                this.imageFile = imageFile;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java
index ba70c63b9afcea7beea7487d85cd50fc825ecd8e..4ad617ab9b4d08414c3155974d4510bd64aed87a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -27,12 +26,10 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  * @version 1.0\r
  */\r
 public class DeleteMisapplicationOperation extends AbstractPostOperation {\r
  * @version 1.0\r
  */\r
 public class DeleteMisapplicationOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DeleteMisapplicationOperation.class);\r

        \r
        private Taxon misapplication;\r
 \r
        \r
        private Taxon misapplication;\r
 \r

-       private ReferenceBase citation;\r
+       private ReferenceBase<?> citation;\r

 \r
        private String microcitation;\r
 \r
 \r
        private String microcitation;\r
 \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java
index 71fdc0f7e8aaef291e88eae82fa2a4ddb6a37de9..5ab896416a098180f21660be378e251d2eb2c19f 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.store.operations;
 \r
 import java.util.Set;\r
 \r
 \r
 import java.util.Set;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,8 +27,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0\r
  */\r
 public class DeleteSynonymOperation extends AbstractPostOperation {\r
  * @version 1.0\r
  */\r
 public class DeleteSynonymOperation extends AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DeleteSynonymOperation.class);\r

        \r
        private Synonym synonym;\r
        private Set<SynonymRelationshipType> synonymTypes;\r
        \r
        private Synonym synonym;\r
        private Set<SynonymRelationshipType> synonymTypes;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java
index 6c917c2a545a25716af80060c183625200449d74..8565f28e56d3cb5fd7e033eb38879c377f0eb6f2 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.operations;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.runtime.IAdaptable;\r


@@ -28,8 +27,7 @@ import eu.etaxonomy.taxeditor.store.model.SynonymUtil;
  */\r
 public class RemoveHomotypicalGroupBasionymOperation extends\r
                AbstractPostOperation {\r
  */\r
 public class RemoveHomotypicalGroupBasionymOperation extends\r
                AbstractPostOperation {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(RemoveHomotypicalGroupBasionymOperation.class);\r
+\r

        private Synonym synonym;\r
 \r
        public RemoveHomotypicalGroupBasionymOperation(String text,\r
        private Synonym synonym;\r
 \r
        public RemoveHomotypicalGroupBasionymOperation(String text,\r


@@ -46,7 +44,7 @@ public class RemoveHomotypicalGroupBasionymOperation extends
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
                \r

-               TaxonNameBase oldSynonymName = synonym.getName();\r
+               TaxonNameBase<?, ?> oldSynonymName = synonym.getName();\r

                // TODO replace w method from cdmlib\r
                SynonymUtil.removeGroupBasionym(oldSynonymName);\r
                                \r
                // TODO replace w method from cdmlib\r
                SynonymUtil.removeGroupBasionym(oldSynonymName);\r
                                \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java
index a035d3df5bba8f73c12a0d69a03e55ef0b5f95f4..487eb617b16b36bc512305e97bc8b274b242ec92 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java
@@ -34,7 +34,7 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostOperation {
        
        private Synonym synonym;
        private Taxon newTaxon;
        
        private Synonym synonym;
        private Taxon newTaxon;

-       private TaxonNameBase oldTaxonName;
+       private TaxonNameBase<?, ?> oldTaxonName;

        
        /**
         * @param label
        
        /**
         * @param label

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java
index 67f5b1d1afb5680cb6e493c6baabf460c0c2ca18..93081d3b08b5b2eba8a57d58779d49bd9f0b5cf1 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r


@@ -25,8 +24,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  */\r
 public class CdmPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class CdmPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(CdmPreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.cdm";\r
        \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.cdm";\r
        \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java
index 92ba2b80429c2848f2052b36ae7e242cba2c8bad..bf8dd63abb9d23d9f940cb652e5faec22d485255 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r


@@ -25,8 +24,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  */\r
 public class DescriptionPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class DescriptionPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionPreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.description";\r
        \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.description";\r
        \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java
index 7324c7ef2738d79ec51509d4037a52f68f493c15..c49f86f1a600abcd133d20b939c9851ffea48d12 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.store.preference;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r


@@ -32,8 +31,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */\r
 public class FeaturePreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class FeaturePreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(FeaturePreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.feature";\r
        \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.feature";\r
        \r


@@ -59,8 +56,8 @@ public class FeaturePreferences extends PreferencePage implements
                gridLayout.numColumns = 3;\r
                container.setLayout(gridLayout);\r
 \r
                gridLayout.numColumns = 3;\r
                container.setLayout(gridLayout);\r
 \r

-               TermVocabulary<Feature> features = \r
-                               CdmStore.getDefault().getFeatures();\r
+               CdmStore.getDefault();\r
+               TermVocabulary<Feature> features = CdmStore.getFeatures();\r

                \r
                for (Feature feature : features) {\r
                                                \r
                \r
                for (Feature feature : features) {\r
                                                \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java
index 7ac49c7a6a1f19604aed7d341bea77d2ecf2ec47..95ea7745018b5ab1eeda356cf00fe81e89dda527 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r


@@ -31,8 +30,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @version 1.0\r
  */\r
 public class InitNomenclaturalCodePrefDialog extends Dialog {\r
  * @version 1.0\r
  */\r
 public class InitNomenclaturalCodePrefDialog extends Dialog {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(InitNomenclaturalCodePrefDialog.class);\r

        \r
        private Button icbnButton;\r
        private Button icznButton;\r
        \r
        private Button icbnButton;\r
        private Button icznButton;\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java
index 926a32ba113aca5d10b954603bd1b39adf172df1..0a3c2970596fd2b0c2b98babcc3d96e9d27435f8 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r


@@ -30,8 +29,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  */\r
 public class InitializeDbPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class InitializeDbPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(InitializeDbPreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.initdb";\r
 \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.initdb";\r
 \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java
index 4a8b85280189cb86b55a838ff11b74a3307af4be..9caa4bcda9b8542c7a7680e19dbb22942f9a88f2 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java
@@ -8,7 +8,6 @@
 */\r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 */\r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r


@@ -30,8 +29,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  */\r
 public class NomenclaturalCodePreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class NomenclaturalCodePreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(NomenclaturalCodePreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.nomenclatural";\r
 \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.nomenclatural";\r
 \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java
index cbbac66ccb1a09427fcecbe864c8f0c9c8f68972..a65b71f7b12f2793ccf60b1e5801358c96fafcfd 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Collections;\r
 import java.util.Comparator;\r
 import java.util.List;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r
 import java.util.List;\r

-import java.util.Set;\r

 import java.util.SortedSet;\r
 \r
 import org.apache.log4j.Logger;\r
 import java.util.SortedSet;\r
 \r
 import org.apache.log4j.Logger;\r


@@ -267,7 +266,7 @@ public class PreferencesUtil {
         * \r
         * @return\r
         */\r
         * \r
         * @return\r
         */\r

-       public static NonViralName getInstanceOfPreferredNameClass() {\r
+       public static NonViralName<?> getInstanceOfPreferredNameClass() {\r

                NomenclaturalCode code = getPreferredNomenclaturalCode();\r
                \r
                // Check whether name code preference needs to be initialized\r
                NomenclaturalCode code = getPreferredNomenclaturalCode();\r
                \r
                // Check whether name code preference needs to be initialized\r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java
index e25d34f6325bde6486998b61ee97004e40ac4c19..248e8af766830b2b4cb3d20b578d726bbab4a556 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java
@@ -12,7 +12,6 @@ import java.util.HashMap;
 import java.util.Map;\r
 import java.util.SortedSet;\r
 \r
 import java.util.Map;\r
 import java.util.SortedSet;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r


@@ -35,8 +34,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */\r
 public class RankMenuPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class RankMenuPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(RankMenuPreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.ranks";\r
        \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.preferences.ranks";\r
        \r


@@ -62,8 +59,8 @@ public class RankMenuPreferences extends PreferencePage implements
                gridLayout.numColumns = 3;\r
                container.setLayout(gridLayout);\r
 \r
                gridLayout.numColumns = 3;\r
                container.setLayout(gridLayout);\r
 \r

-               SortedSet<Rank> ranks = \r
-                               CdmStore.getDefault().getRanks();\r
+               CdmStore.getDefault();\r
+               SortedSet<Rank> ranks = CdmStore.getRanks();\r

                \r
                for (Rank rank : ranks) {\r
                                                \r
                \r
                for (Rank rank : ranks) {\r
                                                \r

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java
index d736f608f29013d658c60a3e33f3cedb28573609..9ec548dd89b3b11ebd5fb0db4dfaa526d40ea85c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r
 \r
 package eu.etaxonomy.taxeditor.store.preference;\r
 \r

-import org.apache.log4j.Logger;\r

 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.layout.GridLayout;\r


@@ -25,8 +24,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
  */\r
 public class TaxonomicPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r
  */\r
 public class TaxonomicPreferences extends PreferencePage implements\r
                IWorkbenchPreferencePage {\r

-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonomicPreferences.class);\r

 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.taxonomic.preferences";\r
        \r
 \r
        public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.taxonomic.preferences";\r
        \r

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java
index 6dcc8d810a53976250caeb5d9c52740b5a0fb518..4479208eb90e4ffb1a61e047fd264c794714bb1c 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java
@@ -13,9 +13,8 @@ package eu.etaxonomy.taxeditor.store;
 import java.util.List;
 import java.util.Set;
 
 import java.util.List;
 import java.util.Set;
 

-import org.apache.log4j.Logger;

 import org.junit.Assert;
 import org.junit.Assert;

-import org.junit.Before;
+import org.junit.BeforeClass;

 import org.junit.Ignore;
 import org.junit.Test;
 
 import org.junit.Ignore;
 import org.junit.Test;
 


@@ -30,20 +29,19 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  */
 //@Transactional(TransactionMode.DISABLED)
 public class CdmStoreTest /*extends CdmIntegrationTest */{
  */
 //@Transactional(TransactionMode.DISABLED)
 public class CdmStoreTest /*extends CdmIntegrationTest */{

-       private static final Logger logger = Logger.getLogger(CdmStoreTest.class);

 
 //     @SpringBeanByType
 
 //     @SpringBeanByType

-       private CdmStore cdmStore;// = CdmStore.getDefault();
+       private static CdmStore cdmStore;// = CdmStore.getDefault();

        
        

-       private ConversationHolder conversation;
+       private static ConversationHolder conversation;

        
        /**
         * @throws java.lang.Exception
         */
        
        /**
         * @throws java.lang.Exception
         */

-       @Before
-       public void setUp() throws Exception {
+       @BeforeClass
+       public static void setUp() throws Exception {

                cdmStore = CdmStore.getDefault();
                cdmStore = CdmStore.getDefault();

-               conversation = cdmStore.NewConversation();
+               conversation = CdmStore.NewConversation();

        }
        
        /**
        }
        
        /**

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
index 31539ce224738dddbaca927c0db86a845e4280c7..a2a71bc3d15253d03ed41e51f98e18845a7b509d 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
@@ -10,21 +10,14 @@
 package eu.etaxonomy.taxeditor.store;
 
 
 package eu.etaxonomy.taxeditor.store;
 
 

-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;

 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Assert;
 import org.junit.Before;

-import org.junit.Ignore;

 import org.junit.Test;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import org.junit.Test;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;

-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

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


@@ -33,14 +26,16 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  */
 //@Transactional(TransactionMode.DISABLED)
 public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{
  */
 //@Transactional(TransactionMode.DISABLED)
 public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{

-       private static final Logger logger = Logger.getLogger(NameProtectTitleCacheTest.class);

 
 //     @SpringBeanByType
 
 //     @SpringBeanByType

+       @SuppressWarnings("unused")

        private CdmStore cdmStore;// = CdmStore.getDefault();
        
        private CdmStore cdmStore;// = CdmStore.getDefault();
        

+       
+       @SuppressWarnings("unused")

        private ConversationHolder conversation;
 
        private ConversationHolder conversation;
 

-       private NonViralName name;
+       private NonViralName<?> name;

        
        /**
         * @throws java.lang.Exception
        
        /**
         * @throws java.lang.Exception

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java
index 4c81974aecc36b0d44d806e445deaae9db7bcf3e..79969182e60fbb307a54555147f20c3e178447e3 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java
@@ -3,7 +3,6 @@ package eu.etaxonomy.taxeditor.store.operations;
 
 import junit.framework.Assert;
 
 
 import junit.framework.Assert;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.eclipse.core.commands.ExecutionException;
 import org.junit.BeforeClass;
 import org.junit.Ignore;


@@ -21,9 +20,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
  * @version 1.0
  */
 public class ChangeConceptRelationshipTypeOperationTest extends AbstractTaxeditorOperationTest {
  * @version 1.0
  */
 public class ChangeConceptRelationshipTypeOperationTest extends AbstractTaxeditorOperationTest {

-       private static final Logger logger = Logger
-                       .getLogger(ChangeConceptRelationshipTypeOperationTest.class);
-

        
        private static Taxon relatedTaxon;
 
        
        private static Taxon relatedTaxon;
 

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java
index b813dacc22352b611bac6f09682c00b04be4ad03..eb09ac3fd5ae01e280b7b353d0576e6a9fee937e 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java
@@ -10,13 +10,8 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.*;
-

 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;

 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java
index 72538b943c8f95c9e0762ba995761adc67ee3f6f..c8be419ca038a03fea3e6b0354db8479d4b2e5b2 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java
@@ -1,8 +1,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.*;
-

 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java
deleted file mode 100644 (file)
index d0347e1..0000000
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.store.operations;
-
-import static org.junit.Assert.fail;
-import junit.framework.Assert;
-
-import org.apache.log4j.Logger;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-/**
- * @author n.hoffmann
- * @created 07.04.2009
- * @version 1.0
- */
-public class ChangeSynonymToTaxonOperationTest {
-       private static final Logger logger = Logger
-                       .getLogger(ChangeSynonymToTaxonOperationTest.class);
-
-       private static AbstractPostOperation operation;
-
-       private static Taxon taxon;
-
-       private static Synonym synonym;
-
-       private static SynonymRelationshipType synonymRelationshipType;
-
-       
-       /**
-        * @throws java.lang.Exception
-        */
-       @BeforeClass
-       public static void setUpBeforeClass() throws Exception {
-               
-               taxon = Taxon.NewInstance(null, null);
-               synonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
-               synonymRelationshipType = SynonymRelationshipType.SYNONYM_OF();
-               
-               taxon.addSynonym(synonym, synonymRelationshipType);
-               
-               operation = new ChangeSynonymToTaxonOperation("Change Synonym To Taxon", null, taxon, synonym);
-       }
-
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToTaxonOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.execute(null, null);
-               
-               Assert.assertTrue("Synonym should be deleted from taxon", taxon.getSynonyms().size() == 0);
-       }
-       
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToTaxonOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.undo(null, null);
-               
-               Assert.assertTrue("Taxon should have a synonym.", taxon.getSynonyms().size() > 0);
-               Assert.assertEquals("Synonym is not the expexted.", synonym, taxon.getSynonyms().toArray(new Synonym[0])[0]);
-       }
-       
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToTaxonOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.redo(null, null);
-               
-               Assert.assertTrue("Synonym should be deleted from taxon", taxon.getSynonyms().size() == 0);
-       }
-
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}.
-        */
-       @Test
-       public void testPostExecute() {         
-               // TODO there is not post operation functionality for this class
-               // at the moment. Implement test when there is.
-               logger.warn("No post operation functionality for this class");
-       }
-}

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java
deleted file mode 100644 (file)
index b81941b..0000000
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.store.operations;
-
-import org.apache.log4j.Logger;
-import org.eclipse.core.commands.ExecutionException;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-/**
- * @author n.hoffmann
- * @created 07.04.2009
- * @version 1.0
- */
-public class ChangeTaxonToSynonymOperationTest {
-       private static final Logger logger = Logger
-                       .getLogger(ChangeTaxonToSynonymOperationTest.class);
-
-       private static AbstractPostOperation operation;
-
-       private static Taxon taxon;
-       
-       /**
-        * @throws java.lang.Exception
-        */
-       @BeforeClass
-       public static void setUpBeforeClass() throws Exception {
-               
-               taxon = Taxon.NewInstance(NonViralName.NewInstance(null), null);
-               
-               operation = new ChangeTaxonToSynonymOperation("Change Taxon To Synonym", null, taxon);
-       }
-
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeTaxonToSynonymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.execute(null, null);
-               
-               logger.warn("Can not test. Integration test needed.");
-       }
-       
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeTaxonToSynonymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.undo(null, null);
-               
-               logger.warn("Can not test. Integration test needed.");
-       }
-
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeTaxonToSynonymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
-        * @throws ExecutionException 
-        */
-       @Test
-       public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
-               operation.redo(null, null);
-               
-               logger.warn("Can not test. Integration test needed.");
-       }
-
-       /**
-        * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}.
-        */
-       @Test
-       public void testPostExecute() {
-               // TODO there is not post operation functionality for this class
-               // at the moment. Implement test when there is.
-               logger.warn("No post operation functionality for this class");
-       }
-}

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java
index e86b6179454ff816f14228bcc5fb08026820dd5a..428052f222e7a76aff1c12bb4a17941409878151 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.BeforeClass;


@@ -24,8 +23,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0
  */
 public class CreateMisapplicationOperationTest extends AbstractTaxeditorOperationTest {
  * @version 1.0
  */
 public class CreateMisapplicationOperationTest extends AbstractTaxeditorOperationTest {

-       private static final Logger logger = Logger
-                       .getLogger(CreateMisapplicationOperationTest.class);

 
        private static Taxon taxon;
        
 
        private static Taxon taxon;
        

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
index 50da8fb022293e06b70e8343e32279c81004b9cf..a44834e65459259b0cd77d4bad26496e088e7faa 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.Before;


@@ -18,7 +17,6 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NonViralName;

-import eu.etaxonomy.cdm.model.name.TaxonNameBase;

 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;


@@ -29,15 +27,13 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0
  */
 public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends AbstractTaxeditorOperationTest {
  * @version 1.0
  */
 public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends AbstractTaxeditorOperationTest {

-       private static final Logger logger = Logger
-                       .getLogger(CreateSynonymInExisitingHomotypicalGroupOperationTest.class);

 
        private String newSynonymText;
 
        private HomotypicalGroup homotypicalGroup;
 
 
 
        private String newSynonymText;
 
        private HomotypicalGroup homotypicalGroup;
 
 

-       private NonViralName taxonName;
+       private NonViralName<?> taxonName;

        
        /**
         * @throws java.lang.Exception
        
        /**
         * @throws java.lang.Exception

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java
index a8aa89ab8e66d03dddfd25d0de5e27dc2dc6b770..ad57fc7539b6a614a0a48a7cf06132825cf606e1 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.eclipse.core.commands.ExecutionException;
 import org.junit.Assert;
 import org.junit.BeforeClass;


@@ -23,10 +22,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @created 07.04.2009
  * @version 1.0
  */
  * @created 07.04.2009
  * @version 1.0
  */

-public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOperationTest {
-       private static final Logger logger = Logger
-                       .getLogger(CreateSynonymInNewGroupOperationTest.class);
-       
+public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOperationTest {     

        
        private static String newSynonymText;
        
        
        private static String newSynonymText;
        

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java
index a2547e8f43ee4a46ac91b38e71005c76f8734f4c..4425760745a9b6faf3eaaded7fd90c0f07868480 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java
@@ -10,13 +10,8 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.*;
-

 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;

 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java
index d4be1f134c07edb656b1b60afc61d2aff07172be..b0dd0fafd1e2c45281c35486efb8d4ba214bf951 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java
@@ -10,13 +10,7 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.*;
-
-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;

 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;


@@ -32,8 +26,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0
  */
 public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOperationTest {
  * @version 1.0
  */
 public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOperationTest {

-       private static final Logger logger = Logger
-                       .getLogger(DeleteDescriptionElementOperationTest.class);

 
        private static DescriptionElementBase descriptionElement;
 
 
        private static DescriptionElementBase descriptionElement;
 

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java
index 56f66fc89b050c1befedbf7d133f59a8020b42da..a03ff514a057211d70565a2d1f3f5fa64437bbb2 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java
@@ -10,13 +10,8 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.fail;
-

 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;

 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java
index 5d2e83cc0b27b6b7413961aa3eacad93126e19fb..3409912bb81734d93cfc997c1cb98c36dc8ceb2f 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java
@@ -10,18 +10,11 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import static org.junit.Assert.*;
-
-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;

 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

-import eu.etaxonomy.cdm.model.common.CdmBase;

 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 /**
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 /**


@@ -30,8 +23,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @version 1.0
  */
 public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTest {
  * @version 1.0
  */
 public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTest {

-       private static final Logger logger = Logger
-                       .getLogger(MoveTaxonOperationTest.class);

 
        private static Taxon oldParentTaxon;
        private static Taxon newParentTaxon;
 
        private static Taxon oldParentTaxon;
        private static Taxon newParentTaxon;

diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java
index fd25fdd8c53d3c8b2f927d8070c77c7923970178..3c876a4fbf47f2c0eb4292a9c1db7b153a5bd498 100644 (file)
--- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java
+++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java
@@ -9,8 +9,6 @@
 
 package eu.etaxonomy.taxeditor.store.operations;
 
 
 package eu.etaxonomy.taxeditor.store.operations;
 

-import java.util.Set;
-

 import junit.framework.Assert;
 
 import org.apache.log4j.Logger;
 import junit.framework.Assert;
 
 import org.apache.log4j.Logger;


@@ -60,9 +58,9 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
 
        private static TaxonDescription description;
 
 
        private static TaxonDescription description;
 

-       private static NonViralName oldSynonymName;
+       private static NonViralName<?> oldSynonymName;

 
 

-       private static NonViralName oldTaxonName;
+       private static NonViralName<?> oldTaxonName;

 
        
        /**
 
        
        /**

diff --git a/taxeditor-updateSite/artifacts.xml b/taxeditor-updateSite/artifacts.xml
index e8500a3180a86cbd5c286cfafbc91715565c2881..7a778d1f7ccd7177ee15cd823f97d36311e93223 100644 (file)
--- a/taxeditor-updateSite/artifacts.xml
+++ b/taxeditor-updateSite/artifacts.xml
@@ -3,14 +3,14 @@
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>

-    <property name='p2.timestamp' value='1243613873017'/>
+    <property name='p2.timestamp' value='1243952831395'/>

   </properties>
   <mappings size='3'>
     <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
   </properties>
   <mappings size='3'>
     <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>

-  <artifacts size='61'>
+  <artifacts size='74'>

     <artifact classifier='osgi.bundle' id='org.eclipse.osgi.services' version='3.1.200.v20071203'>
       <properties size='3'>
         <property name='artifact.size' value='63665'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.osgi.services' version='3.1.200.v20071203'>
       <properties size='3'>
         <property name='artifact.size' value='63665'/>


@@ -25,6 +25,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'>
+      <properties size='2'>
+        <property name='artifact.size' value='845'/>
+        <property name='download.size' value='845'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.ant.core' version='3.2.0.v20080529'>
       <properties size='3'>
         <property name='artifact.size' value='95496'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.ant.core' version='3.2.0.v20080529'>
       <properties size='3'>
         <property name='artifact.size' value='95496'/>


@@ -115,6 +121,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'>
+      <properties size='2'>
+        <property name='artifact.size' value='1646'/>
+        <property name='download.size' value='1646'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.ui.ide' version='3.4.2.M20090127-1700'>
       <properties size='3'>
         <property name='artifact.size' value='2035254'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.ide' version='3.4.2.M20090127-1700'>
       <properties size='3'>
         <property name='artifact.size' value='2035254'/>


@@ -150,6 +162,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'>
+      <properties size='2'>
+        <property name='artifact.size' value='846'/>
+        <property name='download.size' value='846'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.swt' version='3.4.2.v3452b'>
       <properties size='3'>
         <property name='artifact.size' value='15811'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.swt' version='3.4.2.v3452b'>
       <properties size='3'>
         <property name='artifact.size' value='15811'/>


@@ -157,10 +175,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

-    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime.compatibility.auth' version='3.2.100.v20070502'>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'>

       <properties size='3'>
       <properties size='3'>

-        <property name='artifact.size' value='21215'/>
-        <property name='download.size' value='21215'/>
+        <property name='artifact.size' value='771377'/>
+        <property name='download.size' value='771377'/>

         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>


@@ -171,6 +189,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime.compatibility.auth' version='3.2.100.v20070502'>
+      <properties size='3'>
+        <property name='artifact.size' value='21215'/>
+        <property name='download.size' value='21215'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.ui.carbon' version='4.0.0.I20080610-1200'>
       <properties size='3'>
         <property name='artifact.size' value='15178'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.carbon' version='4.0.0.I20080610-1200'>
       <properties size='3'>
         <property name='artifact.size' value='15178'/>


@@ -192,6 +217,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'>
+      <properties size='3'>
+        <property name='artifact.size' value='49502'/>
+        <property name='download.size' value='49502'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.ui.forms' version='3.3.103.v20081027_34x'>
       <properties size='3'>
         <property name='artifact.size' value='298080'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.forms' version='3.3.103.v20081027_34x'>
       <properties size='3'>
         <property name='artifact.size' value='298080'/>


@@ -199,6 +231,26 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'>
+      <properties size='3'>
+        <property name='artifact.size' value='771371'/>
+        <property name='download.size' value='771371'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'>
+      <properties size='3'>
+        <property name='artifact.size' value='262820'/>
+        <property name='download.size' value='262820'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'>
+      <properties size='2'>
+        <property name='artifact.size' value='1642'/>
+        <property name='download.size' value='1642'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.ui.navigator.resources' version='3.3.101.M20080910-0800'>
       <properties size='3'>
         <property name='artifact.size' value='115744'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.ui.navigator.resources' version='3.3.101.M20080910-0800'>
       <properties size='3'>
         <property name='artifact.size' value='115744'/>


@@ -213,12 +265,26 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'>
+      <properties size='3'>
+        <property name='artifact.size' value='49495'/>
+        <property name='download.size' value='49495'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

     <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='1.1.0'>
       <properties size='2'>
         <property name='artifact.size' value='775'/>
         <property name='download.size' value='775'/>
       </properties>
     </artifact>
     <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='1.1.0'>
       <properties size='2'>
         <property name='artifact.size' value='775'/>
         <property name='download.size' value='775'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'>
+      <properties size='3'>
+        <property name='artifact.size' value='251026'/>
+        <property name='download.size' value='251026'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='1.0.0'>
       <properties size='3'>
         <property name='artifact.size' value='44075'/>
     <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='1.0.0'>
       <properties size='3'>
         <property name='artifact.size' value='44075'/>


@@ -295,17 +361,17 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

-    <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'>

       <properties size='3'>
       <properties size='3'>

-        <property name='artifact.size' value='347799'/>
-        <property name='download.size' value='347799'/>
+        <property name='artifact.size' value='69019'/>
+        <property name='download.size' value='69019'/>

         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

-    <artifact classifier='osgi.bundle' id='org.eclipse.core.runtime' version='3.4.0.v20080512'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.core.databinding' version='1.1.1.M20080827-0800b'>

       <properties size='3'>
       <properties size='3'>

-        <property name='artifact.size' value='69019'/>
-        <property name='download.size' value='69019'/>
+        <property name='artifact.size' value='347799'/>
+        <property name='download.size' value='347799'/>

         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>


@@ -316,6 +382,13 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='org.eclipse.pde.source' version='3.4.0.v20080603'>
+      <properties size='3'>
+        <property name='artifact.size' value='13865'/>
+        <property name='download.size' value='13865'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'>
       <properties size='3'>
         <property name='artifact.size' value='49293516'/>
     <artifact classifier='osgi.bundle' id='eu.etaxonomy.cdmLibrary' version='2.1.0.84'>
       <properties size='3'>
         <property name='artifact.size' value='49293516'/>


@@ -323,10 +396,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

-    <artifact classifier='osgi.bundle' id='org.eclipse.pde.source' version='3.4.0.v20080603'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.jface.databinding' version='1.2.1.M20080827-0800a'>

       <properties size='3'>
       <properties size='3'>

-        <property name='artifact.size' value='13865'/>
-        <property name='download.size' value='13865'/>
+        <property name='artifact.size' value='196505'/>
+        <property name='download.size' value='196505'/>

         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>


@@ -337,10 +410,10 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

-    <artifact classifier='osgi.bundle' id='org.eclipse.jface.databinding' version='1.2.1.M20080827-0800a'>
+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'>

       <properties size='3'>
       <properties size='3'>

-        <property name='artifact.size' value='196505'/>
-        <property name='download.size' value='196505'/>
+        <property name='artifact.size' value='251023'/>
+        <property name='download.size' value='251023'/>

         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>


@@ -372,6 +445,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.090602'>
+      <properties size='2'>
+        <property name='artifact.size' value='841'/>
+        <property name='download.size' value='841'/>
+      </properties>
+    </artifact>

     <artifact classifier='osgi.bundle' id='org.eclipse.core.filesystem.macosx' version='1.0.0.v20080604-1400'>
       <properties size='3'>
         <property name='artifact.size' value='9594'/>
     <artifact classifier='osgi.bundle' id='org.eclipse.core.filesystem.macosx' version='1.0.0.v20080604-1400'>
       <properties size='3'>
         <property name='artifact.size' value='9594'/>


@@ -434,5 +513,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

+    <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'>
+      <properties size='3'>
+        <property name='artifact.size' value='262815'/>
+        <property name='download.size' value='262815'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>

   </artifacts>
 </repository>
   </artifacts>
 </repository>

diff --git a/taxeditor-updateSite/content.xml b/taxeditor-updateSite/content.xml
index 00d56ff4694511b79dd6d322d0a4d8cbb7e9c29b..4383957b7f36b4f9b12ee4ed3ea393060a1dce45 100644 (file)
--- a/taxeditor-updateSite/content.xml
+++ b/taxeditor-updateSite/content.xml
@@ -3,13 +3,13 @@
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
 <repository name='file:/Users/nho/Documents/workspace/taxeditor/taxeditor-updateSite/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>

-    <property name='p2.timestamp' value='1243613873023'/>
+    <property name='p2.timestamp' value='1243952831402'/>

   </properties>
   <references size='2'>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='1' options='0'/>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='0' options='0'/>
   </references>
   </properties>
   <references size='2'>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='1' options='0'/>
     <repository url='http://wp5.e-taxonomy.eu/taxeditor/update' type='0' options='0'/>
   </references>

-  <units size='75'>
+  <units size='94'>

     <unit id='eu.etaxonomy.taxeditor.feature.group' version='1.1.0' singleton='false'>
       <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,1.1.0)' severity='0'/>
       <properties size='5'>
     <unit id='eu.etaxonomy.taxeditor.feature.group' version='1.1.0' singleton='false'>
       <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,1.1.0)' severity='0'/>
       <properties size='5'>


@@ -861,7 +861,7 @@
       <update id='org.eclipse.ui.navigator.resources' range='[0.0.0,3.3.101.M20080910-0800)' severity='0'/>
       <properties size='4'>
         <property name='df_LT.Plugin.name' value='Navigator Workbench Components'/>
       <update id='org.eclipse.ui.navigator.resources' range='[0.0.0,3.3.101.M20080910-0800)' severity='0'/>
       <properties size='4'>
         <property name='df_LT.Plugin.name' value='Navigator Workbench Components'/>

-        <property name='df_LT.Plugin.providerName' value='Eclipse.org '/>
+        <property name='df_LT.Plugin.providerName' value='Eclipse.org'/>

         <property name='org.eclipse.equinox.p2.name' value='%Plugin.name'/>
         <property name='org.eclipse.equinox.p2.provider' value='%Plugin.providerName'/>
       </properties>
         <property name='org.eclipse.equinox.p2.name' value='%Plugin.name'/>
         <property name='org.eclipse.equinox.p2.provider' value='%Plugin.providerName'/>
       </properties>


@@ -893,7 +893,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator.resources.actions;x-internal:=true,org.eclipse.ui.internal.navigator.resources.plugin;x-internal:=true,org.eclipse.ui.internal.navigator.resources.workbench;x-internal:=true,org.eclipse.ui.internal.navigator.workingsets;x-internal:=true,org.eclipse.ui.navigator.resources&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui.ide;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.navigator;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.views.properties.tabbed;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.101.M20080910-0800&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator.resources.actions;x-internal:=true,org.eclipse.ui.internal.navigator.resources.plugin;x-internal:=true,org.eclipse.ui.internal.navigator.resources.workbench;x-internal:=true,org.eclipse.ui.internal.navigator.workingsets;x-internal:=true,org.eclipse.ui.navigator.resources&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui.ide;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.navigator;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.views.properties.tabbed;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.101.M20080910-0800&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -923,7 +923,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Eclipse-PatchFragment: true&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.equinox.registry;bundle-version=&quot;[3.3.0,3.5.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.registry&#xA;Bundle-Version: 3.2.200.v20080610&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Eclipse-PatchFragment: true&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.equinox.registry;bundle-version=&quot;[3.3.0,3.5.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.registry&#xA;Bundle-Version: 3.2.200.v20080610

           </instruction>
           <instruction key='zipped'>
             true
           </instruction>
           <instruction key='zipped'>
             true


@@ -1041,7 +1041,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: compatibility.jar,.&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.databinding;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Export-Package: org.eclipse.ui;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.about,org.eclipse.ui.actions;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.activities,org.eclipse.ui.application,org.eclipse.ui.branding,org.eclipse.ui.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.commands,org.eclipse.ui.contexts,org.eclipse.ui.dialogs;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.dnd,org.eclipse.ui.fieldassist,org.eclipse.ui.handlers,org.eclipse.ui.help,org.eclipse.ui.internal;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;; x-friends:=&quot;org.eclipse.ui,  org.eclipse.ui.intro,  org.eclipse.ui.ide,  org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.about;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.actions;x-internal:=true,org.eclipse.ui.internal.activities;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.activities.ws;x-internal:=true,org.eclipse.ui.internal.application;x-internal:=true,org.eclipse.ui.internal.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-internal:=true,org.eclipse.ui.internal.commands;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.contexts;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.decorators;x-friends:=&quot;org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.dialogs;x-internal:=true,org.eclipse.ui.internal.dnd;x-friends:=&quot;org.eclipse.ui.intro,org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.editorsupport;x-internal:=true,org.eclipse.ui.internal.expressions;x-internal:=true,org.eclipse.ui.internal.handlers;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.help;x-internal:=true,org.eclipse.ui.internal.intro;x-internal:=true,org.eclipse.ui.internal.keys;x-internal:=true,org.eclipse.ui.internal.keys.model;x-internal:=true,org.eclipse.ui.internal.layout;x-friends:=&quot;org.eclipse.ui.presentations.r21,org.eclipse.ui.intro&quot;,org.eclipse.ui.internal.menus;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.misc;x-internal:=true,org.eclipse.ui.internal.model;x-internal:=true,org.eclipse.ui.internal.operations;x-internal:=true,org.eclipse.ui.internal.part;x-internal:=true,org.eclipse.ui.internal.preferences;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.presentations.classic;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations.defaultpresentation;x-internal:=true,org.eclipse.ui.internal.presentations.util;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.progress;x-internal:=true,org.eclipse.ui.internal.provisional.application;x-internal:=true,org.eclipse.ui.internal.provisional.presentations;x-internal:=true,org.eclipse.ui.internal.quickaccess;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.registry;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.services;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.splash;x-internal:=true,org.eclipse.ui.internal.statushandlers;x-internal:=true,org.eclipse.ui.internal.testing;x-internal:=true,org.eclipse.ui.internal.themes;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.tweaklets;x-internal:=true,org.eclipse.ui.internal.util;x-friends:=&quot;org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.wizards;x-internal:=true,org.eclipse.ui.internal.wizards.preferences;x-internal:=true,org.eclipse.ui.intro,org.eclipse.ui.keys,org.eclipse.ui.menus,org.eclipse.ui.model;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.operations,org.eclipse.ui.part;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.plugin,org.eclipse.ui.preferences,org.eclipse.ui.presentations,org.eclipse.ui.progress,org.eclipse.ui.services,org.eclipse.ui.splash,org.eclipse.ui.statushandlers,org.eclipse.ui.swt,org.eclipse.ui.testing,org.eclipse.ui.themes,org.eclipse.ui.views,org.eclipse.ui.wizards&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: compatibility.jar,.&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.databinding;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Export-Package: org.eclipse.ui;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.about,org.eclipse.ui.actions;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.activities,org.eclipse.ui.application,org.eclipse.ui.branding,org.eclipse.ui.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.commands,org.eclipse.ui.contexts,org.eclipse.ui.dialogs;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.dnd,org.eclipse.ui.fieldassist,org.eclipse.ui.handlers,org.eclipse.ui.help,org.eclipse.ui.internal;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;; x-friends:=&quot;org.eclipse.ui,  org.eclipse.ui.intro,  org.eclipse.ui.ide,  org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.about;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.actions;x-internal:=true,org.eclipse.ui.internal.activities;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.activities.ws;x-internal:=true,org.eclipse.ui.internal.application;x-internal:=true,org.eclipse.ui.internal.browser;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-internal:=true,org.eclipse.ui.internal.commands;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.contexts;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.decorators;x-friends:=&quot;org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.dialogs;x-internal:=true,org.eclipse.ui.internal.dnd;x-friends:=&quot;org.eclipse.ui.intro,org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.editorsupport;x-internal:=true,org.eclipse.ui.internal.expressions;x-internal:=true,org.eclipse.ui.internal.handlers;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.help;x-internal:=true,org.eclipse.ui.internal.intro;x-internal:=true,org.eclipse.ui.internal.keys;x-internal:=true,org.eclipse.ui.internal.keys.model;x-internal:=true,org.eclipse.ui.internal.layout;x-friends:=&quot;org.eclipse.ui.presentations.r21,org.eclipse.ui.intro&quot;,org.eclipse.ui.internal.menus;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.misc;x-internal:=true,org.eclipse.ui.internal.model;x-internal:=true,org.eclipse.ui.internal.operations;x-internal:=true,org.eclipse.ui.internal.part;x-internal:=true,org.eclipse.ui.internal.preferences;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.presentations.classic;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.presentations.defaultpresentation;x-internal:=true,org.eclipse.ui.internal.presentations.util;x-friends:=&quot;org.eclipse.ui.presentations.r21&quot;,org.eclipse.ui.internal.progress;x-internal:=true,org.eclipse.ui.internal.provisional.application;x-internal:=true,org.eclipse.ui.internal.provisional.presentations;x-internal:=true,org.eclipse.ui.internal.quickaccess;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.registry;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.services;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.splash;x-internal:=true,org.eclipse.ui.internal.statushandlers;x-internal:=true,org.eclipse.ui.internal.testing;x-internal:=true,org.eclipse.ui.internal.themes;x-friends:=&quot;org.eclipse.ui&quot;,org.eclipse.ui.internal.tweaklets;x-internal:=true,org.eclipse.ui.internal.util;x-friends:=&quot;org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide&quot;,org.eclipse.ui.internal.wizards;x-internal:=true,org.eclipse.ui.internal.wizards.preferences;x-internal:=true,org.eclipse.ui.intro,org.eclipse.ui.keys,org.eclipse.ui.menus,org.eclipse.ui.model;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.operations,org.eclipse.ui.part;ui.workbench=split;mandatory:=&quot;ui.workbench&quot;,org.eclipse.ui.plugin,org.eclipse.ui.preferences,org.eclipse.ui.presentations,org.eclipse.ui.progress,org.eclipse.ui.services,org.eclipse.ui.splash,org.eclipse.ui.statushandlers,org.eclipse.ui.swt,org.eclipse.ui.testing,org.eclipse.ui.themes,org.eclipse.ui.views,org.eclipse.ui.wizards&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1082,7 +1082,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.content.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.eclipse.osgi.service.debug,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.0.v20080604-1400&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.content;x-internal:=true,org.eclipse.core.runtime.content&#xA;Require-Bundle: org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.content.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.contenttype; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.eclipse.osgi.service.debug,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.0.v20080604-1400&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.content;x-internal:=true,org.eclipse.core.runtime.content&#xA;Require-Bundle: org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1130,7 +1130,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.commands&#xA;Bundle-Version: 3.4.0.I20080509-2000&#xA;Export-Package: org.eclipse.core.commands,org.eclipse.core.commands.common,org.eclipse.core.commands.contexts,org.eclipse.core.commands.operations,org.eclipse.core.commands.util,org.eclipse.core.internal.commands.operations;x-internal:=true,org.eclipse.core.internal.commands.util;x-internal:=true&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.commands&#xA;Bundle-Version: 3.4.0.I20080509-2000&#xA;Export-Package: org.eclipse.core.commands,org.eclipse.core.commands.common,org.eclipse.core.commands.contexts,org.eclipse.core.commands.operations,org.eclipse.core.commands.util,org.eclipse.core.internal.commands.operations;x-internal:=true,org.eclipse.core.internal.commands.util;x-internal:=true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1170,7 +1170,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;DynamicImport-Package: org.eclipse.core.internal.runtime.auth&#xA;Bundle-Version: 3.4.0.v20080512&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,org.eclipse.core.internal.runtime;x-friends:=&quot;org.eclipse.core.runtime.compatibility&quot;,org.eclipse.core.runtime;version=&quot;3.4.0&quot;&#xA;Require-Bundle: org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.jobs;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.contenttype;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime.compatibility.auth;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.equinox.app;bundle-version=&quot;[1.0.0,2.0.0)&quot;;visibility:=reexport&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;DynamicImport-Package: org.eclipse.core.internal.runtime.auth&#xA;Bundle-Version: 3.4.0.v20080512&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,org.eclipse.core.internal.runtime;x-friends:=&quot;org.eclipse.core.runtime.compatibility&quot;,org.eclipse.core.runtime;version=&quot;3.4.0&quot;&#xA;Require-Bundle: org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.jobs;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.preferences;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.contenttype;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime.compatibility.auth;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.equinox.app;bundle-version=&quot;[1.0.0,2.0.0)&quot;;visibility:=reexport

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1221,7 +1221,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.core.UpdateCore&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.core; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.202.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configuration,org.eclipse.update.core,org.eclipse.update.core.model,org.eclipse.update.internal.core;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler,org.eclipse.pde.build&quot;,org.eclipse.update.internal.core.connection;x-internal:=true,org.eclipse.update.internal.jarprocessor;x-friends:=&quot;org.eclipse.pde.build&quot;,org.eclipse.update.internal.mirror;x-internal:=true,org.eclipse.update.internal.model;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.operations;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.provisional;x-internal:=true,org.eclipse.update.internal.search;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.security;x-internal:=true,org.eclipse.update.internal.verifier;x-internal:=true,org.eclipse.update.operations,org.eclipse.update.search,org.eclipse.update.standalone&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.net;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.core.UpdateCore&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.core; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.202.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configuration,org.eclipse.update.core,org.eclipse.update.core.model,org.eclipse.update.internal.core;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler,org.eclipse.pde.build&quot;,org.eclipse.update.internal.core.connection;x-internal:=true,org.eclipse.update.internal.jarprocessor;x-friends:=&quot;org.eclipse.pde.build&quot;,org.eclipse.update.internal.mirror;x-internal:=true,org.eclipse.update.internal.model;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.operations;x-friends:=&quot;org.eclipse.update.ui,org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.provisional;x-internal:=true,org.eclipse.update.internal.search;x-friends:=&quot;org.eclipse.update.ui&quot;,org.eclipse.update.internal.security;x-internal:=true,org.eclipse.update.internal.verifier;x-internal:=true,org.eclipse.update.operations,org.eclipse.update.search,org.eclipse.update.standalone&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.net;bundle-version=&quot;[1.0.0,2.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1264,7 +1264,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.editors.text,org.eclipse.ui.editors.text.templates,org.eclipse.ui.internal.editors.quickdiff;x-internal:=true,org.eclipse.ui.internal.editors.text;x-internal:=true,org.eclipse.ui.internal.texteditor;x-internal:=true,org.eclipse.ui.texteditor&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.ide;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filebuffers;visibility:=reexport;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.editors.text,org.eclipse.ui.editors.text.templates,org.eclipse.ui.internal.editors.quickdiff;x-internal:=true,org.eclipse.ui.internal.editors.text;x-internal:=true,org.eclipse.ui.internal.texteditor;x-internal:=true,org.eclipse.ui.texteditor&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.ide;bundle-version=&quot;[3.3.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.workbench.texteditor;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filebuffers;visibility:=reexport;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1297,7 +1297,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080604-1400&#xA;Fragment-Host: org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86) (osgi.arch=ppc)))&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem.macosx; singleton:=true&#xA;Bundle-Localization: fragment&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080604-1400&#xA;Fragment-Host: org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86) (osgi.arch=ppc)))&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem.macosx; singleton:=true&#xA;Bundle-Localization: fragment&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1343,7 +1343,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %help_plugin_name&#xA;Bundle-Version: 3.3.102.v20081014_34x&#xA;Eclipse-LazyStart: true&#xA;Import-Package: javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-Activator: org.eclipse.help.internal.HelpPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport&#xA;Export-Package: org.eclipse.help,org.eclipse.help.internal; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ui.intro,  org.eclipse.ua.tests,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.context; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ua.tests,  org.eclipse.help.webapp&quot;,org.eclipse.help.internal.dynamic; x-friends:=&quot;org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base,  org.eclipse.ui.intro,  org.eclipse.help.webapp,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.entityresolver; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ui.cheatsheets,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.extension;x-friends:=&quot;org.eclipse.help.webapp,org.eclipse.help.base,org.eclipse.ua.tests&quot;,org.eclipse.help.internal.index; x-friends:=&quot;org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base&quot;,org.eclipse.help.internal.toc; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.util; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.ui.intro.universal&quot;&#xA;Bundle-SymbolicName: org.eclipse.help; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %help_plugin_name&#xA;Bundle-Version: 3.3.102.v20081014_34x&#xA;Eclipse-LazyStart: true&#xA;Import-Package: javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-Activator: org.eclipse.help.internal.HelpPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport&#xA;Export-Package: org.eclipse.help,org.eclipse.help.internal; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ui.intro,  org.eclipse.ua.tests,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.context; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ua.tests,  org.eclipse.help.webapp&quot;,org.eclipse.help.internal.dynamic; x-friends:=&quot;org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base,  org.eclipse.ui.intro,  org.eclipse.help.webapp,  org.eclipse.ui.cheatsheets&quot;,org.eclipse.help.internal.entityresolver; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.ui.cheatsheets,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.extension;x-friends:=&quot;org.eclipse.help.webapp,org.eclipse.help.base,org.eclipse.ua.tests&quot;,org.eclipse.help.internal.index; x-friends:=&quot;org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.help.ui,  org.eclipse.help.base&quot;,org.eclipse.help.internal.toc; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests&quot;,org.eclipse.help.internal.util; x-friends:=&quot;org.eclipse.help.base,  org.eclipse.help.ui,  org.eclipse.help.webapp,  org.eclipse.ua.tests,  org.eclipse.ui.intro.universal&quot;&#xA;Bundle-SymbolicName: org.eclipse.help; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1405,7 +1405,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090107-0800&#xA;Import-Package: javax.xml.parsers,org.osgi.framework,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.jface.internal.JFaceActivator&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.commands;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.jface,org.eclipse.jface.action,org.eclipse.jface.action.images,org.eclipse.jface.bindings,org.eclipse.jface.bindings.keys,org.eclipse.jface.bindings.keys.formatting,org.eclipse.jface.commands,org.eclipse.jface.contexts,org.eclipse.jface.dialogs,org.eclipse.jface.dialogs.images,org.eclipse.jface.fieldassist,org.eclipse.jface.fieldassist.images,org.eclipse.jface.images,org.eclipse.jface.internal;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.internal.provisional.action;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.layout,org.eclipse.jface.menus,org.eclipse.jface.operation,org.eclipse.jface.preference,org.eclipse.jface.preference.images,org.eclipse.jface.resource,org.eclipse.jface.util,org.eclipse.jface.viewers,org.eclipse.jface.viewers.deferred,org.eclipse.jface.window,org.eclipse.jface.wizard,org.eclipse.jface.wizard.images&#xA;Bundle-SymbolicName: org.eclipse.jface&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090107-0800&#xA;Import-Package: javax.xml.parsers,org.osgi.framework,org.w3c.dom,org.xml.sax&#xA;Bundle-Activator: org.eclipse.jface.internal.JFaceActivator&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.commands;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.jface,org.eclipse.jface.action,org.eclipse.jface.action.images,org.eclipse.jface.bindings,org.eclipse.jface.bindings.keys,org.eclipse.jface.bindings.keys.formatting,org.eclipse.jface.commands,org.eclipse.jface.contexts,org.eclipse.jface.dialogs,org.eclipse.jface.dialogs.images,org.eclipse.jface.fieldassist,org.eclipse.jface.fieldassist.images,org.eclipse.jface.images,org.eclipse.jface.internal;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.internal.provisional.action;x-friends:=&quot;org.eclipse.ui.workbench&quot;,org.eclipse.jface.layout,org.eclipse.jface.menus,org.eclipse.jface.operation,org.eclipse.jface.preference,org.eclipse.jface.preference.images,org.eclipse.jface.resource,org.eclipse.jface.util,org.eclipse.jface.viewers,org.eclipse.jface.viewers.deferred,org.eclipse.jface.window,org.eclipse.jface.wizard,org.eclipse.jface.wizard.images&#xA;Bundle-SymbolicName: org.eclipse.jface&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1446,7 +1446,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.actions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.dnd;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.extensions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.filters;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources,org.eclipse.ui.tests.navigator&quot;,org.eclipse.ui.internal.navigator.sorters;x-internal:=true,org.eclipse.ui.internal.navigator.wizards;x-internal:=true,org.eclipse.ui.navigator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.102.M20090127-1700&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ui.internal.navigator;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.actions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.dnd;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.extensions;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources&quot;,org.eclipse.ui.internal.navigator.filters;x-friends:=&quot;org.eclipse.ui.navigator.ide,org.eclipse.ui.navigator.resources,org.eclipse.ui.tests.navigator&quot;,org.eclipse.ui.internal.navigator.sorters;x-internal:=true,org.eclipse.ui.internal.navigator.wizards;x-internal:=true,org.eclipse.ui.navigator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.workbench;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.1,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ui.internal.navigator.NavigatorPlugin&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Version: 3.3.102.M20090127-1700&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-SymbolicName: org.eclipse.ui.navigator; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1482,7 +1482,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.provisional.configurator;x-friends:=&quot;org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.ui&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 1.0.0.v20080604&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.console;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.datalocation;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.resolver;version=&quot;1.2.0&quot;;resolution:=optional,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2.0&quot;,org.osgi.service.startlevel;version=&quot;1.0.0&quot;,org.osgi.util.tracker;version=&quot;1.3.0&quot;&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.provisional.configurator;x-friends:=&quot;org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.ui&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 1.0.0.v20080604&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator;singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.console;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.datalocation;version=&quot;1.0.0&quot;;resolution:=optional,org.eclipse.osgi.service.resolver;version=&quot;1.2.0&quot;;resolution:=optional,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2.0&quot;,org.osgi.service.startlevel;version=&quot;1.0.0&quot;,org.osgi.util.tracker;version=&quot;1.3.0&quot;&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1527,7 +1527,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.ui.UpdateUI&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.ui; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.101.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.internal.ui;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.ui.model;x-internal:=true,org.eclipse.update.internal.ui.parts;x-internal:=true,org.eclipse.update.internal.ui.preferences;x-internal:=true,org.eclipse.update.internal.ui.properties;x-internal:=true,org.eclipse.update.internal.ui.security;x-internal:=true,org.eclipse.update.internal.ui.views;x-internal:=true,org.eclipse.update.internal.ui.wizards;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.ui&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.update.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.ui.UpdateUI&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.ui; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.101.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.internal.ui;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.internal.ui.model;x-internal:=true,org.eclipse.update.internal.ui.parts;x-internal:=true,org.eclipse.update.internal.ui.preferences;x-internal:=true,org.eclipse.update.internal.ui.properties;x-internal:=true,org.eclipse.update.internal.ui.security;x-internal:=true,org.eclipse.update.internal.ui.views;x-internal:=true,org.eclipse.update.internal.ui.wizards;x-friends:=&quot;org.eclipse.update.scheduler&quot;,org.eclipse.update.ui&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.update.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.update.configurator;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1558,7 +1558,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Fragment-Host: org.eclipse.core.resources;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.4.0.v20080604-1400&#xA;Export-Package: org.eclipse.core.internal.indexing;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.resources.compatibility&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %compatibilityFragmentName&#xA;Bundle-Vendor: %providerName&#xA;
+            Bundle-ManifestVersion: 2&#xA;Fragment-Host: org.eclipse.core.resources;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.4.0.v20080604-1400&#xA;Export-Package: org.eclipse.core.internal.indexing;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.resources.compatibility&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %compatibilityFragmentName&#xA;Bundle-Vendor: %providerName

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1594,7 +1594,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.3.1.M20081112-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views;x-internal:=true,org.eclipse.ui.internal.views.contentoutline;x-internal:=true,org.eclipse.ui.internal.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;; x-internal:=true,org.eclipse.ui.views.contentoutline,org.eclipse.ui.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.3.1.M20081112-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views;x-internal:=true,org.eclipse.ui.internal.views.contentoutline;x-internal:=true,org.eclipse.ui.internal.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;; x-internal:=true,org.eclipse.ui.views.contentoutline,org.eclipse.ui.views.properties; ui.views=&quot;split&quot;; mandatory:=&quot;ui.views&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1640,7 +1640,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.1.r342_v20081203-0800&#xA;Import-Package: org.w3c.dom&#xA;Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.core.expressions,org.eclipse.core.internal.expressions;x-internal:=true,org.eclipse.core.internal.expressions.propertytester;x-internal:=true,org.eclipse.core.internal.expressions.util;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.1.r342_v20081203-0800&#xA;Import-Package: org.w3c.dom&#xA;Bundle-Activator: org.eclipse.core.internal.expressions.ExpressionPlugin&#xA;Bundle-Vendor: %providerName&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Export-Package: org.eclipse.core.expressions,org.eclipse.core.internal.expressions;x-internal:=true,org.eclipse.core.internal.expressions.propertytester;x-internal:=true,org.eclipse.core.internal.expressions.util;x-internal:=true&#xA;Bundle-SymbolicName: org.eclipse.core.expressions; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1671,7 +1671,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.variables;x-internal:=true,org.eclipse.core.variables&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.variables.VariablesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.100.v20080529-1300&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.variables;x-internal:=true,org.eclipse.core.variables&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.variables.VariablesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.100.v20080529-1300&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1713,7 +1713,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-ActivationPolicy: lazy; exclude:=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;Bundle-Activator: org.eclipse.core.internal.preferences.Activator&#xA;Bundle-Vendor: %providerName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.2.201.R34x_v20080709&#xA;Bundle-Localization: plugin&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Export-Package: org.eclipse.core.internal.preferences;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime&quot;,org.eclipse.core.internal.preferences.exchange;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.preferences;version=&quot;3.2.0&quot;,org.osgi.service.prefs;version=&quot;1.1&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-ActivationPolicy: lazy; exclude:=&quot;org.eclipse.core.internal.preferences.exchange&quot;&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.registry;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;Bundle-Activator: org.eclipse.core.internal.preferences.Activator&#xA;Bundle-Vendor: %providerName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.2.201.R34x_v20080709&#xA;Bundle-Localization: plugin&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Export-Package: org.eclipse.core.internal.preferences;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime&quot;,org.eclipse.core.internal.preferences.exchange;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.preferences;version=&quot;3.2.0&quot;,org.osgi.service.prefs;version=&quot;1.1&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.core.internal.preferences.exchange&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1783,7 +1783,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.jobs.JobActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true&#xA;Import-Package: org.eclipse.osgi.service.debug,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.4.1.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,org.eclipse.core.runtime.jobs&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.jobs.JobActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true&#xA;Import-Package: org.eclipse.osgi.service.debug,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3.0&quot;,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.4.1.R34x_v20081128&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,org.eclipse.core.runtime.jobs&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1817,7 +1817,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.UIPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090204-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.workbench;bundle-version=&quot;[3.4.2,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.expressions;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.UIPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ClassPath: .&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090204-0800&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.workbench;bundle-version=&quot;[3.4.2,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.expressions;bundle-version=&quot;[3.4.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1853,7 +1853,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.osx;x-internal:=true,org.eclipse.equinox.internal.security.osx.nls;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;resolution:=optional&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080602-2000&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security.macosx;singleton:=true&#xA;Fragment-Host: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.osx;x-internal:=true,org.eclipse.equinox.internal.security.osx.nls;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment&#xA;Require-Bundle: org.eclipse.swt;bundle-version=&quot;[3.4.0,4.0.0)&quot;;resolution:=optional&#xA;Eclipse-PlatformFilter: (&amp; (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;Bundle-Name: %fragmentName&#xA;Bundle-Version: 1.0.0.v20080602-2000&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security.macosx;singleton:=true&#xA;Fragment-Host: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1889,7 +1889,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.swt; bundle-version=&quot;[3.0.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.swt.carbon.macosx; singleton:=true&#xA;Bundle-Version: 3.4.1.v3452b&#xA;Export-Package: org.eclipse.swt.internal.carbon; x-internal:=true,org.eclipse.swt.internal.cocoa; x-internal:=true,org.eclipse.swt.internal.opengl.carbon; x-internal:=true&#xA;Eclipse-PlatformFilter: (&amp; (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: fragment&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.swt; bundle-version=&quot;[3.0.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.swt.carbon.macosx; singleton:=true&#xA;Bundle-Version: 3.4.1.v3452b&#xA;Export-Package: org.eclipse.swt.internal.carbon; x-internal:=true,org.eclipse.swt.internal.cocoa; x-internal:=true,org.eclipse.swt.internal.opengl.carbon; x-internal:=true&#xA;Eclipse-PlatformFilter: (&amp; (osgi.ws=carbon) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1934,7 +1934,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Eclipse-ExtensibleAPI: true&#xA;Manifest-Version: 1.0&#xA;DynamicImport-Package: org.mozilla.xpcom&#xA;Bundle-SymbolicName: org.eclipse.swt; singleton:=true&#xA;Bundle-Version: 3.4.2.v3452b&#xA;Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal; x-internal:=true,org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Eclipse-ExtensibleAPI: true&#xA;Manifest-Version: 1.0&#xA;DynamicImport-Package: org.mozilla.xpcom&#xA;Bundle-SymbolicName: org.eclipse.swt; singleton:=true&#xA;Bundle-Version: 3.4.2.v3452b&#xA;Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal; x-internal:=true,org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -1971,7 +1971,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views.properties.tabbed;singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views.properties.tabbed;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.view;x-friends:=&quot;org.eclipse.ui.tests.views.properties.tabbed&quot;,org.eclipse.ui.views.properties.tabbed&#xA;Require-Bundle: org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %Plugin.name&#xA;Bundle-Activator: org.eclipse.ui.internal.views.properties.tabbed.TabbedPropertyViewPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.views.properties.tabbed;singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.internal.views.properties.tabbed;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.l10n;x-internal:=true,org.eclipse.ui.internal.views.properties.tabbed.view;x-friends:=&quot;org.eclipse.ui.tests.views.properties.tabbed&quot;,org.eclipse.ui.views.properties.tabbed&#xA;Require-Bundle: org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.ui;bundle-version=&quot;[3.3.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2008,7 +2008,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.201.R34x_v20080819&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configurator,org.eclipse.update.internal.configurator;x-friends:=&quot;org.eclipse.update.core&quot;,org.eclipse.update.internal.configurator.branding;x-friends:=&quot;org.eclipse.update.core&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.update.internal.configurator.ConfigurationActivator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.update.configurator; singleton:=true&#xA;Import-Package: javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.201.R34x_v20080819&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.update.configurator,org.eclipse.update.internal.configurator;x-friends:=&quot;org.eclipse.update.core&quot;,org.eclipse.update.internal.configurator.branding;x-friends:=&quot;org.eclipse.update.core&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.osgi;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2085,7 +2085,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %Plugin.name&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.update.configurator;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.core;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.ui;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.jface.text;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;resolution:=optional&#xA;Export-Package: org.eclipse.ui,org.eclipse.ui.actions,org.eclipse.ui.dialogs,org.eclipse.ui.ide,org.eclipse.ui.ide.dialogs,org.eclipse.ui.ide.fileSystem,org.eclipse.ui.ide.undo,org.eclipse.ui.internal.ide;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.actions;x-internal:=true,org.eclipse.ui.internal.ide.commands;x-internal:=true,org.eclipse.ui.internal.ide.dialogs;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.filesystem;x-internal:=true,org.eclipse.ui.internal.ide.handlers;x-internal:=true,org.eclipse.ui.internal.ide.misc;x-internal:=true,org.eclipse.ui.internal.ide.model;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.registry;x-internal:=true,org.eclipse.ui.internal.ide.undo;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.update;x-internal:=true,org.eclipse.ui.internal.views.bookmarkexplorer;x-internal:=true,org.eclipse.ui.internal.views.framelist;x-internal:=true,org.eclipse.ui.internal.views.markers;x-internal:=true,org.eclipse.ui.internal.views.navigator;x-internal:=true,org.eclipse.ui.internal.views.properties;x-internal:=true,org.eclipse.ui.internal.views.tasklist;x-internal:=true,org.eclipse.ui.internal.wizards.datatransfer;x-internal:=true,org.eclipse.ui.internal.wizards.newresource;x-internal:=true,org.eclipse.ui.model,org.eclipse.ui.part,org.eclipse.ui.views.bookmarkexplorer,org.eclipse.ui.views.framelist,org.eclipse.ui.views.markers,org.eclipse.ui.views.markers.internal;x-internal:=true,org.eclipse.ui.views.navigator,org.eclipse.ui.views.properties,org.eclipse.ui.views.tasklist,org.eclipse.ui.wizards.datatransfer,org.eclipse.ui.wizards.newresource&#xA;Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %Plugin.name&#xA;Bundle-ClassPath: .&#xA;Bundle-Version: 3.4.2.M20090127-1700&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin&#xA;Bundle-Vendor: %Plugin.providerName&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.help;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui.views;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.update.configurator;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.core;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.update.ui;bundle-version=&quot;[3.1.100,4.0.0)&quot;;resolution:=optional,org.eclipse.jface.text;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui.forms;bundle-version=&quot;[3.3.0,4.0.0)&quot;;resolution:=optional&#xA;Export-Package: org.eclipse.ui,org.eclipse.ui.actions,org.eclipse.ui.dialogs,org.eclipse.ui.ide,org.eclipse.ui.ide.dialogs,org.eclipse.ui.ide.fileSystem,org.eclipse.ui.ide.undo,org.eclipse.ui.internal.ide;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.actions;x-internal:=true,org.eclipse.ui.internal.ide.commands;x-internal:=true,org.eclipse.ui.internal.ide.dialogs;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.filesystem;x-internal:=true,org.eclipse.ui.internal.ide.handlers;x-internal:=true,org.eclipse.ui.internal.ide.misc;x-internal:=true,org.eclipse.ui.internal.ide.model;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.registry;x-internal:=true,org.eclipse.ui.internal.ide.undo;x-friends:=&quot;org.eclipse.ui.ide.application&quot;,org.eclipse.ui.internal.ide.update;x-internal:=true,org.eclipse.ui.internal.views.bookmarkexplorer;x-internal:=true,org.eclipse.ui.internal.views.framelist;x-internal:=true,org.eclipse.ui.internal.views.markers;x-internal:=true,org.eclipse.ui.internal.views.navigator;x-internal:=true,org.eclipse.ui.internal.views.properties;x-internal:=true,org.eclipse.ui.internal.views.tasklist;x-internal:=true,org.eclipse.ui.internal.wizards.datatransfer;x-internal:=true,org.eclipse.ui.internal.wizards.newresource;x-internal:=true,org.eclipse.ui.model,org.eclipse.ui.part,org.eclipse.ui.views.bookmarkexplorer,org.eclipse.ui.views.framelist,org.eclipse.ui.views.markers,org.eclipse.ui.views.markers.internal;x-internal:=true,org.eclipse.ui.views.navigator,org.eclipse.ui.views.properties,org.eclipse.ui.views.tasklist,org.eclipse.ui.wizards.datatransfer,org.eclipse.ui.wizards.newresource&#xA;Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2132,7 +2132,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Version: 1.1.0.v20080421-2006&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.equinox.app;version=&quot;1.0&quot;,org.eclipse.equinox.internal.app;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.osgi.service.application;version=&quot;1.0&quot;&#xA;Import-Package: org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment; version=&quot;1.1&quot;,org.eclipse.osgi.service.runnable,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3&quot;,org.osgi.service.condpermadmin; resolution:=optional,org.osgi.service.event;version=&quot;1.0.0&quot;;resolution:=optional,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.util.tracker&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.equinox.internal.app.Activator&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true&#xA;Comment-DynamicImport: this is only used to allow late binding of the package&#xA;DynamicImport-Package: org.osgi.service.event;version=&quot;1.0.0&quot;&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2&#xA;
+            Bundle-Version: 1.1.0.v20080421-2006&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.equinox.app;version=&quot;1.0&quot;,org.eclipse.equinox.internal.app;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.osgi.service.application;version=&quot;1.0&quot;&#xA;Import-Package: org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment; version=&quot;1.1&quot;,org.eclipse.osgi.service.runnable,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework;version=&quot;1.3&quot;,org.osgi.service.condpermadmin; resolution:=optional,org.osgi.service.event;version=&quot;1.0.0&quot;;resolution:=optional,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.util.tracker&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.equinox.internal.app.Activator&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.registry;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true&#xA;Comment-DynamicImport: this is only used to allow late binding of the package&#xA;DynamicImport-Package: org.osgi.service.event;version=&quot;1.0.0&quot;&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2176,7 +2176,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.databinding.beans&#xA;Bundle-Version: 1.1.1.M20080827-0800a&#xA;Export-Package: org.eclipse.core.databinding.beans,org.eclipse.core.internal.databinding.beans;x-internal:=true&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-ClassPath: .&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.core.databinding.beans&#xA;Bundle-Version: 1.1.1.M20080827-0800a&#xA;Export-Package: org.eclipse.core.databinding.beans,org.eclipse.core.internal.databinding.beans;x-internal:=true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2214,7 +2214,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.pde.source&#xA;Bundle-Name: %pluginName&#xA;Bundle-Localization: plugin&#xA;Bundle-Vendor: %providerName&#xA;Eclipse-SourceBundle: org.eclipse.pde;version=&quot;3.4.0.v20080603&quot;;roots:=&quot;.&quot;&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.pde.source&#xA;Bundle-Name: %pluginName&#xA;Bundle-Localization: plugin&#xA;Bundle-Vendor: %providerName&#xA;Eclipse-SourceBundle: org.eclipse.pde;version=&quot;3.4.0.v20080603&quot;;roots:=&quot;.&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2248,7 +2248,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment-carbon&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.ui.carbon; singleton:=true&#xA;Bundle-Version: 4.0.0.I20080610-1200&#xA;Export-Package: org.eclipse.ui.internal.carbon;x-internal:=true;uses:=&quot;org.eclipse.ui&quot;&#xA;Eclipse-PlatformFilter: (osgi.ws=carbon)&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: fragment-carbon&#xA;Bundle-Name: %fragmentName&#xA;Manifest-Version: 1.0&#xA;Fragment-Host: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.ui.carbon; singleton:=true&#xA;Bundle-Version: 4.0.0.I20080610-1200&#xA;Export-Package: org.eclipse.ui.internal.carbon;x-internal:=true;uses:=&quot;org.eclipse.ui&quot;&#xA;Eclipse-PlatformFilter: (osgi.ws=carbon)

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2295,7 +2295,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.auth.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.auth&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.100.v20070502&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.runtime.auth;x-friends:=&quot;org.eclipse.core.runtime&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.auth.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.auth&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.util;version=&quot;1.0.0&quot;,org.osgi.framework,org.osgi.util.tracker&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.2.100.v20070502&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.internal.runtime.auth;x-friends:=&quot;org.eclipse.core.runtime&quot;&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2333,7 +2333,7 @@
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='2'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 4.3.1&#xA;Export-Package: junit.extensions;version=&quot;4.3.1&quot;,junit.framework;version=&quot;4.3.1&quot;,junit.runner;version=&quot;4.3.1&quot;,junit.textui;version=&quot;4.3.1&quot;,org.junit;version=&quot;4.3.1&quot;,org.junit.internal;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.requests;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.runners;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.runner;version=&quot;4.3.1&quot;,org.junit.runner.manipulation;version=&quot;4.3.1&quot;,org.junit.runner.notification;version=&quot;4.3.1&quot;,org.junit.runners;version=&quot;4.3.1&quot;&#xA;Bundle-SymbolicName: org.junit4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: junit.jar&#xA;Bundle-Vendor: %providerName&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 4.3.1&#xA;Export-Package: junit.extensions;version=&quot;4.3.1&quot;,junit.framework;version=&quot;4.3.1&quot;,junit.runner;version=&quot;4.3.1&quot;,junit.textui;version=&quot;4.3.1&quot;,org.junit;version=&quot;4.3.1&quot;,org.junit.internal;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.requests;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.internal.runners;version=&quot;4.3.1&quot;;x-internal:=true,org.junit.runner;version=&quot;4.3.1&quot;,org.junit.runner.manipulation;version=&quot;4.3.1&quot;,org.junit.runner.notification;version=&quot;4.3.1&quot;,org.junit.runners;version=&quot;4.3.1&quot;&#xA;Bundle-SymbolicName: org.junit4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: junit.jar&#xA;Bundle-Vendor: %providerName

           </instruction>
           <instruction key='zipped'>
             true
           </instruction>
           <instruction key='zipped'>
             true


@@ -2377,7 +2377,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.0.v20080421-2006&#xA;Eclipse-LazyStart: true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.localization,org.eclipse.osgi.service.urlconversion,org.osgi.service.url,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.Activator&#xA;Bundle-Vendor: %providerName&#xA;Export-Package: org.eclipse.core.internal.boot;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build&quot;,org.eclipse.core.internal.runtime;common=split;mandatory:=common; x-friends:=&quot;org.eclipse.core.contenttype,  org.eclipse.core.jobs,  org.eclipse.equinox.preferences,  org.eclipse.equinox.registry,  org.eclipse.core.runtime,  org.eclipse.core.runtime.compatibility,  org.eclipse.core.filesystem,  org.eclipse.equinox.security&quot;,org.eclipse.core.runtime;common=split;version=&quot;3.4.0&quot;;mandatory:=common&#xA;Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;
+            Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.0.v20080421-2006&#xA;Eclipse-LazyStart: true&#xA;Import-Package: org.eclipse.osgi.framework.log,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.localization,org.eclipse.osgi.service.urlconversion,org.osgi.service.url,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker&#xA;Bundle-Activator: org.eclipse.core.internal.runtime.Activator&#xA;Bundle-Vendor: %providerName&#xA;Export-Package: org.eclipse.core.internal.boot;x-friends:=&quot;org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build&quot;,org.eclipse.core.internal.runtime;common=split;mandatory:=common; x-friends:=&quot;org.eclipse.core.contenttype,  org.eclipse.core.jobs,  org.eclipse.equinox.preferences,  org.eclipse.equinox.registry,  org.eclipse.core.runtime,  org.eclipse.core.runtime.compatibility,  org.eclipse.core.filesystem,  org.eclipse.equinox.security&quot;,org.eclipse.core.runtime;common=split;version=&quot;3.4.0&quot;;mandatory:=common&#xA;Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2417,7 +2417,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.jface.databinding.swt,org.eclipse.jface.databinding.viewers,org.eclipse.jface.databinding.wizard,org.eclipse.jface.internal.databinding.provisional.swt;x-internal:=true,org.eclipse.jface.internal.databinding.provisional.viewers;x-internal:=true,org.eclipse.jface.internal.databinding.swt;x-internal:=true,org.eclipse.jface.internal.databinding.viewers;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.1.M20080827-0800a&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.jface.databinding&#xA;Import-Package: com.ibm.icu.text&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.jface.databinding.swt,org.eclipse.jface.databinding.viewers,org.eclipse.jface.databinding.wizard,org.eclipse.jface.internal.databinding.provisional.swt;x-internal:=true,org.eclipse.jface.internal.databinding.provisional.viewers;x-internal:=true,org.eclipse.jface.internal.databinding.swt;x-internal:=true,org.eclipse.jface.internal.databinding.viewers;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.databinding;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.swt;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.1.M20080827-0800a&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.jface.databinding&#xA;Import-Package: com.ibm.icu.text&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2452,7 +2452,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.net;x-internal:=true,org.eclipse.core.net.proxy&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.preferences;bundle-version=&quot;3.2.200&quot;,org.eclipse.osgi;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.registry;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.net.Activator&#xA;Bundle-Name: %PLUGIN_NAME&#xA;Bundle-Version: 1.1.0.I20080604&#xA;Bundle-Vendor: %PLUGIN_PROVIDER&#xA;Bundle-SymbolicName: org.eclipse.core.net;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.net;x-internal:=true,org.eclipse.core.net.proxy&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.security;bundle-version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.preferences;bundle-version=&quot;3.2.200&quot;,org.eclipse.osgi;bundle-version=&quot;3.4.0&quot;,org.eclipse.equinox.registry;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.net.Activator&#xA;Bundle-Name: %PLUGIN_NAME&#xA;Bundle-Version: 1.1.0.I20080604&#xA;Bundle-Vendor: %PLUGIN_PROVIDER&#xA;Bundle-SymbolicName: org.eclipse.core.net;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2527,7 +2527,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Version: 3.4.3.R34x_v20081215-1030&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Eclipse-ExtensibleAPI: true&#xA;Eclipse-SystemBundle: true&#xA;Export-Package: org.eclipse.osgi.event;version=&quot;1.0&quot;,org.eclipse.osgi.framework.console;version=&quot;1.0&quot;,org.eclipse.osgi.framework.eventmgr;version=&quot;1.1&quot;,org.eclipse.osgi.framework.log;version=&quot;1.0&quot;,org.eclipse.osgi.service.datalocation;version=&quot;1.1&quot;,org.eclipse.osgi.service.debug;version=&quot;1.0&quot;,org.eclipse.osgi.service.environment;version=&quot;1.1&quot;,org.eclipse.osgi.service.localization;version=&quot;1.0&quot;,org.eclipse.osgi.service.pluginconversion;version=&quot;1.0&quot;,org.eclipse.osgi.service.resolver;version=&quot;1.2&quot;,org.eclipse.osgi.service.runnable;version=&quot;1.1&quot;,org.eclipse.osgi.service.security; version=&quot;1.0&quot;,org.eclipse.osgi.service.urlconversion;version=&quot;1.0&quot;,org.eclipse.osgi.signedcontent; version=&quot;1.0&quot;,org.eclipse.osgi.storagemanager;version=&quot;1.0&quot;,org.eclipse.osgi.util;version=&quot;1.1&quot;,org.osgi.framework;version=&quot;1.4&quot;,org.osgi.service.condpermadmin;version=&quot;1.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.service.permissionadmin;version=&quot;1.2&quot;,org.osgi.service.startlevel;version=&quot;1.1&quot;,org.osgi.service.url;version=&quot;1.0&quot;,org.osgi.util.tracker;version=&quot;1.3.3&quot;,org.eclipse.core.runtime.adaptor;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.internal.adaptor;x-internal:=true,org.eclipse.core.runtime.internal.stats;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.osgi.baseadaptor;x-internal:=true,org.eclipse.osgi.baseadaptor.bundlefile;x-internal:=true,org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,org.eclipse.osgi.baseadaptor.loader;x-internal:=true,org.eclipse.osgi.framework.adaptor;x-internal:=true,org.eclipse.osgi.framework.debug;x-internal:=true,org.eclipse.osgi.framework.internal.core;x-internal:=true,org.eclipse.osgi.framework.internal.protocol;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleentry;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleresource;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.reference;x-internal:=true,org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,org.eclipse.osgi.framework.launcher;x-internal:=true,org.eclipse.osgi.framework.util;x-internal:=true,org.eclipse.osgi.internal.baseadaptor;x-internal:=true,org.eclipse.osgi.internal.module;x-internal:=true,org.eclipse.osgi.internal.profile;x-internal:=true,org.eclipse.osgi.internal.resolver;x-internal:=true,org.eclipse.osgi.internal.provisional.service.security; x-friends:=&quot;org.eclipse.equinox.security.ui&quot;;version=&quot;1.0.0&quot;,org.eclipse.osgi.internal.provisional.verifier;x-friends:=&quot;org.eclipse.update.core,org.eclipse.ui.workbench,org.eclipse.equinox.p2.artifact.repository&quot;,org.eclipse.osgi.internal.service.security;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.osgi.internal.signedcontent; x-internal:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5,OSGi/Minimum-1.1&#xA;Bundle-Localization: systembundle&#xA;Bundle-SymbolicName: org.eclipse.osgi; singleton:=true&#xA;Export-Service: org.osgi.service.packageadmin.PackageAdmin,org.osgi.service.permissionadmin.PermissionAdmin,org.osgi.service.startlevel.StartLevel,org.eclipse.osgi.service.debug.DebugOptions&#xA;Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter&#xA;Bundle-Description: %systemBundle&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Name: %systemBundle&#xA;Bundle-ManifestVersion: 2&#xA;
+            Bundle-Version: 3.4.3.R34x_v20081215-1030&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Eclipse-ExtensibleAPI: true&#xA;Eclipse-SystemBundle: true&#xA;Export-Package: org.eclipse.osgi.event;version=&quot;1.0&quot;,org.eclipse.osgi.framework.console;version=&quot;1.0&quot;,org.eclipse.osgi.framework.eventmgr;version=&quot;1.1&quot;,org.eclipse.osgi.framework.log;version=&quot;1.0&quot;,org.eclipse.osgi.service.datalocation;version=&quot;1.1&quot;,org.eclipse.osgi.service.debug;version=&quot;1.0&quot;,org.eclipse.osgi.service.environment;version=&quot;1.1&quot;,org.eclipse.osgi.service.localization;version=&quot;1.0&quot;,org.eclipse.osgi.service.pluginconversion;version=&quot;1.0&quot;,org.eclipse.osgi.service.resolver;version=&quot;1.2&quot;,org.eclipse.osgi.service.runnable;version=&quot;1.1&quot;,org.eclipse.osgi.service.security; version=&quot;1.0&quot;,org.eclipse.osgi.service.urlconversion;version=&quot;1.0&quot;,org.eclipse.osgi.signedcontent; version=&quot;1.0&quot;,org.eclipse.osgi.storagemanager;version=&quot;1.0&quot;,org.eclipse.osgi.util;version=&quot;1.1&quot;,org.osgi.framework;version=&quot;1.4&quot;,org.osgi.service.condpermadmin;version=&quot;1.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2&quot;,org.osgi.service.permissionadmin;version=&quot;1.2&quot;,org.osgi.service.startlevel;version=&quot;1.1&quot;,org.osgi.service.url;version=&quot;1.0&quot;,org.osgi.util.tracker;version=&quot;1.3.3&quot;,org.eclipse.core.runtime.adaptor;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.runtime.internal.adaptor;x-internal:=true,org.eclipse.core.runtime.internal.stats;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.osgi.baseadaptor;x-internal:=true,org.eclipse.osgi.baseadaptor.bundlefile;x-internal:=true,org.eclipse.osgi.baseadaptor.hooks;x-internal:=true,org.eclipse.osgi.baseadaptor.loader;x-internal:=true,org.eclipse.osgi.framework.adaptor;x-internal:=true,org.eclipse.osgi.framework.debug;x-internal:=true,org.eclipse.osgi.framework.internal.core;x-internal:=true,org.eclipse.osgi.framework.internal.protocol;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleentry;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.bundleresource;x-internal:=true,org.eclipse.osgi.framework.internal.protocol.reference;x-internal:=true,org.eclipse.osgi.framework.internal.reliablefile;x-internal:=true,org.eclipse.osgi.framework.launcher;x-internal:=true,org.eclipse.osgi.framework.util;x-internal:=true,org.eclipse.osgi.internal.baseadaptor;x-internal:=true,org.eclipse.osgi.internal.module;x-internal:=true,org.eclipse.osgi.internal.profile;x-internal:=true,org.eclipse.osgi.internal.resolver;x-internal:=true,org.eclipse.osgi.internal.provisional.service.security; x-friends:=&quot;org.eclipse.equinox.security.ui&quot;;version=&quot;1.0.0&quot;,org.eclipse.osgi.internal.provisional.verifier;x-friends:=&quot;org.eclipse.update.core,org.eclipse.ui.workbench,org.eclipse.equinox.p2.artifact.repository&quot;,org.eclipse.osgi.internal.service.security;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.osgi.internal.signedcontent; x-internal:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5,OSGi/Minimum-1.1&#xA;Bundle-Localization: systembundle&#xA;Bundle-SymbolicName: org.eclipse.osgi; singleton:=true&#xA;Export-Service: org.osgi.service.packageadmin.PackageAdmin,org.osgi.service.permissionadmin.PermissionAdmin,org.osgi.service.startlevel.StartLevel,org.eclipse.osgi.service.debug.DebugOptions&#xA;Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter&#xA;Bundle-Description: %systemBundle&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Name: %systemBundle&#xA;Bundle-ManifestVersion: 2

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2568,7 +2568,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %name&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %provider-name&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.forms&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.103.v20081027_34x&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.forms,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.events,org.eclipse.ui.forms.widgets,org.eclipse.ui.internal.forms;x-internal:=true,org.eclipse.ui.internal.forms.widgets;x-friends:=&quot;org.eclipse.ui.tests.forms&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %name&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %provider-name&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.forms&#xA;Import-Package: com.ibm.icu.text,javax.xml.parsers,org.w3c.dom,org.xml.sax&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.3.103.v20081027_34x&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.forms,org.eclipse.ui.forms.editor,org.eclipse.ui.forms.events,org.eclipse.ui.forms.widgets,org.eclipse.ui.internal.forms;x-internal:=true,org.eclipse.ui.internal.forms.widgets;x-friends:=&quot;org.eclipse.ui.tests.forms&quot;&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.jface;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2601,7 +2601,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ant.core,org.eclipse.ant.internal.core;x-friends:=&quot;org.eclipse.ant.ui&quot;,org.eclipse.ant.internal.core.contentDescriber;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ant.core.AntCorePlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.0.v20080529&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.ant.internal.core.contentDescriber&quot;&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.ant.core,org.eclipse.ant.internal.core;x-friends:=&quot;org.eclipse.ant.ui&quot;,org.eclipse.ant.internal.core.contentDescriber;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.core.variables;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.ant.core.AntCorePlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.2.0.v20080529&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.ant.core; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true; exceptions=&quot;org.eclipse.ant.internal.core.contentDescriber&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2640,7 +2640,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text,com.ibm.icu.util&#xA;Require-Bundle: org.eclipse.core.commands;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.text&#xA;Bundle-Version: 3.4.0.v20080605-1800&#xA;Export-Package: org.eclipse.jface.text; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.link; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.projection,org.eclipse.jface.text.source; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.templates; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.text.edits,org.eclipse.text.undo&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text,com.ibm.icu.util&#xA;Require-Bundle: org.eclipse.core.commands;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.equinox.common;bundle-version=&quot;[3.3.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.text&#xA;Bundle-Version: 3.4.0.v20080605-1800&#xA;Export-Package: org.eclipse.jface.text; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.link; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.projection,org.eclipse.jface.text.source; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.jface.text.templates; text=&quot;split&quot;; mandatory:=&quot;text&quot;,org.eclipse.text.edits,org.eclipse.text.undo

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2688,7 +2688,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-Description: %osgiServicesDes&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0&#xA;Bundle-Name: %osgiServices&#xA;Bundle-ContactAddress: www.eclipse.org&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;DynamicImport-Package: javax.servlet,javax.servlet.http&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.1.200.v20071203&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.osgi.service.cm; version=&quot;1.2&quot;,org.osgi.service.component; version=&quot;1.0&quot;,org.osgi.service.device; version=&quot;1.1&quot;,org.osgi.service.event; version=&quot;1.1&quot;,org.osgi.service.http; version=&quot;1.2&quot;,org.osgi.service.io; version=&quot;1.0&quot;,org.osgi.service.log; version=&quot;1.3&quot;,org.osgi.service.metatype; version=&quot;1.1&quot;,org.osgi.service.provisioning; version=&quot;1.1&quot;,org.osgi.service.upnp; version=&quot;1.1&quot;,org.osgi.service.useradmin; version=&quot;1.1&quot;,org.osgi.service.wireadmin; version=&quot;1.0&quot;&#xA;Bundle-SymbolicName: org.eclipse.osgi.services&#xA;Import-Package: org.osgi.framework; version=1.2,javax.servlet; resolution:=&quot;optional&quot;,javax.servlet.http; resolution:=&quot;optional&quot;&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Description: %osgiServicesDes&#xA;Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0&#xA;Bundle-Name: %osgiServices&#xA;Bundle-ContactAddress: www.eclipse.org&#xA;Bundle-Vendor: %eclipse.org&#xA;Bundle-Copyright: %copyright&#xA;Bundle-DocUrl: http://www.eclipse.org&#xA;DynamicImport-Package: javax.servlet,javax.servlet.http&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 3.1.200.v20071203&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.osgi.service.cm; version=&quot;1.2&quot;,org.osgi.service.component; version=&quot;1.0&quot;,org.osgi.service.device; version=&quot;1.1&quot;,org.osgi.service.event; version=&quot;1.1&quot;,org.osgi.service.http; version=&quot;1.2&quot;,org.osgi.service.io; version=&quot;1.0&quot;,org.osgi.service.log; version=&quot;1.3&quot;,org.osgi.service.metatype; version=&quot;1.1&quot;,org.osgi.service.provisioning; version=&quot;1.1&quot;,org.osgi.service.upnp; version=&quot;1.1&quot;,org.osgi.service.useradmin; version=&quot;1.1&quot;,org.osgi.service.wireadmin; version=&quot;1.0&quot;&#xA;Bundle-SymbolicName: org.eclipse.osgi.services&#xA;Import-Package: org.osgi.framework; version=1.2,javax.servlet; resolution:=&quot;optional&quot;,javax.servlet.http; resolution:=&quot;optional&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2746,7 +2746,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.auth;x-internal:=true,org.eclipse.equinox.internal.security.auth.events;x-internal:=true,org.eclipse.equinox.internal.security.auth.ext.loader;x-internal:=true,org.eclipse.equinox.internal.security.auth.nls;x-internal:=true,org.eclipse.equinox.internal.security.credentials;x-internal:=true,org.eclipse.equinox.internal.security.storage;x-internal:=true,org.eclipse.equinox.internal.security.storage.friends;version=&quot;1.0.0&quot;;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.equinox.security.auth;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.credentials;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.module;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage.provider;version=&quot;1.0.0&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.security.auth.AuthPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.0.1.R34x_v20080721&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security;singleton:=true&#xA;Import-Package: javax.crypto,javax.crypto.spec,javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.eclipse.core.internal.runtime;common=split,org.eclipse.core.runtime;registry=split,org.eclipse.core.runtime.jobs,org.eclipse.core.runtime.preferences,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.datalocation;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.debug;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.environment;version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.osgi.util;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;,org.osgi.service.prefs;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.equinox.internal.security.auth;x-internal:=true,org.eclipse.equinox.internal.security.auth.events;x-internal:=true,org.eclipse.equinox.internal.security.auth.ext.loader;x-internal:=true,org.eclipse.equinox.internal.security.auth.nls;x-internal:=true,org.eclipse.equinox.internal.security.credentials;x-internal:=true,org.eclipse.equinox.internal.security.storage;x-internal:=true,org.eclipse.equinox.internal.security.storage.friends;version=&quot;1.0.0&quot;;x-friends:=&quot;org.eclipse.equinox.security.ui&quot;,org.eclipse.equinox.security.auth;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.credentials;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.auth.module;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage;version=&quot;1.0.0&quot;,org.eclipse.equinox.security.storage.provider;version=&quot;1.0.0&quot;&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Activator: org.eclipse.equinox.internal.security.auth.AuthPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.0.1.R34x_v20080721&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.equinox.security;singleton:=true&#xA;Import-Package: javax.crypto,javax.crypto.spec,javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.eclipse.core.internal.runtime;common=split,org.eclipse.core.runtime;registry=split,org.eclipse.core.runtime.jobs,org.eclipse.core.runtime.preferences,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.datalocation;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.debug;version=&quot;[1.0.0,2.0.0)&quot;,org.eclipse.osgi.service.environment;version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.osgi.util;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;,org.osgi.service.prefs;version=&quot;[1.1.0,2.0.0)&quot;,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2781,7 +2781,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.filesystem,org.eclipse.core.filesystem.provider,org.eclipse.core.internal.filesystem;x-internal:=true,org.eclipse.core.internal.filesystem.local;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.osgi&#xA;Bundle-Activator: org.eclipse.core.internal.filesystem.Activator&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.0.v20080604-1400&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.filesystem,org.eclipse.core.filesystem.provider,org.eclipse.core.internal.filesystem;x-internal:=true,org.eclipse.core.internal.filesystem.local;x-internal:=true&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.osgi&#xA;Bundle-Activator: org.eclipse.core.internal.filesystem.Activator&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 1.2.0.v20080604-1400&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2831,7 +2831,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Version: 3.4.0.v20080516-0950&#xA;Eclipse-ExtensibleAPI: true&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.core.internal.adapter;x-internal:=true,org.eclipse.core.internal.registry;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.osgi;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.spi;x-internal:=true,org.eclipse.core.runtime;registry=split;version=&quot;3.4.0&quot;;mandatory:=registry,org.eclipse.core.runtime.dynamichelpers;version=&quot;3.4.0&quot;,org.eclipse.core.runtime.spi;version=&quot;3.4.0&quot;&#xA;Import-Package: javax.xml.parsers,org.eclipse.core.runtime.jobs;resolution:=optional,org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment;resolution:=optional,org.eclipse.osgi.service.resolver;resolution:=optional,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker,org.xml.sax,org.xml.sax.helpers&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.core.internal.registry.osgi.Activator&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar, .&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2&#xA;
+            Bundle-Version: 3.4.0.v20080516-0950&#xA;Eclipse-ExtensibleAPI: true&#xA;Bundle-ActivationPolicy: lazy&#xA;Eclipse-LazyStart: true&#xA;Export-Package: org.eclipse.core.internal.adapter;x-internal:=true,org.eclipse.core.internal.registry;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.osgi;x-friends:=&quot;org.eclipse.core.runtime&quot;,org.eclipse.core.internal.registry.spi;x-internal:=true,org.eclipse.core.runtime;registry=split;version=&quot;3.4.0&quot;;mandatory:=registry,org.eclipse.core.runtime.dynamichelpers;version=&quot;3.4.0&quot;,org.eclipse.core.runtime.spi;version=&quot;3.4.0&quot;&#xA;Import-Package: javax.xml.parsers,org.eclipse.core.runtime.jobs;resolution:=optional,org.eclipse.osgi.framework.console;resolution:=optional,org.eclipse.osgi.service.datalocation,org.eclipse.osgi.service.debug,org.eclipse.osgi.service.environment;resolution:=optional,org.eclipse.osgi.service.resolver;resolution:=optional,org.eclipse.osgi.storagemanager,org.eclipse.osgi.util,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.util.tracker,org.xml.sax,org.xml.sax.helpers&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: org.eclipse.core.internal.registry.osgi.Activator&#xA;Bundle-ClassPath: runtime_registry_compatibility.jar, .&#xA;Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true&#xA;Bundle-Vendor: %providerName&#xA;Bundle-Name: %pluginName&#xA;Bundle-ManifestVersion: 2

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2860,7 +2860,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 2.4.0.v200806031604&#xA;Export-Package: javax.servlet;version=&quot;2.4&quot;,javax.servlet.http;version=&quot;2.4&quot;,javax.servlet.resources;version=&quot;2.4&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-SymbolicName: javax.servlet&#xA;Bundle-Localization: plugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %bundleProvider&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-Name: %bundleName&#xA;Bundle-Version: 2.4.0.v200806031604&#xA;Export-Package: javax.servlet;version=&quot;2.4&quot;,javax.servlet.http;version=&quot;2.4&quot;,javax.servlet.resources;version=&quot;2.4&quot;&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-SymbolicName: javax.servlet&#xA;Bundle-Localization: plugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %bundleProvider

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2897,7 +2897,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.&#xA;Bundle-SymbolicName: com.ibm.icu; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.8.1.v20080530&#xA;Bundle-Localization: plugin&#xA;Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. IBM is a registered trademark of IBM Corp.&#xA;Eclipse-ExtensibleAPI: true&#xA;Export-Package: com.ibm.icu.lang;version=&quot;3.8.1&quot;,com.ibm.icu.math;version=&quot;3.8.1&quot;,com.ibm.icu.text;version=&quot;3.8.1&quot;,com.ibm.icu.util;version=&quot;3.8.1&quot;,com.ibm.icu.impl;x-internal:=true,com.ibm.icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt38b;x-internal:=true,com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true&#xA;
+            Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ClassPath: icu-jse4.jar,icu-data.jar,.&#xA;Bundle-SymbolicName: com.ibm.icu; singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Eclipse-LazyStart: true&#xA;Bundle-Version: 3.8.1.v20080530&#xA;Bundle-Localization: plugin&#xA;Bundle-Copyright: Licensed Materials - Property of IBM (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. IBM is a registered trademark of IBM Corp.&#xA;Eclipse-ExtensibleAPI: true&#xA;Export-Package: com.ibm.icu.lang;version=&quot;3.8.1&quot;,com.ibm.icu.math;version=&quot;3.8.1&quot;,com.ibm.icu.text;version=&quot;3.8.1&quot;,com.ibm.icu.util;version=&quot;3.8.1&quot;,com.ibm.icu.impl;x-internal:=true,com.ibm.icu.impl.data;x-internal:=true,com.ibm.icu.impl.data.icudt38b;x-internal:=true,com.ibm.icu.impl.data.icudt38b.brkitr;x-internal:=true,com.ibm.icu.impl.data.icudt38b.coll;x-internal:=true,com.ibm.icu.impl.data.icudt38b.rbnf;x-internal:=true,com.ibm.icu.impl.data.icudt38b.translit;x-internal:=true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2933,7 +2933,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.filebuffers,org.eclipse.core.filebuffers.manipulation,org.eclipse.core.internal.filebuffers;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.0.v20080603-2000&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.filebuffers,org.eclipse.core.filebuffers.manipulation,org.eclipse.core.internal.filebuffers;x-internal:=true&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.resources;bundle-version=&quot;[3.2.0,4.0.0)&quot;;resolution:=optional,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -2980,7 +2980,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,org.eclipse.core.internal.events;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.propertytester;x-internal:=true,org.eclipse.core.internal.refresh;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true,org.eclipse.core.internal.resources.mapping;x-internal:=true,org.eclipse.core.internal.resources.refresh.win32;x-internal:=true,org.eclipse.core.internal.utils;x-internal:=true,org.eclipse.core.internal.watson;x-internal:=true,org.eclipse.core.resources,org.eclipse.core.resources.mapping,org.eclipse.core.resources.refresh,org.eclipse.core.resources.team&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ant.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.expressions;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.2.R34x_v20090126&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true&#xA;
+            Bundle-ManifestVersion: 2&#xA;Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,org.eclipse.core.internal.events;x-internal:=true,org.eclipse.core.internal.localstore;x-internal:=true,org.eclipse.core.internal.properties;x-internal:=true,org.eclipse.core.internal.propertytester;x-internal:=true,org.eclipse.core.internal.refresh;x-internal:=true,org.eclipse.core.internal.resources;x-internal:=true,org.eclipse.core.internal.resources.mapping;x-internal:=true,org.eclipse.core.internal.resources.refresh.win32;x-internal:=true,org.eclipse.core.internal.utils;x-internal:=true,org.eclipse.core.internal.watson;x-internal:=true,org.eclipse.core.resources,org.eclipse.core.resources.mapping,org.eclipse.core.resources.refresh,org.eclipse.core.resources.team&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ant.core;bundle-version=&quot;[3.1.0,4.0.0)&quot;;resolution:=optional,org.eclipse.core.expressions;bundle-version=&quot;[3.1.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;[1.1.0,2.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin&#xA;Bundle-Name: %pluginName&#xA;Bundle-Version: 3.4.2.R34x_v20090126&#xA;Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true&#xA;Manifest-Version: 1.0&#xA;Eclipse-LazyStart: true

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -3029,7 +3029,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.databinding.Activator&#xA;Bundle-Vendor: %providerName&#xA;Import-Package-Comment: see http://wiki.eclipse.org/&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 1.1.1.M20080827-0800b&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.databinding,org.eclipse.core.databinding.conversion;x-internal:=false,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.observable.list;x-internal:=false,org.eclipse.core.databinding.observable.map,org.eclipse.core.databinding.observable.masterdetail,org.eclipse.core.databinding.observable.set;x-internal:=false,org.eclipse.core.databinding.observable.value;x-internal:=false,org.eclipse.core.databinding.util,org.eclipse.core.databinding.validation;x-internal:=false,org.eclipse.core.internal.databinding;x-friends:=&quot;org.eclipse.core.databinding.beans&quot;,org.eclipse.core.internal.databinding.conversion;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable;x-internal:=true,org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable.tree;x-friends:=&quot;org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.validation;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.databinding&#xA;Import-Package: com.ibm.icu.text,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;;resolution:=optional,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;;resolution:=optional,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;;resolution:=optional&#xA;
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: %pluginName&#xA;Bundle-ClassPath: .&#xA;Require-Bundle: org.eclipse.equinox.common;bundle-version=&quot;[3.2.0,4.0.0)&quot;&#xA;Bundle-Activator: org.eclipse.core.internal.databinding.Activator&#xA;Bundle-Vendor: %providerName&#xA;Import-Package-Comment: see http://wiki.eclipse.org/&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 1.1.1.M20080827-0800b&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.core.databinding,org.eclipse.core.databinding.conversion;x-internal:=false,org.eclipse.core.databinding.observable,org.eclipse.core.databinding.observable.list;x-internal:=false,org.eclipse.core.databinding.observable.map,org.eclipse.core.databinding.observable.masterdetail,org.eclipse.core.databinding.observable.set;x-internal:=false,org.eclipse.core.databinding.observable.value;x-internal:=false,org.eclipse.core.databinding.util,org.eclipse.core.databinding.validation;x-internal:=false,org.eclipse.core.internal.databinding;x-friends:=&quot;org.eclipse.core.databinding.beans&quot;,org.eclipse.core.internal.databinding.conversion;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable;x-internal:=true,org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.observable.tree;x-friends:=&quot;org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding&quot;,org.eclipse.core.internal.databinding.validation;x-friends:=&quot;org.eclipse.jface.tests.databinding&quot;&#xA;Bundle-SymbolicName: org.eclipse.core.databinding&#xA;Import-Package: com.ibm.icu.text,org.osgi.framework;version=&quot;[1.4.0,2.0.0)&quot;;resolution:=optional,org.osgi.util.tracker;version=&quot;[1.3.3,2.0.0)&quot;;resolution:=optional,org.eclipse.osgi.framework.log;version=&quot;[1.0.0,2.0.0)&quot;;resolution:=optional

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -3084,7 +3084,7 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.jface.text&#xA;Bundle-Version: 3.4.2.r342_v20081119-0800&#xA;Export-Package: org.eclipse.jface.contentassist,org.eclipse.jface.contentassist.images,org.eclipse.jface.internal.text;x-internal:=true,org.eclipse.jface.internal.text.html;x-friends:=&quot;org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.jdt.debug.ui, org.eclipse.jdt.ui, org.eclipse.ant.ui, org.eclipse.ltk.ui.refactoring&quot;,org.eclipse.jface.internal.text.link.contentassist;x-internal:=true,org.eclipse.jface.internal.text.revisions;x-internal:=true,org.eclipse.jface.internal.text.source;x-internal:=true,org.eclipse.jface.text,org.eclipse.jface.text.contentassist,org.eclipse.jface.text.formatter,org.eclipse.jface.text.hyperlink,org.eclipse.jface.text.information,org.eclipse.jface.text.link,org.eclipse.jface.text.presentation,org.eclipse.jface.text.quickassist,org.eclipse.jface.text.reconciler,org.eclipse.jface.text.revisions,org.eclipse.jface.text.rules,org.eclipse.jface.text.source,org.eclipse.jface.text.source.projection,org.eclipse.jface.text.source.projection.images,org.eclipse.jface.text.templates,org.eclipse.jface.text.templates.persistence&#xA;
+            Bundle-Vendor: %providerName&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Import-Package: com.ibm.icu.text&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;;visibility:=reexport,org.eclipse.jface;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.eclipse.jface.text&#xA;Bundle-Version: 3.4.2.r342_v20081119-0800&#xA;Export-Package: org.eclipse.jface.contentassist,org.eclipse.jface.contentassist.images,org.eclipse.jface.internal.text;x-internal:=true,org.eclipse.jface.internal.text.html;x-friends:=&quot;org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, org.eclipse.jdt.debug.ui, org.eclipse.jdt.ui, org.eclipse.ant.ui, org.eclipse.ltk.ui.refactoring&quot;,org.eclipse.jface.internal.text.link.contentassist;x-internal:=true,org.eclipse.jface.internal.text.revisions;x-internal:=true,org.eclipse.jface.internal.text.source;x-internal:=true,org.eclipse.jface.text,org.eclipse.jface.text.contentassist,org.eclipse.jface.text.formatter,org.eclipse.jface.text.hyperlink,org.eclipse.jface.text.information,org.eclipse.jface.text.link,org.eclipse.jface.text.presentation,org.eclipse.jface.text.quickassist,org.eclipse.jface.text.reconciler,org.eclipse.jface.text.revisions,org.eclipse.jface.text.rules,org.eclipse.jface.text.source,org.eclipse.jface.text.source.projection,org.eclipse.jface.text.source.projection.images,org.eclipse.jface.text.templates,org.eclipse.jface.text.templates.persistence

           </instruction>
         </instructions>
       </touchpointData>
           </instruction>
         </instructions>
       </touchpointData>


@@ -3130,10 +3130,930 @@
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>

-            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.1.r341_v20080827-1100&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.contentassist,org.eclipse.ui.internal.texteditor;x-internal:=true; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.internal.texteditor.quickdiff;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer;x-internal:=true,org.eclipse.ui.internal.texteditor.rulers;x-internal:=true,org.eclipse.ui.internal.texteditor.spelling;x-internal:=true,org.eclipse.ui.texteditor; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.texteditor.link,org.eclipse.ui.texteditor.quickdiff,org.eclipse.ui.texteditor.rulers,org.eclipse.ui.texteditor.spelling,org.eclipse.ui.texteditor.templates&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;&#xA;
+            Bundle-RequiredExecutionEnvironment: J2SE-1.4&#xA;Bundle-Name: %pluginName&#xA;Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: %providerName&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true&#xA;Import-Package: com.ibm.icu.text&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Version: 3.4.1.r341_v20080827-1100&#xA;Bundle-Localization: plugin&#xA;Export-Package: org.eclipse.ui.contentassist,org.eclipse.ui.internal.texteditor;x-internal:=true; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.internal.texteditor.quickdiff;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.equivalence;x-internal:=true,org.eclipse.ui.internal.texteditor.quickdiff.compare.rangedifferencer;x-internal:=true,org.eclipse.ui.internal.texteditor.rulers;x-internal:=true,org.eclipse.ui.internal.texteditor.spelling;x-internal:=true,org.eclipse.ui.texteditor; texteditor=&quot;split&quot;; mandatory:=&quot;texteditor&quot;,org.eclipse.ui.texteditor.link,org.eclipse.ui.texteditor.quickdiff,org.eclipse.ui.texteditor.rulers,org.eclipse.ui.texteditor.spelling,org.eclipse.ui.texteditor.templates&#xA;Require-Bundle: org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.expressions;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.jface.text;bundle-version=&quot;[3.4.0,4.0.0)&quot;,org.eclipse.ui;bundle-version=&quot;[3.4.0,4.0.0)&quot;
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.090602'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='4'>
+        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
+        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
+        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
+      </properties>
+      <provides size='22'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
+      </provides>
+      <requires size='15'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.description.handler,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.images.handler,eu.etaxonomy.taxeditor.editor.internal,eu.etaxonomy.taxeditor.editor.name,eu.etaxonomy.taxeditor.editor.name.handler,eu.etaxonomy.taxeditor.editor.reference,eu.etaxonomy.taxeditor.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Version: 2.0.0.090602&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .,icons/
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='14'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.view' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='9'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
+        <required namespace='java.package' name='org.junit' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.datasource.handler,eu.etaxonomy.taxeditor.store.datasource.view,eu.etaxonomy.taxeditor.store.datasource.wizard,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 2.0.0.090602&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='8'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-Version: 2.0.0.090602&#xA;Export-Package: eu.etaxonomy.taxeditor
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='8'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='13'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-Version: 2.0.0.090602&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Bundle-Vendor: EDIT

           </instruction>
         </instructions>
       </touchpointData>
     </unit>
           </instruction>
         </instructions>
       </touchpointData>
     </unit>

+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.090602' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.090602'/>
+      </provides>
+      <requires size='58'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[2.0.0.090602,2.0.0.090602]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.090602'>
+      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.090602'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.090602'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.090602'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.090602' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.090602)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.090602'/>
+      </provides>
+      <requires size='7'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.090602,2.0.0.090602]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.090602,2.0.0.090602]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.090602,2.0.0.090602]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.090602,2.0.0.090602]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.090602,2.0.0.090602]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.090602,2.0.0.090602]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='Cdm Library' version='0.0.0'>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Cdm Library'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='Cdm Library' version='0.0.0'/>
+      </provides>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' version='2.0.0.v200906021611'/>
+      </provides>
+      <requires size='58'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.ibm.icu' range='[3.8.1.v20080530,3.8.1.v20080530]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='javax.servlet' range='[2.4.0.v200806031604,2.4.0.v200806031604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ant.core' range='[3.2.0.v20080529,3.2.0.v20080529]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.commands' range='[3.4.0.I20080509-2000,3.4.0.I20080509-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.contenttype' range='[3.3.0.v20080604-1400,3.3.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding' range='[1.1.1.M20080827-0800b,1.1.1.M20080827-0800b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.databinding.beans' range='[1.1.1.M20080827-0800a,1.1.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='[3.4.1.r342_v20081203-0800,3.4.1.r342_v20081203-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filebuffers' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem' range='[1.2.0.v20080604-1400,1.2.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.macosx' range='[1.0.0.v20080604-1400,1.0.0.v20080604-1400]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.jobs' range='[3.4.1.R34x_v20081128,3.4.1.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net' range='[1.1.0.I20080604,1.1.0.I20080604]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='[3.4.2.R34x_v20090126,3.4.2.R34x_v20090126]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.compatibility' range='[3.4.0.v20080604-1400,3.4.0.v20080604-1400]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='[3.4.0.v20080512,3.4.0.v20080512]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.auth' range='[3.2.100.v20070502,3.2.100.v20070502]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime.compatibility.registry' range='[3.2.200.v20080610,3.2.200.v20080610]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.variables' range='[3.2.100.v20080529-1300,3.2.100.v20080529-1300]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.app' range='[1.1.0.v20080421-2006,1.1.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.common' range='[3.4.0.v20080421-2006,3.4.0.v20080421-2006]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.preferences' range='[3.2.201.R34x_v20080709,3.2.201.R34x_v20080709]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.registry' range='[3.4.0.v20080516-0950,3.4.0.v20080516-0950]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security' range='[1.0.1.R34x_v20080721,1.0.1.R34x_v20080721]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.macosx' range='[1.0.0.v20080602-2000,1.0.0.v20080602-2000]'>
+          <filter>
+            (&amp;(osgi.os=macosx))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.help' range='[3.3.102.v20081014_34x,3.3.102.v20081014_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface' range='[3.4.2.M20090107-0800,3.4.2.M20090107-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.databinding' range='[1.2.1.M20080827-0800a,1.2.1.M20080827-0800a]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jface.text' range='[3.4.2.r342_v20081119-0800,3.4.2.r342_v20081119-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='[3.4.3.R34x_v20081215-1030,3.4.3.R34x_v20081215-1030]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi.services' range='[3.1.200.v20071203,3.1.200.v20071203]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.pde.source' range='[3.4.0.v20080603,3.4.0.v20080603]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt' range='[3.4.2.v3452b,3.4.2.v3452b]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.carbon.macosx' range='[3.4.1.v3452b,3.4.1.v3452b]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.text' range='[3.4.0.v20080605-1800,3.4.0.v20080605-1800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='[3.4.2.M20090204-0800,3.4.2.M20090204-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.carbon' range='[4.0.0.I20080610-1200,4.0.0.I20080610-1200]'>
+          <filter>
+            (&amp;(osgi.os=macosx)(osgi.ws=carbon))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.editors' range='[3.4.0.v20080603-2000,3.4.0.v20080603-2000]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.forms' range='[3.3.103.v20081027_34x,3.3.103.v20081027_34x]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator' range='[3.3.102.M20090127-1700,3.3.102.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.navigator.resources' range='[3.3.101.M20080910-0800,3.3.101.M20080910-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views' range='[3.3.1.M20081112-0800,3.3.1.M20081112-0800]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.views.properties.tabbed' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench' range='[3.4.2.M20090127-1700,3.4.2.M20090127-1700]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.workbench.texteditor' range='[3.4.1.r341_v20080827-1100,3.4.1.r341_v20080827-1100]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.configurator' range='[3.2.201.R34x_v20080819,3.2.201.R34x_v20080819]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core' range='[3.2.202.R34x_v20081128,3.2.202.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.ui' range='[3.2.101.R34x_v20081128,3.2.101.R34x_v20081128]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit4' range='[4.3.1,4.3.1]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.update.core.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.filesystem.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.net.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.security.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.swt.win32.win32.x86' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32)(osgi.arch=x86))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.win32' range='0.0.0'>
+          <filter>
+            (&amp;(osgi.os=win32))
+          </filter>
+        </required>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[2.0.0.v200906021611,2.0.0.v200906021611]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021611' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021611'/>
+      </provides>
+      <requires size='7'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.v200906021611,2.0.0.v200906021611]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.v200906021611,2.0.0.v200906021611]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'>
+      <update id='eu.etaxonomy.taxeditor.editor' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
+      <properties size='4'>
+        <property name='df_LT.Bundle-Vendor.0' value='EDIT'/>
+        <property name='df_LT.Bundle-Name.0' value='EDIT Taxonomic Editor - Editor Bundle'/>
+        <property name='org.eclipse.equinox.p2.name' value='%Bundle-Name.0'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%Bundle-Vendor.0'/>
+      </properties>
+      <provides size='22'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.description.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.images.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.name.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.editor.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.description' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.images' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.name' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.reference' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.propertysheet.type.wizard' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
+      </provides>
+      <requires size='15'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.editor' version='2.0.0.v200906021612'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.editor,eu.etaxonomy.taxeditor.editor.description,eu.etaxonomy.taxeditor.editor.description.handler,eu.etaxonomy.taxeditor.editor.handler,eu.etaxonomy.taxeditor.editor.images,eu.etaxonomy.taxeditor.editor.images.handler,eu.etaxonomy.taxeditor.editor.internal,eu.etaxonomy.taxeditor.editor.name,eu.etaxonomy.taxeditor.editor.name.handler,eu.etaxonomy.taxeditor.editor.reference,eu.etaxonomy.taxeditor.propertysheet,eu.etaxonomy.taxeditor.propertysheet.description,eu.etaxonomy.taxeditor.propertysheet.images,eu.etaxonomy.taxeditor.propertysheet.name,eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard,eu.etaxonomy.taxeditor.propertysheet.reference,eu.etaxonomy.taxeditor.propertysheet.type,eu.etaxonomy.taxeditor.propertysheet.type.wizard&#xA;Bundle-Localization: plugin&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface;bundle-version=&quot;3.4.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin&#xA;Bundle-Name: %Bundle-Name.0&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Bundle-Vendor: %Bundle-Vendor.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-ClassPath: .,icons/
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'>
+      <update id='eu.etaxonomy.taxeditor.navigation' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - Navigation Bundle'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='8'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.search' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.navigation.taxonomictree' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='13'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator.resources' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.forms' range='3.3.101'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding.beans' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.databinding' range='1.1.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.databinding' range='1.2.1'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.navigation' version='2.0.0.v200906021612'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Require-Bundle: org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.navigator.resources;bundle-version=&quot;3.3.101&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.forms;bundle-version=&quot;3.3.101&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,org.eclipse.core.databinding.beans;bundle-version=&quot;1.1.1&quot;,org.eclipse.core.databinding;bundle-version=&quot;1.1.1&quot;,org.eclipse.jface.databinding;bundle-version=&quot;1.2.1&quot;&#xA;Manifest-Version: 1.0&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Export-Package: eu.etaxonomy.taxeditor.navigation,eu.etaxonomy.taxeditor.navigation.handler,eu.etaxonomy.taxeditor.navigation.internal,eu.etaxonomy.taxeditor.navigation.search,eu.etaxonomy.taxeditor.navigation.taxonomictree&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle&#xA;Bundle-Vendor: EDIT
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'>
+      <update id='eu.etaxonomy.taxeditor.store' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor - DataStore Bundle'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='14'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.handler' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.view' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.datasource.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.internal' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.model' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.operations' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.parser' version='0.0.0'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor.store.preference' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='9'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='[3.2.0,4.0.0)'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.filesystem' range='1.2.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.1.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='3.4.1'/>
+        <required namespace='java.package' name='junit.framework' range='0.0.0'/>
+        <required namespace='java.package' name='org.junit' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.store' version='2.0.0.v200906021612'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Export-Package: eu.etaxonomy.taxeditor.handler,eu.etaxonomy.taxeditor.store,eu.etaxonomy.taxeditor.store.datasource,eu.etaxonomy.taxeditor.store.datasource.handler,eu.etaxonomy.taxeditor.store.datasource.view,eu.etaxonomy.taxeditor.store.datasource.wizard,eu.etaxonomy.taxeditor.store.internal,eu.etaxonomy.taxeditor.store.model;uses:=&quot;eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon&quot;,eu.etaxonomy.taxeditor.store.operations,eu.etaxonomy.taxeditor.store.parser,eu.etaxonomy.taxeditor.store.preference&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.runtime;bundle-version=&quot;[3.2.0,4.0.0)&quot;,org.eclipse.core.filesystem;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.1.0&quot;,org.eclipse.ui.editors;bundle-version=&quot;3.4.0&quot;,org.eclipse.jface.text;bundle-version=&quot;3.4.1&quot;&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin&#xA;Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Bundle-Vendor: EDIT&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true&#xA;Import-Package: junit.framework,org.junit&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021611'>
+      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021611'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021611'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'>
+      <update id='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' range='[0.0.0,2.0.0.v200906021611)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Dependencies'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.jar' version='2.0.0.v200906021611'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor.feature.dependencies' version='2.0.0.v200906021611'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'>
+      <update id='eu.etaxonomy.taxeditor.application' range='[0.0.0,2.0.0.v200906021612)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='EDIT Taxonomic Editor'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
+        <provided namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
+        <provided namespace='java.package' name='eu.etaxonomy.taxeditor' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='8'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.cdmLibrary' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.store' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.editor' range='1.0.0'/>
+        <required namespace='osgi.bundle' name='eu.etaxonomy.taxeditor.navigation' range='1.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='eu.etaxonomy.taxeditor.application' version='2.0.0.v200906021612'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-Vendor: EDIT&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: EDIT Taxonomic Editor&#xA;Require-Bundle: org.eclipse.ui;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.core.runtime;bundle-version=&quot;3.4.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.1&quot;,eu.etaxonomy.cdmLibrary;bundle-version=&quot;2.0.0&quot;,eu.etaxonomy.taxeditor.store;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.editor;bundle-version=&quot;1.0.0&quot;,eu.etaxonomy.taxeditor.navigation;bundle-version=&quot;1.0.0&quot;&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true&#xA;Bundle-Version: 2.0.0.v200906021612&#xA;Export-Package: eu.etaxonomy.taxeditor
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021626' singleton='false'>
+      <update id='eu.etaxonomy.taxeditor.feature.group' range='[0.0.0,2.0.0.v200906021626)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.group' version='2.0.0.v200906021626'/>
+      </provides>
+      <requires size='7'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.cdmLibrary.feature.group' range='[2.1.0.84,2.1.0.84]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.dependencies.feature.group' range='[2.0.0.v200906021611,2.0.0.v200906021611]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.application' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.editor' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.navigation' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.store' range='[2.0.0.v200906021612,2.0.0.v200906021612]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' range='[2.0.0.v200906021626,2.0.0.v200906021626]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>
+    <unit id='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021626'>
+      <update id='eu.etaxonomy.taxeditor.feature.jar' range='[0.0.0,2.0.0.v200906021626)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Taxeditor Feature'/>
+        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
+        <property name='org.eclipse.equinox.p2.provider' value='EDIT'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='eu.etaxonomy.taxeditor.feature.jar' version='2.0.0.v200906021626'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='eu.etaxonomy.taxeditor' version='2.0.0.v200906021626'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.example.com/license'>
+          [Enter License Description here.]
+        </license>
+      </licenses>
+      <copyright url='http://www.example.com/copyright'>
+        [Enter Copyright Description here.]
+      </copyright>
+    </unit>

   </units>
 </repository>
   </units>
 </repository>

diff --git a/taxeditor-updateSite/site.xml b/taxeditor-updateSite/site.xml
index fcb5dcb21a1bf309fa9f6e989a0a1efd41b18b67..48108cd0beb4571eb3076289241ca9d2e6719677 100644 (file)
--- a/taxeditor-updateSite/site.xml
+++ b/taxeditor-updateSite/site.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 <?xml version="1.0" encoding="UTF-8"?>
 <site>

-   <feature url="features/eu.etaxonomy.taxeditor_1.1.0.jar" id="eu.etaxonomy.taxeditor" version="1.1.0">
-      <category name="Taxonomic Editor"/>
-   </feature>

    <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.84.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.84">
       <category name="Cdm Library"/>
    </feature>
    <feature url="features/eu.etaxonomy.cdmLibrary_2.1.0.84.jar" id="eu.etaxonomy.cdmLibrary" version="2.1.0.84">
       <category name="Cdm Library"/>
    </feature>

+   <feature url="features/eu.etaxonomy.taxeditor_2.0.0.v200906021626.jar" id="eu.etaxonomy.taxeditor" version="2.0.0.v200906021626">
+      <category name="Taxonomic Editor"/>
+   </feature>

    <category-def name="Taxonomic Editor" label="Taxonomic Editor"/>
    <category-def name="Cdm Library" label="Cdm Library"/>
 </site>
    <category-def name="Taxonomic Editor" label="Taxonomic Editor"/>
    <category-def name="Cdm Library" label="Cdm Library"/>
 </site>