editor now updatable via updateSite
authorn.hoffmann <n.hoffmann@localhost>
Tue, 2 Jun 2009 17:35:27 +0000 (17:35 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 2 Jun 2009 17:35:27 +0000 (17:35 +0000)
202 files changed:
.gitattributes
taxeditor-application/.settings/org.eclipse.jdt.core.prefs
taxeditor-application/META-INF/MANIFEST.MF
taxeditor-application/TaxEditor.product
taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
taxeditor-editor/.settings/org.eclipse.jdt.core.prefs
taxeditor-editor/META-INF/MANIFEST.MF
taxeditor-editor/plugin.xml
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyEditorView.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSquigglesStrategy.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/LineWrapSupport.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MenuConstants.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SelectTaxonDialog.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TemporaryTaxon.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/UndoView.java [deleted file]
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/WidgetTransfer.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/CommonNameComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DescriptionFeatureGroupComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionFeatureGroupComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DistributionMapDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/DynamicFeatureMenu.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/ImageComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/images/TaxonImageEditor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/BasionymSynonymPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/CdmParserController.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/INameEditorCompositeRepository.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/IterableSynonymyList.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSearchDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameSelectComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/RulerWithIcon.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonSearchDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeConceptRelationshipTypeMenu.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSearchDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/reference/ReferenceSelectComposite.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AbstractEditorPropertySheet.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/AnnotationsPropertyDescriptor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxCellEditor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CheckboxPropertyDescriptor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CollectionPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/CompletionProcessor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/EditorPropertySheetEntry.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/MarkersPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/PropertySheetUtil.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/TimePeriodPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/YearValidator.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/DescriptionElementPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/description/TaxonDescriptionPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/images/ImagePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/BotanicalNamePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/EditorComboBoxPropertyDescriptor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameRelationsPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomStatusPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NomenclaturalAuthorshipPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/ZoologicalNamePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ListNameRelationsWizardPage.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationWizard.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationsListWizard.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/NameRelationshipTemp.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/NomenclaturalReferencePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferencePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDescriptor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/ReferenceSearchDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/reference/SingleRefTypePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypeDesignationPropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertyDescriptor.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/TypePropertySource.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseSpecimenTypeWizardPage.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/NameSearchDialog.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java
taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java
taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java
taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationWorkbenchAdvisor.java
taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Perspective.java
taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/TestOpenHandler.java [deleted file]
taxeditor-feature-dependencies/feature.xml
taxeditor-feature/feature.xml
taxeditor-navigation/.settings/org.eclipse.jdt.core.prefs
taxeditor-navigation/META-INF/MANIFEST.MF
taxeditor-navigation/build.properties
taxeditor-navigation/plugin.xml
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/CreateChildTaxonHandler.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/DeleteTaxonHandler.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/EditTaxonHandler.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/QuickCreateChildTaxonHandler.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeContentProvider.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeLabelProvider.java
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/taxonomictree/TaxonomicTreeView.java
taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java
taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java
taxeditor-navigation/src/test/resources/log4j.properties [deleted file]
taxeditor-store/META-INF/MANIFEST.MF
taxeditor-store/build.properties
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperation.java [deleted file]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperation.java [deleted file]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToTaxonOperationTest.java [deleted file]
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeTaxonToSynonymOperationTest.java [deleted file]
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java
taxeditor-updateSite/artifacts.xml
taxeditor-updateSite/content.xml
taxeditor-updateSite/site.xml

index 980e02a6e19e5156928f80e8758f8de9352f5a4b..6e47f01fd32135c0dd71b39f48541da64846ad57 100644 (file)
@@ -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
index c664dbc3b933326960a985b56a7d9ed0371281f9..4a5ab4c8cd9a2a9ff076f605b9bb3dd1bc90444b 100644 (file)
@@ -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
index 3b6b4a2717cb30438597592e3d5a8044f555bf54..d1ed6646974219c50d965e624964835f7296e41a 100644 (file)
@@ -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
index c7addffe54af79a6b3cd58df2e473868aa8e9156..66df514fcf3a4b835a5ff66d038eb65ba24f2892 100644 (file)
@@ -1,7 +1,7 @@
 <?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>
@@ -29,7 +29,6 @@
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 
@@ -82,8 +81,7 @@
    </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>
index dc82904c1e49e88af73013e8e921585bc3493356..d825581a873c8ac372bd4cd48fc6853ba1a7df9c 100644 (file)
@@ -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);
        }
index e6b110225108aa69496f5724b0291fa664090af0..3049bfb12c08bf66b8d409659148d895ce717c88 100644 (file)
@@ -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) {
index 5bcf6fc0f1dc7e66246bb6dfb36301feb2cf5223..5541ffcfc8c76195275e0a4baf8b24dee6435c4b 100644 (file)
@@ -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();
index 37649989084087ffabff3f0102bd5dfd16895b7f..2d8e76703c22daf565a0093e593059695fa78ecc 100644 (file)
@@ -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.");
        }
 
        /**
index 5c1ec0b9a5f3b5850746b2fc4787ed63f0a7b1bd..47c6c2859a619b435e2cb233c2e139c1074ee062 100644 (file)
@@ -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
index 3d7c7ae4506cdbfaa7b9465f5a9b4c256c11aa51..015c05e369d02109af2685cb583d9bd857fd5b22 100644 (file)
@@ -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
index 9db88268e08a32f7ff33d574a13e2c05ca6e3b8b..f04831350e8739d9fe9b63b0ba50cf9f7be82d66 100644 (file)
    </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"
index 5f1b091cf619517e7cc86813bdfcc64ab717f935..671e19c2dc8ac3e8798b05f7aef72da2e093e02e 100644 (file)
@@ -124,9 +124,6 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
         */\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
@@ -144,6 +141,8 @@ public abstract class AbstractTaxonEditor extends EditorPart implements IAdaptab
                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
