From e380ba337663df67e835ce3c9f071d80ebb851ed Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Tue, 2 Jun 2009 17:35:27 +0000 Subject: [PATCH] editor now updatable via updateSite --- .gitattributes | 12 - .../.settings/org.eclipse.jdt.core.prefs | 8 +- taxeditor-application/META-INF/MANIFEST.MF | 3 +- taxeditor-application/TaxEditor.product | 6 +- .../ApplicationActionBarAdvisor.java | 7 - .../ApplicationWorkbenchAdvisor.java | 14 +- .../ApplicationWorkbenchWindowAdvisor.java | 53 +- .../taxeditor/TaxonomicEditorPlugin.java | 2 + .../.settings/org.eclipse.jdt.core.prefs | 8 +- taxeditor-editor/META-INF/MANIFEST.MF | 3 +- taxeditor-editor/plugin.xml | 6 - .../taxeditor/editor/AbstractTaxonEditor.java | 10 +- .../taxeditor/editor/EditorUtil.java | 43 - .../taxeditor/editor/EmptyEditorView.java | 56 - .../editor/EmptyTextViewerPrompt.java | 135 --- .../taxeditor/editor/ErrorAnnotation.java | 1 - .../editor/FreeTextElementFactory.java | 2 +- .../taxeditor/editor/GroupComposite.java | 2 + .../taxeditor/editor/GroupCompositeLabel.java | 2 + .../taxeditor/editor/GroupedComposite.java | 2 + .../taxeditor/editor/LineBreakListener.java | 3 - .../editor/LineWrapSquigglesStrategy.java | 3 - .../taxeditor/editor/LineWrapSupport.java | 10 +- .../taxeditor/editor/MenuConstants.java | 55 - .../editor/MultiPageTaxonEditor.java | 2 +- .../eu/etaxonomy/taxeditor/editor/Page.java | 6 +- .../taxeditor/editor/ParseListener.java | 3 - .../taxeditor/editor/SelectTaxonDialog.java | 378 ------ .../editor/SimpleSelectionProvider.java | 3 - .../taxeditor/editor/TaxonEditorInput.java | 7 +- .../taxeditor/editor/TemporaryTaxon.java | 34 - .../etaxonomy/taxeditor/editor/UndoView.java | 100 -- .../taxeditor/editor/WidgetTransfer.java | 2 - .../description/CommonNameComposite.java | 4 - .../DescriptionElementComposite.java | 2 - .../DescriptionFeatureGroupComposite.java | 6 - .../description/DistributionComposite.java | 3 - .../description/DistributionDialog.java | 9 +- .../DistributionFeatureGroupComposite.java | 5 - .../description/DistributionMapDialog.java | 11 +- .../description/DynamicFeatureMenu.java | 2 - .../description/TaxonDescriptionEditor.java | 3 - .../editor/handler/SaveAllHandler.java | 3 - .../editor/handler/SaveTaxonHandler.java | 7 +- .../editor/images/ImageComposite.java | 7 +- .../editor/images/TaxonImageEditor.java | 7 +- .../internal/TaxeditorEditorPlugin.java | 2 - .../editor/name/AcceptedNameComposite.java | 2 +- .../name/BasionymSynonymPropertySource.java | 3 - .../editor/name/CdmParserController.java | 14 +- .../editor/name/ConceptComposite.java | 21 +- .../name/INameEditorCompositeRepository.java | 1 - .../editor/name/IterableSynonymyList.java | 5 - .../editor/name/MisappliedNameComposite.java | 5 +- .../taxeditor/editor/name/NameComposite.java | 24 +- .../editor/name/NameSearchDialog.java | 17 +- .../editor/name/NameSelectComposite.java | 15 +- .../taxeditor/editor/name/NameViewer.java | 43 +- .../taxeditor/editor/name/RulerWithIcon.java | 5 +- .../editor/name/SynonymComposite.java | 2 +- .../editor/name/TaxonSearchDialog.java | 7 +- .../ChangeConceptRelationshipTypeMenu.java | 1 - .../reference/ReferenceSearchDialog.java | 14 +- .../reference/ReferenceSelectComposite.java | 15 +- .../AbstractEditorPropertySheet.java | 3 - .../AnnotationPropertySource.java | 6 +- .../propertysheet/AnnotationsDialog.java | 6 +- .../AnnotationsPropertyDescriptor.java | 8 +- .../propertysheet/CheckboxCellEditor.java | 3 - .../CheckboxPropertyDescriptor.java | 3 - .../CollectionPropertySource.java | 9 +- .../propertysheet/CompletionProcessor.java | 2 + .../taxeditor/propertysheet/DayValidator.java | 2 - .../EditorPropertySheetEntry.java | 3 - .../propertysheet/MarkersPropertySource.java | 2 +- .../propertysheet/PropertySheetUtil.java | 1 + .../TimePeriodPropertySource.java | 9 - .../propertysheet/YearValidator.java | 5 +- .../DescriptionElementPropertySource.java | 33 +- .../TaxonDescriptionPropertySource.java | 20 +- .../images/ImagePropertySource.java | 17 +- .../name/BotanicalNamePropertySource.java | 3 - .../EditorComboBoxPropertyDescriptor.java | 3 - .../name/NameRelationsPropertySource.java | 28 +- .../name/NomStatusPropertySource.java | 32 +- ...NomenclaturalAuthorshipPropertySource.java | 3 - .../name/NonViralNamePropertySource.java | 15 +- .../name/TaxonBasePropertySource.java | 20 +- .../name/ZoologicalNamePropertySource.java | 4 - .../wizard/ChooseRelationWizardPage.java | 49 +- .../wizard/ListNameRelationsWizardPage.java | 10 +- .../wizard/NameRelationWizard.java | 8 +- .../wizard/NameRelationsListWizard.java | 7 +- .../wizard/NameRelationshipTemp.java | 12 +- .../NomenclaturalReferencePropertySource.java | 12 +- .../reference/ReferencePropertySource.java | 39 +- .../reference/ReferenceSearchDescriptor.java | 7 +- .../reference/ReferenceSearchDialog.java | 14 +- .../SingleRefTypePropertySource.java | 5 +- .../type/TypeCollectionPropertySource.java | 24 +- .../type/TypeDesignationPropertySource.java | 11 +- .../type/TypePropertyDescriptor.java | 7 +- .../type/TypePropertySource.java | 11 +- .../type/wizard/ChooseNameTypeWizardPage.java | 26 +- .../wizard/ChooseSpecimenTypeWizardPage.java | 19 +- .../type/wizard/ListTypeWizardPage.java | 29 +- .../type/wizard/NameSearchDialog.java | 14 +- .../type/wizard/TypeDesignationWizard.java | 9 +- .../type/wizard/TypeListWizard.java | 7 +- .../editor/ApplicationActionBarAdvisor.java | 2 - .../editor/ApplicationWorkbenchAdvisor.java | 1 + .../taxeditor/editor/Perspective.java | 10 +- .../taxeditor/editor/TestOpenHandler.java | 52 - taxeditor-feature-dependencies/feature.xml | 2 +- taxeditor-feature/feature.xml | 14 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +- taxeditor-navigation/META-INF/MANIFEST.MF | 3 +- taxeditor-navigation/build.properties | 3 +- taxeditor-navigation/plugin.xml | 5 + .../taxeditor/navigation/NavigationUtil.java | 3 +- .../RecentNamesContributionItem.java | 20 +- .../handler/CreateChildTaxonHandler.java | 3 - .../handler/DeleteTaxonHandler.java | 5 +- .../navigation/handler/EditTaxonHandler.java | 3 - .../handler/QuickCreateChildTaxonHandler.java | 2 +- .../navigation/search/SearchResultView.java | 14 +- .../TaxonomicTreeContentProvider.java | 8 - .../TaxonomicTreeLabelProvider.java | 4 +- .../taxonomictree/TaxonomicTreeView.java | 37 - .../taxeditor/navigation/Application.java | 2 - .../ApplicationWorkbenchAdvisor.java | 1 + .../src/test/resources/log4j.properties | 29 - taxeditor-store/META-INF/MANIFEST.MF | 2 +- taxeditor-store/build.properties | 4 +- .../etaxonomy/taxeditor/store/CdmStore.java | 10 +- .../etaxonomy/taxeditor/store/StoreUtil.java | 6 +- .../datasource/view/CdmDataSourceView.java | 7 - .../wizard/CdmDataSourceH2WizardPage.java | 6 - .../wizard/CdmDataSourceWizard.java | 4 - .../wizard/CdmDataSourceWizardPage.java | 25 +- .../store/model/AbstractUtility.java | 4 - .../taxeditor/store/model/ImageResources.java | 2 - .../taxeditor/store/model/ImagesUtil.java | 8 +- .../store/model/IterableSynonymyList.java | 5 +- .../taxeditor/store/model/LanguageUtil.java | 4 - .../store/model/NameRelationsUtil.java | 4 - .../taxeditor/store/model/NameUtil.java | 8 +- .../taxeditor/store/model/ReferenceUtil.java | 9 +- .../taxeditor/store/model/Resources.java | 2 +- .../taxeditor/store/model/SynonymUtil.java | 21 +- .../taxeditor/store/model/TaxonTransfer.java | 6 +- .../taxeditor/store/model/TaxonUtil.java | 4 +- .../taxeditor/store/model/UriDialog.java | 8 +- .../AbstractPersistentPostOperation.java | 3 - ...hangeConceptRelationshipTypeOperation.java | 3 - .../ChangeConceptToSynonymOperation.java | 5 +- .../ChangeHomotypicGroupOperation.java | 4 +- ...angeHomotypicalGroupBasionymOperation.java | 5 +- .../ChangeSynonymToConceptOperation.java | 5 +- ...hangeSynonymToMisapplicationOperation.java | 5 +- .../ChangeSynonymToTaxonOperation.java | 81 -- .../ChangeTaxonToSynonymOperation.java | 134 --- .../operations/CreateChildTaxonOperation.java | 4 +- .../CreateConceptRelationOperation.java | 6 +- .../CreateDescriptionElementOperation.java | 3 - .../operations/CreateImageOperation.java | 7 +- .../CreateMisapplicationOperation.java | 5 +- ...mInExisitingHomotypicalGroupOperation.java | 6 +- .../CreateSynonymInNewGroupOperation.java | 5 +- .../DeleteConceptRelationOperation.java | 5 +- .../operations/DeleteImageOperation.java | 7 +- .../DeleteMisapplicationOperation.java | 5 +- .../operations/DeleteSynonymOperation.java | 3 - ...moveHomotypicalGroupBasionymOperation.java | 6 +- .../SwapSynonymAndAcceptedOperation.java | 2 +- .../store/preference/CdmPreferences.java | 3 - .../preference/DescriptionPreferences.java | 3 - .../store/preference/FeaturePreferences.java | 7 +- .../InitNomenclaturalCodePrefDialog.java | 3 - .../preference/InitializeDbPreferences.java | 3 - .../NomenclaturalCodePreferences.java | 3 - .../store/preference/PreferencesUtil.java | 3 +- .../store/preference/RankMenuPreferences.java | 7 +- .../preference/TaxonomicPreferences.java | 3 - .../taxeditor/store/CdmStoreTest.java | 14 +- .../store/NameProtectTitleCacheTest.java | 13 +- ...eConceptRelationshipTypeOperationTest.java | 4 - ...HomotypicalGroupBasionymOperationTest.java | 5 - ...HomotypicalGroupBasionymOperationTest.java | 2 - .../ChangeSynonymToTaxonOperationTest.java | 104 -- .../ChangeTaxonToSynonymOperationTest.java | 88 -- .../CreateMisapplicationOperationTest.java | 3 - ...xisitingHomotypicalGroupOperationTest.java | 6 +- .../CreateSynonymInNewGroupOperationTest.java | 6 +- .../DeleteConceptRelationOperationTest.java | 5 - ...DeleteDescriptionElementOperationTest.java | 8 - .../DeleteMisapplicationOperationTest.java | 5 - .../operations/MoveTaxonOperationTest.java | 9 - .../SwapSynonymAndAcceptedOperationTest.java | 6 +- taxeditor-updateSite/artifacts.xml | 120 +- taxeditor-updateSite/content.xml | 1028 ++++++++++++++++- taxeditor-updateSite/site.xml | 6 +- 202 files changed, 1564 insertions(+), 2398 deletions(-) delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java delete mode 100644 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java delete mode 100644 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java delete mode 100644 taxeditor-navigation/src/test/resources/log4j.properties delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java delete mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java delete mode 100644 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java delete mode 100644 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java diff --git a/.gitattributes b/.gitattributes index 980e02a6e..6e47f01fd 100644 --- 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/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 @@ -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/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/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/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 @@ -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/TestOpenHandler.java -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/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 @@ -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/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 @@ -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/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 diff --git a/taxeditor-application/.settings/org.eclipse.jdt.core.prefs b/taxeditor-application/.settings/org.eclipse.jdt.core.prefs index c664dbc3b..4a5ab4c8c 100644 --- 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 -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.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 3b6b4a271..d1ed66469 100644 --- 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-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-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product index c7addffe5..66df514fc 100644 --- a/taxeditor-application/TaxEditor.product +++ b/taxeditor-application/TaxEditor.product @@ -1,7 +1,7 @@ - + @@ -29,7 +29,6 @@ - @@ -82,8 +81,7 @@ - - + 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 dc82904c1..d825581a8 100644 --- 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.ui.actions.ActionFactory.IWorkbenchAction; 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 { - // 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); } 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 e6b110225..3049bfb12 100644 --- 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; + /* + * (non-Javadoc) + * @see org.eclipse.ui.application.WorkbenchAdvisor#createWorkbenchWindowAdvisor(org.eclipse.ui.application.IWorkbenchWindowConfigurer) + */ public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( IWorkbenchWindowConfigurer configurer) { return new ApplicationWorkbenchWindowAdvisor(configurer); } + /* + * (non-Javadoc) + * @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId() + */ 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) { 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 5bcf6fc0f..5541ffcfc 100644 --- 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.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 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); - private IPartListener2 propertySheetListener; - public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) { super(configurer); } @@ -43,61 +36,21 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { 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) { + logger.debug("No nomencatural code set."); + 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(); 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 376499890..2d8e76703 100644 --- 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; + 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); + 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 5c1ec0b9a..47c6c2859 100644 --- 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 -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.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 3d7c7ae45..015c05e36 100644 --- 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-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 @@ -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 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml index 9db88268e..f04831350 100644 --- a/taxeditor-editor/plugin.xml +++ b/taxeditor-editor/plugin.xml @@ -20,12 +20,6 @@ - - taxonNameEditors; - private static Map taxonDescriptionEditors; - private static boolean isSaving = false; private static IStatusLineManager statusLineManager; private static IViewPart view; - /** - * @param input - * @return - * @throws PartInitException - */ - private static IEditorPart getEditorByInput(IEditorInput input) - throws PartInitException { - for (IEditorReference reference : getActivePage().getEditorReferences()) { - if (reference.getEditorInput().equals(input)) { - IEditorPart editor = reference.getEditor(false); - return editor; - } - } - return null; - } - public static boolean closeAll() { for (IEditorPart editor : getOpenEditors()) { if (!getActivePage().closeEditor(editor, true)) { @@ -135,21 +107,6 @@ public class EditorUtil extends AbstractUtility{ return open(input, MultiPageTaxonEditor.ID); } - - private static boolean redraw(AbstractTaxonEditor editor) { - if(editor == null || editor.redraw()){ - -// if (getActiveEditor().setFocus()) -// getActivePage() - - // Mark editor as changed and unsaved - editor.setDirty(); - return true; - } - return false; - } - - public static void setSaving(boolean isSaving) { EditorUtil.isSaving = isSaving; } 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 index 4bd009b74..000000000 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java +++ /dev/null @@ -1,56 +0,0 @@ -package eu.etaxonomy.taxeditor.editor; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.part.EditorPart; - -public class EmptyEditorView extends EditorPart { - - public static final String ID = "eu.etaxonomy.taxeditor.editor.EmptyEditorView"; //$NON-NLS-1$ - - /** - * Create contents of the editor part - * @param parent - */ - @Override - public void createPartControl(Composite parent) { - Composite container = new Composite(parent, SWT.NONE); - // - } - - @Override - public void setFocus() { - // Set the focus - } - - @Override - public void doSave(IProgressMonitor monitor) { - // Do the Save operation - } - - @Override - public void doSaveAs() { - // Do the Save As operation - } - - @Override - public void init(IEditorSite site, IEditorInput input) - throws PartInitException { - // Initialize the editor part - } - - @Override - public boolean isDirty() { - return false; - } - - @Override - public boolean isSaveAsAllowed() { - return false; - } - -} 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 index 80330b0f2..000000000 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java +++ /dev/null @@ -1,135 +0,0 @@ -/** -* 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.editor; - -import org.apache.log4j.Logger; -import org.eclipse.jface.text.DocumentEvent; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IDocumentListener; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.graphics.Font; - -import eu.etaxonomy.taxeditor.store.model.Resources; - -/** - * Displays a message such as "Click here to start entering - * data" when document is empty. - * - * @author p.ciardelli - * @created 15.09.2008 - * @version 1.0 - */ -public class EmptyTextViewerPrompt implements IDocumentListener { - private static final Logger logger = Logger - .getLogger(EmptyTextViewerPrompt.class); - - private IDocument document; - private StyledText textControl; - private String prompt; - private FocusListener focusListener = null; - - private Font textFont; - private Font promptFont = Resources.getFont(Resources.FONT_DEFAULT_PROMPT); - - public EmptyTextViewerPrompt(TextViewer textViewer, String prompt) { - - this.document = textViewer.getDocument(); - this.textControl = textViewer.getTextWidget(); - this.prompt = prompt; - - this.textFont = textControl.getFont(); - - documentChanged(null); - } - - /** - * Override prompt's default font. - * - * @param font - */ - public void setPromptFont(Font font) { - this.promptFont = font; - } - - /** - * Adds a focus listener to the textControl, which hides - * the prompt if the cursor is in the textControl, - * and shows it if the cursor is elsewhere. - */ - private void createPrompt() { - - textControl.setFont(promptFont); - document.set(prompt); - - focusListener = new FocusListener() { - - public void focusGained(FocusEvent e) { - if (document.get().equals(prompt)) { - textControl.setFont(textFont); - document.set(""); - } - } - - public void focusLost(FocusEvent e) { - if (document.getLength() == 0) { - textControl.setFont(promptFont); - document.set(prompt); - } - } - - }; - textControl.addFocusListener(focusListener); - textControl.addDisposeListener(new DisposeListener() { - - - public void widgetDisposed(DisposeEvent e) { - focusListener = null; - } - - }); - } - - /** - * Removes focus listener from textControl, turning off - * the showing of prompt. - */ - private void removePrompt() { - if (focusListener != null) { - textControl.removeFocusListener(focusListener); - focusListener = null; - } - } - - /* (non-Javadoc) - * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) - */ - public void documentAboutToBeChanged(DocumentEvent event) {} - - /* (non-Javadoc) - * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) - */ - public void documentChanged(DocumentEvent event) { - - if (document.get().equals(prompt)) { - return; - } - - if (document.getLength() == 0) { - createPrompt(); - } else { - removePrompt(); - } - } -} \ 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 2f45113c1..949b7979f 100644 --- 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; import eu.etaxonomy.taxeditor.store.model.ImageResources; -import eu.etaxonomy.taxeditor.store.model.Resources; public class ErrorAnnotation extends Annotation implements IAnnotationPresentation { private IMarker marker; 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 f2dc495da..fc4a64a23 100644 --- 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; import eu.etaxonomy.taxeditor.editor.images.ImageComposite; import eu.etaxonomy.taxeditor.editor.images.ImagesGroupComposite; -import eu.etaxonomy.taxeditor.editor.images.TaxonHasNoImagesComposite; import eu.etaxonomy.taxeditor.editor.images.TaxonImageEditor; import eu.etaxonomy.taxeditor.editor.name.AcceptedNameComposite; import eu.etaxonomy.taxeditor.editor.name.ConceptComposite; @@ -61,6 +60,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory { if (factory == null) { factory = new FreeTextElementFactory(); } + logger.trace("Created a new FreeTextElementFactory instance."); return factory; } 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 f11939a57..202117200 100644 --- 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 { // Drop functionality this.setDroppable(true); + + logger.trace("Created a new Group composite"); } public GroupComposite(AbstractTaxonEditor editor, Composite parent){ 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 027a301c8..777269551 100644 --- 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 final Label label = new Label(this, SWT.NONE); label.setText(labelText.toUpperCase()); + + logger.trace(this.getClass().getSimpleName() + " created"); } } 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 0ffe2b925..62af930af 100644 --- 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; createControl(); + + logger.trace(this.getClass().getSimpleName() + " created"); } protected void createControl() { 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 0f63607cd..07a12f33b 100644 --- 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; import java.util.Scanner; -import org.apache.log4j.Logger; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; @@ -47,8 +46,6 @@ import org.eclipse.swt.events.VerifyListener; * @version 1.0 */ public abstract class LineBreakListener implements VerifyListener, KeyListener { - private static final Logger logger = Logger - .getLogger(LineBreakListener.class); Collection splitTexts; 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 4280a4c85..f2dbb0e3b 100644 --- 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 @@ package eu.etaxonomy.taxeditor.editor; -import org.apache.log4j.Logger; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.AnnotationPainter.SquigglesStrategy; import org.eclipse.swt.SWT; @@ -27,8 +26,6 @@ import org.eclipse.swt.graphics.Point; * @version 1.0 */ public class LineWrapSquigglesStrategy extends SquigglesStrategy { - private static final Logger logger = Logger - .getLogger(LineWrapSquigglesStrategy.class); public static final String ID = "linewrap_squigglesstrategy"; 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 d7af8b5a1..c2449d491 100644 --- 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; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.widgets.ScrolledForm; @@ -42,6 +41,13 @@ public class LineWrapSupport { private TextViewer viewer; + /** + * @return the viewer + */ + public TextViewer getViewer() { + return viewer; + } + public LineWrapSupport(TextViewer viewer, IManagedForm form) { if (viewer == null) { @@ -56,6 +62,8 @@ public class LineWrapSupport { this.lineCount = textWidget.getLinePixel(textWidget.getLineCount()); this.scrolledForm = form.getForm(); + + logger.trace(this.getClass().getSimpleName() + " created"); } /** 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 index 768052b22..000000000 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java +++ /dev/null @@ -1,55 +0,0 @@ -/** -* 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.editor; - -import org.apache.log4j.Logger; -import org.eclipse.jface.action.MenuManager; - -/** - * @author n.hoffmann - * @created 03.02.2009 - * @version 1.0 - */ -public class MenuConstants { - private static final Logger logger = Logger.getLogger(MenuConstants.class); - - /** - * - * @return - * @deprecated this should all take place in plugin.xml - */ - public static final MenuManager EDITOR_TAXON_MENU(){ - MenuManager taxonEditorMenu = new MenuManager("Taxon"); -// -// taxonEditorMenu.add(new CreateHeterotypicSynonymAction()); -// taxonEditorMenu.add(new CreateSynonymInGroupAction()); -// taxonEditorMenu.add(new Separator()); -// taxonEditorMenu.add(new CreateMisappliedNameAction()); -// -// MenuManager subMenu = new MenuManager("Create concept relation"); -// for (TaxonRelationshipType type : -// CdmSessionDataRepository.getDefault().getConceptRelationshipTypes()) { -// subMenu.add(new CreateConceptRelationAction(type)); -// } -// taxonEditorMenu.add(subMenu); -// taxonEditorMenu.add(new Separator()); -// taxonEditorMenu.add(new MoveTaxonDialogAction()); -// taxonEditorMenu.add(new ChangeTaxonToSynonymAction()); -// taxonEditorMenu.add(new Separator()); -// // TODO is it correct that onlx taxa with rank species may have autonyms? -//// if(taxon.getName().getRank().equals(Rank.SPECIES())){ -//// taxonEditorMenu.add(new CreateAutonymAction()); -//// } -// taxonEditorMenu.add(new CreateTaxonomicallyIncludedTaxonAction()); -// - return taxonEditorMenu; - } - -} 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 cc02caa41..8f8529e0f 100644 --- 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() { String partName = null; - TaxonNameBase name = taxon.getName(); + TaxonNameBase name = taxon.getName(); if (name != null) { partName = name.getTitleCache(); 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 8e3cc5807..4d14d0b31 100644 --- 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; - private Class clazz; + private Class clazz; 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; @@ -38,7 +38,7 @@ public enum Page { return this.title; } - public Class getClazz(){ + public Class getClazz(){ 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 1829bcd24..91d88812c 100644 --- 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 @@ */ package eu.etaxonomy.taxeditor.editor; -import org.apache.log4j.Logger; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -21,8 +20,6 @@ import org.eclipse.swt.events.ModifyListener; * @version 1.0 */ public abstract class ParseListener implements ModifyListener { - private static final Logger logger = Logger - .getLogger(ParseListener.class); public void modifyText(ModifyEvent e) { StyledText widget = (StyledText) e.widget; 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 index 2b382f375..000000000 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java +++ /dev/null @@ -1,378 +0,0 @@ -/** - * 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.editor; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.log4j.Logger; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.RowData; -import org.eclipse.swt.layout.RowLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TreeItem; - -import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.ImageResources; -import eu.etaxonomy.taxeditor.store.model.NameUtil; -import eu.etaxonomy.taxeditor.store.model.Resources; - -/** - * This is a generic dialog that allows the user to choose a taxon via the - * taxonomic tree, recently selected names, or search. - * - * @author p.ciardelli - * @created 27.05.2008 - * @version 1.0 - */ -public class SelectTaxonDialog extends Dialog { - private static final Logger logger = Logger - .getLogger(SelectTaxonDialog.class); - - public static final String TAXON_TO_SYNONYM = "taxon_to_synonym"; - public static final String TAXON_TO_NEW_PARENT = "taxon_to_new_parent"; - - private String dialogType; - private String shellText; - private String descriptionText; - private Text taxonNameText; - - // FIXME no direct dependencies -// private TaxonomicTreeViewer treeViewer; - private Taxon taxon; - private Taxon destinationTaxon; - - private List