@@ -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
-//             ((GroupedComposite) selectedObject).setSelected();\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
+        * Redraws this editor\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
-       \r
+\r
        class EditorPropertySheetPage extends PropertySheetPage {\r
                \r
                EditorPropertySheetPage() {\r
index 51d351315fc38dc890318ee3b60a1372c4f5acb2..8df96a7ea99925fe9ab51e8b843bbb5af6963abf 100644 (file)
@@ -10,7 +10,6 @@
 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
@@ -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 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.name.TaxonNameEditor;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.model.AbstractUtility;\r
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\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
-       // 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
-       /**\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
@@ -135,21 +107,6 @@ public class EditorUtil extends AbstractUtility{
                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
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
+++ /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
+++ /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
index 2f45113c1fddeef4e1a549f046a73b58b5356a97..949b7979f655c2c68ba8771588c39fe7ff7b6f2d 100644 (file)
@@ -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 eu.etaxonomy.taxeditor.store.model.Resources;\r
 \r
 public class ErrorAnnotation extends Annotation implements IAnnotationPresentation {\r
     private IMarker marker;\r
index f2dc495da92f5acec5a43d26434e6af334be3d93..fc4a64a2302997d558c1f5a7866c9f65f68b1242 100644 (file)
@@ -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.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
@@ -61,6 +60,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
                if (factory == null) {\r
                        factory = new FreeTextElementFactory();\r
                }\r
+               logger.trace("Created a new FreeTextElementFactory instance.");\r
                return factory;\r
        }\r
        \r
index f11939a57742dcdd113fddfc9f38698967d6401a..2021172001b2fcf13730e085d2b8198db14834fe 100644 (file)
@@ -53,6 +53,8 @@ public class GroupComposite extends Composite {
 \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
index 027a301c8fd21170f4771d812383dcc129fded1b..777269551728afc9bf7807591663e327c0403846 100644 (file)
@@ -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
+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\r
        }\r
 }\r
index 0ffe2b925f0cc4535ca99b667437f4ec653be845..62af930af830870354b3b94e02ae7f8d78da081a 100644 (file)
@@ -101,6 +101,8 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
                taxon = (Taxon) formData;\r
 \r
                createControl();\r
+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\r
        }\r
        \r
        protected void createControl() {\r
index 0f63607cda3b279b604db6007d75b8e18a59572b..07a12f33bd4835e06be065082f315f3470749f56 100644 (file)
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 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
@@ -47,8 +46,6 @@ import org.eclipse.swt.events.VerifyListener;
  * @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
index 4280a4c85bce8ac9803657c859eb4de07008ee42..f2dbb0e3b14b39305f886c2b70f17f205864c364 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -27,8 +26,6 @@ import org.eclipse.swt.graphics.Point;
  * @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
index d7af8b5a1036a54221bb39261baf17e191e55f1c..c2449d49114d8a1ec6a6739fd060c922ea21d0cb 100644 (file)
@@ -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.widgets.Composite;\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
+        * @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
@@ -56,6 +62,8 @@ public class LineWrapSupport {
                                \r
                this.lineCount = textWidget.getLinePixel(textWidget.getLineCount());\r
                this.scrolledForm = form.getForm();\r
+               \r
+               logger.trace(this.getClass().getSimpleName() + " created");\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
+++ /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
index cc02caa41189d80ba822b23435ff4bfc06e95e8f..8f8529e0fde19dedb4ffc486e67cf4cf69755c65 100644 (file)
@@ -189,7 +189,7 @@ public class MultiPageTaxonEditor extends MultiPageEditorPart implements IConver
     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
index 8e3cc58073c41a5cbc2881278420b154aa0d8929..4d14d0b3197e7762b5ca31fd860848fc706946f7 100644 (file)
@@ -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;
        }
        
index 1829bcd24f648fb9024ffd291cb9ef97689ea6d7..91d88812c70db45749e3120effd90b59fa2b2604 100644 (file)
@@ -8,7 +8,6 @@
  */\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
@@ -21,8 +20,6 @@ import org.eclipse.swt.events.ModifyListener;
  * @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
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
+++ /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
index fb3d32867127e9e9d4faf987205509cf7bba7378..0de6ced89208cd5995cbec9972617eddd4f57530 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -23,8 +22,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
  * @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
index 2de1b0674705f4b0c516fc1cc977f86e2ac78f07..30d919cd71608e017be1819e29eac16dc1faa90b 100644 (file)
@@ -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.taxeditor.propertysheet.name.AcceptedTaxonPropertySource;
 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;
                }       
        
+               logger.trace(TaxonEditorInput.class.getSimpleName() + " created");
+               
        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){
@@ -126,7 +127,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
         * @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 {
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
+++ /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
+++ /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
index 7b914ec6d28706b36095f0f2822181bd2c4f0ed2..daf6a18c9bccf76e0b33d559ed9a3c31e1c4871d 100644 (file)
@@ -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 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
index 155a7c82707eb8a0a331e3859e123422a263f7c9..a26244e025a58ef8f08d045e8d9e4d27ac8ed77d 100644 (file)
@@ -10,9 +10,7 @@
 \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.IManagedForm;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(CommonNameComposite.class);\r
        \r
        /**\r
         * @param groupComposite\r
index 5a67ac6235c3f175c43a8f5f450698f69eea9828..02f14e337b1ef5dfb1a3e9a31575e10b0a4cabea 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -28,7 +27,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @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
index 4964c3772e4d059282d2f05af0f0b1a97542309e..cbeb9850e8bebebbf8de61c8d39e47eb36497cf3 100644 (file)
@@ -9,14 +9,12 @@
 \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 eu.etaxonomy.taxeditor.editor.GroupCompositeLabel;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionFeatureGroupComposite.class);\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
-               \r
-               Composite groupCompositeLabel = new GroupCompositeLabel(this, feature.getLabel());\r
        }\r
        \r
        public TaxonDescription getDescription() {\r
index 1c2fdc951249648e8224c8a6fe27679c42708d51..77543c25c7a5cf9e755d71366816c16268eb9942 100644 (file)
@@ -10,7 +10,6 @@
 \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
@@ -25,8 +24,6 @@ import eu.etaxonomy.taxeditor.propertysheet.description.DistributionPropertySour
  * @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
index 174a52cf34a352a2833fc8711a97c551687ee8c6..f7c1a8997cbf1c1c9afacbf6e8f4a4a86b32f77b 100644 (file)
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 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
@@ -44,8 +43,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @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
@@ -70,7 +67,7 @@ public class DistributionDialog extends Dialog {
        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
@@ -81,7 +78,7 @@ public class DistributionDialog extends Dialog {
        /**\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
@@ -556,7 +553,7 @@ public class DistributionDialog extends Dialog {
        /**\r
         * @return\r
         */\r
-       private ReferenceBase getReference() {\r
+       private ReferenceBase<?> getReference() {\r
                return referenceComposite.getReference();\r
        }\r
 \r
index 80d34a180c9c36cd98fc6a6ac8bdcc47571a125d..a1b0a05618849c648253472fbe8b605a0db9d731 100644 (file)
@@ -13,14 +13,11 @@ package eu.etaxonomy.taxeditor.editor.description;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 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.widgets.Event;
 
 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{
-       private static final Logger logger = Logger
-                       .getLogger(DistributionFeatureGroupComposite.class);
        
        private Set<Distribution> distributions;
 
index e6835f1b3056a717028f34ae5ef17d7cf212b184..5f0fd574d12b3b8e84da035c57e9a9505906cb20 100644 (file)
@@ -14,7 +14,6 @@ import java.awt.Color;
 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;
@@ -48,9 +47,6 @@ public class DistributionMapDialog extends Dialog {
 
        private Shell shell;
        
-       private static final Logger logger = Logger
-       .getLogger(DistributionMapDialog.class);
-       
        /**
         * @param parent
         * @param style
@@ -164,4 +160,11 @@ public class DistributionMapDialog extends Dialog {
        private int calculateWidth(){
                return shell.getSize().x - 10;
        }
+       
+       /**
+        * @return the editor
+        */
+       public AbstractTaxonEditor getEditor() {
+               return editor;
+       }
 }
index 59f1d1d30a4c270c6748f48f909a9669f3c22381..9c9079700fabf8863da7b3f1f9c2bbba5214ee06 100644 (file)
@@ -20,9 +20,7 @@ import org.eclipse.swt.widgets.MenuItem;
 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.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
 
 /**
index bea1ec2e0307fde57dad16a10aae72180bb6f1bb..1b74f7b236828342f6ea05b6510317b6d31ddd57 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.description;
 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
@@ -49,8 +48,6 @@ import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
  */\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
index 6863acc4e6648d48d2e65dc399fe0fa76182150e..17517886a0906c0781bed5631cb863b29b8b0b83 100644 (file)
@@ -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.ui.IEditorInput;\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.MultiPageTaxonEditor;\r
 \r
 /**\r
  * @author n.hoffmann\r
index 839741531dedd297cdbe95f1df32881c7c040a0b..f4646376de2cca22a798efbd44476b68dab5f7a1 100644 (file)
@@ -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.TaxonRelationshipType;
 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;
 
@@ -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.");
+                       logger.trace("Tero length name detected.");
                        return null;
                }
                
@@ -64,7 +63,7 @@ public class SaveTaxonHandler extends AbstractHandler {
         * @param name
         * @return
         */
-       private boolean isNameZeroLength(TaxonNameBase name) {
+       private boolean isNameZeroLength(TaxonNameBase<?, ?> name) {
                if (name == null) {
                        return true;
                }
@@ -76,7 +75,7 @@ public class SaveTaxonHandler extends AbstractHandler {
         * @return
         */
        private boolean areRelatedNamesNonZeroLength(Taxon taxon) {
-               for (TaxonBase taxonBase : new IterableSynonymyList(taxon)) {
+               for (TaxonBase<?> taxonBase : new IterableSynonymyList(taxon)) {
                        if (isNameZeroLength(taxonBase.getName()) ) {
                                return false;
                        }
index fd8f682b78cd503cf0c574791e2bd44346cac811..b6c98cad3a4e4252a31ce464609c2b76f93b819d 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.images;
 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
@@ -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 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.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
@@ -41,9 +38,7 @@ import eu.etaxonomy.taxeditor.store.model.ImageResources;
  * @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
index 66cbcb3cdb18dc19a68b4f6afc78b8b54b6b2224..750b625ab6837ea58dc584e02178f5655eb1da11 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.images;
 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
@@ -36,8 +35,6 @@ import eu.etaxonomy.taxeditor.store.model.ImagesUtil;
  * @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
@@ -59,7 +56,7 @@ public class TaxonImageEditor extends AbstractTaxonEditor {
                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
@@ -80,7 +77,7 @@ public class TaxonImageEditor extends AbstractTaxonEditor {
                \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
index c18f01b32952912e7066ab67208d76504f828aaf..c4cd0d0a113ba637080242f2bf80d8c468078972 100644 (file)
@@ -1,8 +1,6 @@
 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;
 
index c8bda647690f55cdc06bda506756eddb9072e270..b9511d9bab4306bad928748eb690f5a0470223ee 100644 (file)
@@ -48,7 +48,7 @@ public class AcceptedNameComposite extends NameComposite {
        }\r
 \r
        @Override\r
-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r
                return taxon.getName();\r
        }\r
        \r
index 35f59008dc40aa47dccc4ad36c116f163c0fc3e9..082b736d26fac458ad7c13717fe1a7d4ed36df95 100644 (file)
@@ -10,7 +10,6 @@
 \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
@@ -23,8 +22,6 @@ import eu.etaxonomy.taxeditor.propertysheet.name.SynonymPropertySource;
  */\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
index b09ac3d230b7d359fe1136e3ea25bd3a0a10aa07..20d1ae3f0d4a4c9097ecde3b0823982f398ec0f5 100644 (file)
@@ -9,8 +9,6 @@
 \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
@@ -24,12 +22,10 @@ import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
  * @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
-       private static INonViralNameParser getNonViralNameParser() {\r
+       private static INonViralNameParser<NonViralName<?>> getNonViralNameParser() {\r
                if (nonViralNameParser == null) {\r
                        nonViralNameParser = NonViralNameParserImpl.NewInstance();\r
                }\r
@@ -53,7 +49,7 @@ public class CdmParserController {
         * @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
@@ -61,7 +57,7 @@ public class CdmParserController {
 //                     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
@@ -80,7 +76,7 @@ public class CdmParserController {
         * @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
@@ -103,7 +99,7 @@ public class CdmParserController {
         * @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
index 86b92a1746bec64bdeba0ad37c0d9ef8cf46b283..9bb9a61eb871e53f0f759375b818c4f0c310a754 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -26,8 +25,6 @@ import eu.etaxonomy.taxeditor.propertysheet.name.ConceptPropertySource;
  * @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
@@ -45,7 +42,7 @@ public class ConceptComposite extends NameComposite {
                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
@@ -107,7 +104,7 @@ public class ConceptComposite extends NameComposite {
                return relatedTaxon;\r
        }\r
        \r
-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r
                return relatedTaxon.getName();\r
        }\r
        \r
@@ -120,6 +117,20 @@ public class ConceptComposite extends NameComposite {
        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
index 52ce0289832f30789ebd1219a25aa0a6f6c162d3..1fee721bcfb054efebef13f98de7d4a3e73e0fc7 100644 (file)
@@ -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.taxon.TaxonBase;\r
 \r
 /**\r
  * @author p.ciardell\r
index e6d49eeccbe406ef001dfcdc1810b3b05cb904d9..9a3acc8b35e3dba3089b01c255835cd9c9f803a4 100644 (file)
@@ -14,13 +14,10 @@ import java.util.Iterator;
 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.taxon.TaxonRelationship;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(IterableSynonymyList.class);\r
        \r
        private Taxon taxon;\r
 \r
index b60b64b63108f619d2f87fb9cd1306c343551bdb..fdb03fe4045332afacda1b0ba97623cee043f15d 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -28,8 +27,6 @@ import eu.etaxonomy.taxeditor.store.operations.ChangeConceptToSynonymOperation;
  * @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
@@ -106,7 +103,7 @@ public class MisappliedNameComposite extends NameComposite {
        }\r
 \r
        @Override\r
-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r
                return misappliedName.getName();\r
        }\r
        \r
index 606bb3b0b231c277c8f168810f939c59a7b89ff2..552a6a001958032c9d553e2849e1cbdfa76575da 100644 (file)
@@ -9,11 +9,8 @@
 \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 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
@@ -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.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
@@ -49,7 +45,6 @@ import eu.etaxonomy.taxeditor.store.operations.CreateSynonymInNewGroupOperation;
  * @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
@@ -133,7 +128,7 @@ public abstract class NameComposite extends GroupedComposite{
         * @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
@@ -157,7 +152,7 @@ public abstract class NameComposite extends GroupedComposite{
         * \r
         */\r
        private void showNameRelations() {\r
-               TaxonNameBase name = getName();\r
+               TaxonNameBase<?, ?> name = getName();\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
-                       TaxonNameBase relatedName = null; \r
+                       TaxonNameBase<?, ?> relatedName = null; \r
                        \r
                        boolean isZoological = name instanceof ZoologicalName ? true : false; \r
                        \r
@@ -185,7 +180,7 @@ public abstract class NameComposite extends GroupedComposite{
                }\r
        }\r
                \r
-       protected void initTextViewer(TaxonBase taxonBase) {\r
+       protected void initTextViewer(TaxonBase<?> taxonBase) {\r
                \r
                showNameRelations();\r
                \r
@@ -235,11 +230,8 @@ public abstract class NameComposite extends GroupedComposite{
                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
@@ -252,7 +244,7 @@ public abstract class NameComposite extends GroupedComposite{
                                ("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
@@ -264,7 +256,7 @@ public abstract class NameComposite extends GroupedComposite{
                        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
index bc54c87b74a907021942723d9a8b0a041c932a2e..2a134780c1462369904a14d16a6ec4f6faabae81 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 \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
@@ -45,8 +44,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @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
@@ -55,16 +52,12 @@ public class NameSearchDialog extends Dialog {
        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
-               \r
-               this.searchType = searchType;\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
-                       return ((TaxonNameBase) element).getTitleCache();\r
+                       return ((TaxonNameBase<?, ?>) element).getTitleCache();\r
                }\r
                return null;\r
        }\r
 \r
+       // FIXME loose typification \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
+       // FIXME loose typification\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
-       private void setSelectedName(TaxonNameBase selectedName) {\r
+       private void setSelectedName(TaxonNameBase<?, ?> selectedName) {\r
                this.selectedName = selectedName;\r
        }\r
        \r
-       private TaxonNameBase getSelectedName() {\r
+       private TaxonNameBase<?, ?> getSelectedName() {\r
                return selectedName;\r
        }\r
 }\r
index acf7a2b0f7c7c193cc33a3cf870bde2d1d4d70f3..cf5f1f11cb70f157acc652920a734cc3b09e5e20 100644 (file)
@@ -13,7 +13,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 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
@@ -37,10 +36,8 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @version 1.0\r
  */\r
 public class NameSelectComposite extends Composite {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(NameSelectComposite.class);\r
        \r
-       private TaxonNameBase savedName;\r
+       private TaxonNameBase<?, ?> savedName;\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
-       public void setName(TaxonNameBase name) {\r
+       public void setName(TaxonNameBase<?, ?> name) {\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
-                       setSavedName((TaxonNameBase) value);\r
+                       setSavedName((TaxonNameBase<?, ?>) value);\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
@@ -181,8 +178,8 @@ public class NameSelectComposite extends Composite {
         *  \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
index cca9480226c812ec93e4ed7b816bacff900d6e8e..024e626e10b43a7a025a478888691b09fc17dd48 100644 (file)
@@ -13,12 +13,7 @@ import java.util.Iterator;
 \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.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
@@ -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.IAnnotationModel;\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.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
@@ -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.texteditor.SourceViewerDecorationSupport;\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 SourceViewerDecorationSupport decorationSupport;\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
-       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
@@ -191,7 +172,7 @@ public class NameViewer extends SourceViewer {
         * \r
         * @param name\r
         */\r
-       public void setShowParsingError(TaxonNameBase name) {\r
+       public void setShowParsingError(TaxonNameBase<?, ?> name) {\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
-                       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
-       \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
index a61d10f8406ff2495d3a2eb645e4388e562dde71..4a49a6693ff48d82296a97c5616936f97b5ab682 100644 (file)
@@ -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.layout.GridData;\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
-                       Iterator iter= fModel.getAnnotationIterator();\r
+                       Iterator<?> iter= fModel.getAnnotationIterator();\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
-                       Iterator iter= fModel.getAnnotationIterator();\r
+                       Iterator<?> iter= fModel.getAnnotationIterator();\r
                        while (iter.hasNext()) {\r
                                IAnnotationPresentation annotationPresentation= null;\r
                                Annotation annotation= (Annotation) iter.next();\r
index d4df27f25a62e4d63d77f8ebd1a872de40c22208..8052078e0c54964e0b6828ca457b01666c434720 100644 (file)
@@ -119,7 +119,7 @@ public class SynonymComposite extends NameComposite {
        }\r
 \r
        @Override\r
-       protected TaxonNameBase getName() {\r
+       protected TaxonNameBase<?, ?> getName() {\r
                return synonym.getName();\r
        }\r
        \r
index 10f1261be7f241960d73842d5364b08830bed838..1e732a92bd92f4660dca1c7d0cfebdc17f4d7301 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 \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
@@ -24,8 +23,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @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
@@ -49,8 +46,8 @@ public class TaxonSearchDialog extends NameSearchDialog {
                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
index 3d3315f5ff2453efde0c3cdc0ccf32ae13498e5e..2ae289ec87c0e448f8d9b143522e0984d423c731 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.editor.reference;
 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
@@ -47,8 +46,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @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
@@ -57,7 +54,7 @@ public class ReferenceSearchDialog extends Dialog {
        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
@@ -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
-                                       return ((ReferenceBase) element).getTitleCache();\r
+                                       return ((ReferenceBase<?>) element).getTitleCache();\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
-                                       setSelectedReference((ReferenceBase) data);\r
+                                       setSelectedReference((ReferenceBase<?>) data);\r
                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r
@@ -225,6 +222,7 @@ public class ReferenceSearchDialog extends Dialog {
 \r
        }\r
        \r
+       // FIXME strange typification\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
-       private void setSelectedReference(ReferenceBase selectedReference) {\r
+       private void setSelectedReference(ReferenceBase<?> selectedReference) {\r
                this.selectedReference = selectedReference;\r
        }\r
        \r
-       private ReferenceBase getSelectedReference() {\r
+       private ReferenceBase<?> getSelectedReference() {\r
                return selectedReference;\r
        }\r
 }\r
index dcd9d997ed65e5ed6c57ae95ff22e28ef2b45e33..c979906c7641a4572c3414f4d766800052326d16 100644 (file)
@@ -10,7 +10,6 @@
 \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
@@ -33,9 +32,7 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @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
@@ -113,7 +110,7 @@ public class ReferenceSelectComposite extends Composite {
                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
@@ -134,14 +131,14 @@ public class ReferenceSelectComposite extends Composite {
         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
-       private void setSavedReference(ReferenceBase reference) {\r
+       private void setSavedReference(ReferenceBase<?> reference) {\r
                \r
                savedReference = reference;\r
                \r
@@ -167,8 +164,8 @@ public class ReferenceSelectComposite extends Composite {
         *  \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
index 8f9d5d3b65a87237be291295679f4a87f5e7656c..333b95e0ae4571d885ef9351987e735e67b4376d 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -20,8 +19,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  * @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
index 733c9aa088f0aa86a081a4b30e83b48ad2736abf..58708238c03b53309b597c0bf63c9f88c47545ff 100644 (file)
@@ -2,15 +2,11 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \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
-       private static final Logger logger = Logger\r
-                       .getLogger(AnnotationPropertySource.class);\r
 \r
-       public AnnotationPropertySource(Collection collection) {\r
+       public AnnotationPropertySource(Collection<?> collection) {\r
                super(collection);\r
        }\r
        \r
index e67f69c27359e00164db1c34d6ab4d6b4da77a9b..99c3295d0fa0024812a5dd581ebeae22e0ec562f 100644 (file)
@@ -3,7 +3,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 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
@@ -37,13 +36,10 @@ public class AnnotationsDialog extends Dialog {
 \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
-       private Annotation selectedAnnotation;\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
-                               result = new HashSet(list);\r
+                               result = new HashSet<Object>(list);\r
                                shell.dispose();\r
                        }\r
                });\r
index 089405652629bbd9451290360f3d51dcda579b79..6e487b014bc1ff63e11793f08ea50a4e5da62ea2 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \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
@@ -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 eu.etaxonomy.cdm.model.name.TaxonNameBase;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(AnnotationsPropertyDescriptor.class);\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
-                                       Set annotations = (Set) value;\r
+                                       Set<?> annotations = (Set<?>) value;\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
-    abstract protected void saveAnnotations(Set set);  \r
+    abstract protected void saveAnnotations(Set<?> set);       \r
 }\r
index 14bed301be0320877288a224d47c7140ea59efe0..5684a455ce30151ec044610e5d334a220b10747f 100644 (file)
@@ -10,7 +10,6 @@
 \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
@@ -27,8 +26,6 @@ import org.eclipse.swt.widgets.Control;
  * @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
index 77a418a88493c01e2b0ebf3aeeafed159ccd3ebc..2ae9b0daeb51a8b19145a24b1236d24de8ff70a3 100644 (file)
@@ -1,13 +1,10 @@
 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
-       private static final Logger logger = Logger\r
-                       .getLogger(CheckboxPropertyDescriptor.class);\r
        \r
        public CheckboxPropertyDescriptor(Object id, String displayName) {\r
                super(id, displayName);\r
index 452af1331cd4b2271798c7219c319a0ec853c5f4..91489b3600214d99b5f051ec54c9c7be0e3cd600 100644 (file)
@@ -3,7 +3,6 @@ package eu.etaxonomy.taxeditor.propertysheet;
 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
@@ -14,21 +13,19 @@ import org.eclipse.ui.views.properties.PropertyDescriptor;
  * @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
-       protected Collection collection;\r
+       protected Collection<?> collection;\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
-       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
index 6f8353e66a892de2675e6a6833487b4212f975d6..34be6ef7b1e598ac0030150797c095d4a6e47fda 100644 (file)
@@ -23,6 +23,8 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 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
index d0bfe102ca1c9c6def1d47dd4c20e5adaff95f33..70fff20b676b7a65b373b3668b01dadf22791f96 100644 (file)
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
-import org.apache.log4j.Logger;\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
-       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
index 9e3ada44883df24c18bb812f42c5153c71594ed5..5b1eb0d0e3623b8597d39eb5bf7c9ff1c59c6db0 100644 (file)
@@ -8,7 +8,6 @@
 */\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
@@ -22,8 +21,6 @@ import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;
  * @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
index e87e71def79ca13c5689f5d72775f8836476a6c2..80775007986c7fcbd0a87d019723324afb339564 100644 (file)
@@ -13,7 +13,7 @@ public class MarkersPropertySource extends CollectionPropertySource {
                        .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
index 22301e4d997d5c5cec51dae52eeb9ab2344128de..09584c155341b8db8e0ca96af48a63ec3d08f44f 100644 (file)
@@ -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
+               @Deprecated // FIXME looks unused and does not make sense\r
                public static void addPropertySheetInputListener() {\r
                        IViewPart propertySheet = getPropertySheet();\r
        //              propertySheet.get\r
index fce92a9ebea0a7143c8a28ab54919084e0538ebf..2b300129aa0f0c2cafbf89bac28724ae4f71dc11 100644 (file)
@@ -11,11 +11,8 @@ package eu.etaxonomy.taxeditor.propertysheet;
 \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 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
@@ -31,8 +28,6 @@ import eu.etaxonomy.taxeditor.store.model.Resources;
  * @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
@@ -76,10 +71,6 @@ public class TimePeriodPropertySource implements IPropertySource {
                }\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
index acbd2d65cb1e2b77ddbc03b1da433ad5f1377366..c11298180c8b9aa97b3abc02973f6bf52429ca31 100644 (file)
@@ -9,10 +9,8 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet;\r
 \r
-import org.apache.log4j.Logger;\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
@@ -21,7 +19,6 @@ import eu.etaxonomy.taxeditor.store.model.TimeUtil;
  * @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
@@ -32,7 +29,7 @@ public class YearValidator implements ICellEditorValidator {
                        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
index 4dfd9bc7e1b9e3d43e837a0e72fcd866424d5529..93ab31c268f1668c566e3926985e63cd3e5c7312 100644 (file)
@@ -15,7 +15,6 @@ import java.util.HashMap;
 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
@@ -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.taxeditor.store.model.ReferenceUtil;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionElementPropertySource.class);\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
-       private Class[] P_FEATURE_CLASSES;\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
-               this.parentid = parentid;\r
+               this.setParentid(parentid);\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
-                       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
@@ -145,7 +140,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
                        } \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
@@ -180,7 +175,7 @@ public class DescriptionElementPropertySource implements IPropertySource {
         * @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
@@ -210,11 +205,11 @@ public class DescriptionElementPropertySource implements IPropertySource {
                }\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
-                                       descriptionElement.setCitation((ReferenceBase) evt.getNewValue());\r
+                                       descriptionElement.setCitation((ReferenceBase<?>) evt.getNewValue());\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
-                               descriptionElement.setCitation((ReferenceBase) value);\r
+                               descriptionElement.setCitation((ReferenceBase<?>) value);\r
                        }\r
                }\r
                \r
@@ -274,4 +269,18 @@ public class DescriptionElementPropertySource implements IPropertySource {
        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
index 128c1464c5ea3abc9c412b34b2ba27ca5e9ad8e2..9b0c81e77db54cd7ae1a8aad284b842ae2ae2a84 100644 (file)
@@ -11,11 +11,9 @@ package eu.etaxonomy.taxeditor.propertysheet.description;
 \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.TextPropertyDescriptor;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonDescriptionPropertySource.class);\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
-               this.parentid = parentid;\r
+               this.setParentid(parentid);\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
+\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
index 6a05c72d1f28ecfc7d6e8a18441351ce061329fa..9b79702d042f645758f13ac1c5b994279abb2431 100644 (file)
@@ -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.TextPropertyDescriptor;\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
-               this.taxon = taxon;\r
+               this.setTaxon(taxon);\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
+\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
index b24e1ac83e6af533907e23f454c368a5f0b6653c..819f1ae4de973bf330b9623416966647ec4665fd 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -23,8 +22,6 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
  * @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
index 26541646d040bba6a21132a65c902626c61e0464..8202ffeb779aae35d39c8cdf6122398930fa5c4b 100644 (file)
@@ -10,7 +10,6 @@
 \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
@@ -25,8 +24,6 @@ import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
  */\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
index cdc45b4e25374bc21502bb48eee3f18c5ed02dc4..cb442252276982533a32bb9c8b67f09ed328eb6d 100644 (file)
@@ -11,8 +11,6 @@ package eu.etaxonomy.taxeditor.propertysheet.name;
 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
@@ -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
-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsPropertySource.class);\r
        \r
-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r
        private boolean isZoological = false;\r
 \r
-       private Set nameRelations;\r
+       private Set<?> nameRelations;\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
-               this.nameRelations = name.getNameRelations();\r
+               this.setNameRelations(name.getNameRelations());\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
-                       TaxonNameBase relatedName;\r
+                       TaxonNameBase<?, ?> relatedName;\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
+\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
index 42bf0f913b66f7eaf56f99bcefb029b432779155..c1f5ffae093d79485a1113f3c5aa276772659997 100644 (file)
@@ -9,16 +9,11 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.name;\r
 \r
-import java.util.ArrayList;\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
-import eu.etaxonomy.taxeditor.store.CdmStore;\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
-       private static final Logger logger = Logger.\r
-                       getLogger(NomStatusPropertySource.class);\r
 \r
-       public NomStatusPropertySource(Collection collection) {\r
+       public NomStatusPropertySource(Collection<?> collection) {\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
index c50ba213793e487657343d080574392ffc11a36a..33825936fe7ff0a7b41942641b3d711538b36318 100644 (file)
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 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
@@ -32,8 +31,6 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
  * @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
index 13f9c6126a550e1b0576a235609234b013de3873..b36776e0728eb2fb58482aa7f32e5b5bf14ad7b3 100644 (file)
@@ -18,7 +18,6 @@ import java.util.List;
 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
@@ -48,11 +47,9 @@ import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;
  * @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
-       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
@@ -309,11 +306,11 @@ public class NonViralNamePropertySource implements IPropertySource {
         *  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
-       public NonViralNamePropertySource(NonViralName name, \r
+       public NonViralNamePropertySource(NonViralName<?> name, \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
-               ReferenceBase nomRef = (ReferenceBase) name.getNomenclaturalReference();\r
+               ReferenceBase<?> nomRef = (ReferenceBase<?>) name.getNomenclaturalReference();\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
-                                               name.setNomenclaturalReference((ReferenceBase) evt.getNewValue());\r
+                                               name.setNomenclaturalReference((ReferenceBase<?>) evt.getNewValue());\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
-                       name.setNomenclaturalReference((ReferenceBase) value);\r
+                       name.setNomenclaturalReference((ReferenceBase<?>) value);\r
                }\r
         }\r
         \r
index eb1b332dfdb2e5c71f29d13fd47810594227b6a6..43e9ea805e93c531d12cae12caf0cdd55b2e90d9 100644 (file)
@@ -43,7 +43,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        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
@@ -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 TaxonBasePropertySource(TaxonBase taxon, String nameTitle) {\r
+       public TaxonBasePropertySource(TaxonBase<?> taxon, String 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
-                       TaxonNameBase name = taxonBase.getName();\r
+                       TaxonNameBase<?, ?> name = taxonBase.getName();\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 NonViralNamePropertySource((NonViralName) name);\r
+                               return new NonViralNamePropertySource((NonViralName<?>) name);\r
                        }\r
                        \r
                }               \r
@@ -148,7 +148,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                        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
@@ -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
-                                               taxonBase.setSec((ReferenceBase) evt.getNewValue());\r
+                                               taxonBase.setSec((ReferenceBase<?>) evt.getNewValue());\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
-                               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
@@ -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
-                       taxonBase.setSec((ReferenceBase) value);\r
+                       taxonBase.setSec((ReferenceBase<?>) value);\r
                }\r
         }\r
        }\r
@@ -207,7 +207,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        /**\r
         * @return the taxonBase\r
         */\r
-       public TaxonBase getTaxonBase() {\r
+       public TaxonBase<?> getTaxonBase() {\r
                return taxonBase;\r
        }\r
 }\r
index 12f1e3585442b6b1f1317c88aa0f90e04eba0f14..dc192e4fa5dba1ac0494127de9276ec7b8ff9664 100644 (file)
@@ -9,8 +9,6 @@
 \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
@@ -21,8 +19,6 @@ import eu.etaxonomy.cdm.model.name.ZoologicalName;
  * @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
index 77dd4575f1359321103527970d9ac43472cefaf6..0005597f3e461f7e86f71b2473c4d674ae7569af 100644 (file)
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeListener;
 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
@@ -49,8 +48,6 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @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
@@ -81,10 +78,10 @@ public class ChooseRelationWizardPage extends WizardPage {
 \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
@@ -94,7 +91,7 @@ public class ChooseRelationWizardPage extends WizardPage {
 \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
@@ -273,12 +270,10 @@ public class ChooseRelationWizardPage extends WizardPage {
        \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
@@ -288,31 +283,11 @@ public class ChooseRelationWizardPage extends WizardPage {
                 * @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
-//                     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
-//             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
index 04f102e49c6990c204b8bb5d9aff3dda9a8a9a5f..dc28d8c2ee434d7f2d34b2231790874dc96b91df 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -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.TableItem;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(ListNameRelationsWizardPage.class);\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
@@ -62,7 +58,7 @@ public class ListNameRelationsWizardPage extends WizardPage {
 \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
@@ -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
-                               TableItem[] selectedItem = nameRelationsTable.getSelection();\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
+                                       // FIXME nothing is happening here\r
                                        NameRelationship relation = (NameRelationship) ((StructuredSelection) event\r
                                                        .getSelection()).getFirstElement();\r
                                        // Editing existing relations disabled\r
index 62ae0c540eaa5eb097fea074f8b352287c48f489..0dd4c9fb84717e5faf6fd946b117d3294a5d0176 100644 (file)
@@ -9,9 +9,7 @@
 \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.jface.wizard.IWizardPage;\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
-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationWizard.class);\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
-       public NameRelationWizard(TaxonNameBase name, WritableList nameRelationsList) {\r
+       public NameRelationWizard(TaxonNameBase<?, ?> name, WritableList nameRelationsList) {\r
                super();\r
                \r
                this.name = name;\r
index eff170bd3723e588ed3a842922fd5a33dbc545d8..1d68f012a1f8012571e12caffbdc40586c856bb1 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard;
 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
@@ -27,14 +26,12 @@ import eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard.ChooseRelationW
  * @version 1.0\r
  */\r
 public class NameRelationsListWizard extends Wizard {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsListWizard.class);\r
        \r
-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r
 \r
        private WritableList nameRelationsTemp;\r
 \r
-       public NameRelationsListWizard(TaxonNameBase name) {\r
+       public NameRelationsListWizard(TaxonNameBase<?, ?> name) {\r
                super();\r
                \r
                this.name = name;\r
index 8b7f1176e91ebbd5295596dc97415610636c3a5c..c86fc17969f7fe290a8255cea382498c08a3363e 100644 (file)
 \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.NameRelationshipType;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\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
-       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
index 312f9f32548ae421ca1f88694d4badf878de2d0b..640cc4515034c3fbaecbdee2974f685b3532e0e0 100644 (file)
@@ -13,8 +13,6 @@ import java.util.HashMap;
 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
@@ -31,19 +29,17 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  */\r
 public class NomenclaturalReferencePropertySource extends\r
                ReferencePropertySource {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(NomenclaturalReferencePropertySource.class);\r
        \r
-       public NomenclaturalReferencePropertySource(ReferenceBase reference) {\r
+       public NomenclaturalReferencePropertySource(ReferenceBase<?> reference) {\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
-               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
@@ -60,7 +56,7 @@ public class NomenclaturalReferencePropertySource extends
                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
index 4e0808b0419c858006660aa372c45628eea65645..93dda0aec93dc0c9dbc285c6227be3ec851505ee 100644 (file)
@@ -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.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
@@ -100,7 +99,7 @@ public class ReferencePropertySource implements IPropertySource {
        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
@@ -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
-       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
@@ -196,7 +195,7 @@ public class ReferencePropertySource implements IPropertySource {
        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
@@ -225,11 +224,11 @@ public class ReferencePropertySource implements IPropertySource {
                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
-       public ReferencePropertySource(ReferenceBase reference) {\r
+       public ReferencePropertySource(ReferenceBase<?> reference) {\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
-               Class referenceClass = reference.getClass();\r
+               Class<?> referenceClass = reference.getClass();\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
-                       Class referenceClass = reference.getClass();\r
+                       Class<?> referenceClass = reference.getClass();\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
@@ -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
-                       TeamOrPersonBase authorTeam = reference.getAuthorTeam();\r
+                       TeamOrPersonBase<?> authorTeam = reference.getAuthorTeam();\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
-                               reference = (ReferenceBase) value;\r
+                               reference = (ReferenceBase<?>) value;\r
                        }\r
                }\r
 \r
@@ -961,7 +960,7 @@ public class ReferencePropertySource implements IPropertySource {
                                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
@@ -972,7 +971,7 @@ public class ReferencePropertySource implements IPropertySource {
                \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
@@ -1096,10 +1095,10 @@ public class ReferencePropertySource implements IPropertySource {
                                        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
-                                               ((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
@@ -1107,7 +1106,7 @@ public class ReferencePropertySource implements IPropertySource {
                                                datePublished.setEndYear(yearsPublished.getEndYear());\r
                                        }\r
                                } else {\r
-                                       ((StrictReferenceBase) reference).setDatePublished(null);\r
+                                       ((StrictReferenceBase<?>) reference).setDatePublished(null);\r
                                }\r
                                \r
 \r
@@ -1133,17 +1132,17 @@ public class ReferencePropertySource implements IPropertySource {
         * @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
-                       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
-                               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
index 8e0cae8471cad4daa7642d6fcf2aa8434cb57d28..b566f6db560677193bac50c028f2b1dbe44da962 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -25,8 +24,6 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @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
@@ -46,7 +43,7 @@ abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {
                        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
@@ -59,5 +56,5 @@ abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {
         return editor;\r
     }\r
         \r
-    abstract protected void saveReference(ReferenceBase reference);    \r
+    abstract protected void saveReference(ReferenceBase<?> reference); \r
 }\r
index 225f7a98ff8adf3e787a0c48ee308232e3b20f5f..4b8f97a2604ae8e809e7093daeefbcce59909129 100644 (file)
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.propertysheet.reference;
 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
@@ -47,8 +46,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @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
@@ -57,7 +54,7 @@ public class ReferenceSearchDialog extends Dialog {
        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
@@ -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
-                                       return ((ReferenceBase) element).getTitleCache();\r
+                                       return ((ReferenceBase<?>) element).getTitleCache();\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
-                                       setSelectedReference((ReferenceBase) data);\r
+                                       setSelectedReference((ReferenceBase<?>) data);\r
                                        \r
                                        // Enable "OK" button\r
                                        okButton.setEnabled(true);\r
@@ -225,6 +222,7 @@ public class ReferenceSearchDialog extends Dialog {
 \r
        }\r
        \r
+       // FIXME typification very loose\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
-       private void setSelectedReference(ReferenceBase selectedReference) {\r
+       private void setSelectedReference(ReferenceBase<?> selectedReference) {\r
                this.selectedReference = selectedReference;\r
        }\r
        \r
-       private ReferenceBase getSelectedReference() {\r
+       private ReferenceBase<?> getSelectedReference() {\r
                return selectedReference;\r
        }\r
 }\r
index 1d71189e3eb07d1da69b4da3a78637565c008332..be9e672f4af0e9f7eeff3e942679ec635cf06f4e 100644 (file)
@@ -9,7 +9,6 @@
 \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
@@ -30,15 +29,13 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @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
-       public SingleRefTypePropertySource(ReferenceBase reference, String referenceType) {\r
+       public SingleRefTypePropertySource(ReferenceBase<?> reference, String referenceType) {\r
                super(reference);\r
                \r
                this.referenceType = referenceType;\r
index 836888e16167f6b38b86a6e3bb85def22db6f21c..bd87190ff1e0e7a9e21e185dbbe0ecaf8394c9ef 100644 (file)
@@ -25,11 +25,11 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
        private static final Logger logger = Logger\r
                        .getLogger(TypeCollectionPropertySource.class);\r
        \r
-       private TaxonNameBase name;\r
+       private TaxonNameBase<?, ?> name;\r
 \r
-       public TypeCollectionPropertySource(TaxonNameBase name, Collection collection) {\r
+       public TypeCollectionPropertySource(TaxonNameBase<?, ?> name, Collection<?> collection) {\r
                super(collection);\r
-               this.name = name;\r
+               this.setName(name);\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
-                       TypeDesignationStatusBase status = ((TypeDesignationBase) item).getTypeStatus();\r
+                       TypeDesignationStatusBase<?> status = ((TypeDesignationBase<?>) item).getTypeStatus();\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
-                       return new TypeDesignationPropertySource((TypeDesignationBase) id);\r
+                       return new TypeDesignationPropertySource((TypeDesignationBase<?>) id);\r
                }\r
                return null;\r
        }       \r
@@ -103,4 +103,18 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
        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
index f84d5f14c1345572443e422520c95a428364c498..df242c36a2bddc8e93a834f3bb1762db3145ce1f 100644 (file)
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeEvent;
 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
@@ -34,10 +33,8 @@ import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;
  * @version 1.0\r
  */\r
 public class TypeDesignationPropertySource implements IPropertySource {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(TypeDesignationPropertySource.class);\r
 \r
-       private TypeDesignationBase typeDesignation;\r
+       private TypeDesignationBase<?> typeDesignation;\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
-       TypeDesignationPropertySource(TypeDesignationBase typeDesignation) {\r
+       TypeDesignationPropertySource(TypeDesignationBase<?> typeDesignation) {\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
-                       ReferenceBase reference = typeDesignation.getCitation();\r
+                       ReferenceBase<?> reference = typeDesignation.getCitation();\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
-                                               typeDesignation.setCitation((ReferenceBase) evt.getNewValue());\r
+                 &