Cleaned up / renamed.
authorp.ciardelli <p.ciardelli@localhost>
Fri, 7 Mar 2008 13:26:27 +0000 (13:26 +0000)
committerp.ciardelli <p.ciardelli@localhost>
Fri, 7 Mar 2008 13:26:27 +0000 (13:26 +0000)
71 files changed:
.gitattributes
eclipseprojects/eu.etaxonomy.taxeditor/.project
eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF
eclipseprojects/eu.etaxonomy.taxeditor/build.properties
eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product [moved from eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.prototype2.product with 100% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Activator.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Activator.java with 95% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Application.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Application.java with 96% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationActionBarAdvisor.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationWorkbenchAdvisor.java with 87% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationWorkbenchWindowAdvisor.java with 95% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Perspective.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Perspective.java with 75% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddQuickName.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddQuickName.java with 82% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddSynonymToTaxon.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddSynonymToTaxon.java with 84% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionDeleteTaxon.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionDeleteTaxon.java with 83% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionMoveTaxon.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionMoveTaxon.java with 86% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionOpenNameEditor.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionOpenNameEditor.java with 74% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionOpenNewChildNameEditor.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionOpenNewChildNameEditor.java with 79% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionPopulatePropertySheet.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionPopulatePropertySheet.java with 87% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionRemoveTaxonFromTree.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionRemoveTaxonFromTree.java with 80% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionSaveTaxon.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionSaveTaxon.java with 87% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/NameTransfer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/NameTransfer.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/SynonymRelationshipTransfer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/SynonymRelationshipTransfer.java with 94% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/TaxonTransfer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/TaxonTransfer.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/NameEditorInput.java with 91% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/NameTreeContentProvider.java with 94% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/PropertySheetNode.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/PropertySheetNode.java with 94% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/AcceptedNameViewer.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/CarduusEditorView.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EditNameProperties.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer_.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PilosellaEditorView.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RelatedNameViewer.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyCompletionProcessor.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyRuleScanner.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MySourceViewerConfig.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDamagerRepairer.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocument.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocumentListener.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner_.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner__.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerConfig.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerKeyListener.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerModifyListener.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/SimpleNamePartitioner.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/EmptyEditorView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EmptyEditorView.java with 82% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MoveDialogView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MoveDialogView.java with 95% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MultiPageTaxonView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MultiPageTaxonView.java with 90% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameEditorView.java with 91% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameListView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameListView.java with 94% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameViewer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer.java with 86% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/PropertySheetViewer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PropertySheetViewer.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/RecentNamesTableViewer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RecentNamesTableViewer.java with 90% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TaxonomicTreeViewer.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/TaxonomicTreeViewer.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TestDragAndDrop.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/Testeroo.java with 86% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/UndoView.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/UndoView.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/AnnotationMarkerAccess.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/AnnotationMarkerAccess.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/CompositeRectangle.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/CompositeRectangle.java with 86% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/ErrorAnnotation.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/ErrorAnnotation.java with 91% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/GroupComposite.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/GroupComposite.java with 92% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameComposite.java with 93% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameViewerVerifyListener.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerVerifyListener.java with 90% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/TesterooWritableSet.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/TesterooWritableSet.java with 84% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/WarningAnnotation.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/WarningAnnotation.java with 91% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/heterosyn_no_bg.gif [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/heterosyn_no_bg.gif with 100% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/homosyn_no_bg.gif [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/homosyn_no_bg.gif with 100% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetContentProvider.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetContentProvider.java with 85% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetValueEditingSupport.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueEditingSupport.java with 90% similarity]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetValueLabelProvider.java [moved from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueLabelProvider.java with 89% similarity]

index 2cfb19c4647c366885a18709548497a094ef6f6b..46a8e431c73a058d9325c0435a21304fae18f01d 100644 (file)
@@ -310,7 +310,7 @@ eclipseprojects/eu.etaxonomy.taxeditor/.classpath -text
 eclipseprojects/eu.etaxonomy.taxeditor/.project -text
 eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF -text
 eclipseprojects/eu.etaxonomy.taxeditor/build.properties -text
-eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.prototype2.product -text
+eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
 eclipseprojects/eu.etaxonomy.taxeditor/icons/a_no_bg.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor/icons/add.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor/icons/add_edit.gif -text
@@ -356,68 +356,48 @@ eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml -text
 eclipseprojects/eu.etaxonomy.taxeditor/splash.bmp -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/com/swtdesigner/ResourceManager.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/com/swtdesigner/SWTResourceManager.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Activator.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Application.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationActionBarAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationWorkbenchAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationWorkbenchWindowAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Perspective.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddQuickName.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddSynonymToTaxon.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionDeleteTaxon.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionMoveTaxon.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionOpenNameEditor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionOpenNewChildNameEditor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionPopulatePropertySheet.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionRemoveTaxonFromTree.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionSaveTaxon.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/NameTransfer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/SynonymRelationshipTransfer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/TaxonTransfer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/NameEditorInput.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/NameTreeContentProvider.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/PropertySheetNode.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/AcceptedNameViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/CarduusEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EditNameProperties.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EmptyEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MoveDialogView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MultiPageTaxonView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameListView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer_.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PilosellaEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PropertySheetViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RecentNamesTableViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RelatedNameViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/TaxonomicTreeViewer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/Testeroo.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/UndoView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/AnnotationMarkerAccess.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/CompositeRectangle.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/ErrorAnnotation.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/GroupComposite.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyCompletionProcessor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyRuleScanner.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MySourceViewerConfig.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameComposite.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDamagerRepairer.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocument.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocumentListener.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner_.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner__.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerConfig.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerKeyListener.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerModifyListener.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerVerifyListener.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/SimpleNamePartitioner.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/TesterooWritableSet.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/WarningAnnotation.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/heterosyn_no_bg.gif -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/homosyn_no_bg.gif -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetContentProvider.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueEditingSupport.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/propertysheetsupport/PropertySheetValueLabelProvider.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Activator.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Application.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Perspective.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddQuickName.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddSynonymToTaxon.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionDeleteTaxon.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionMoveTaxon.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionOpenNameEditor.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionOpenNewChildNameEditor.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionPopulatePropertySheet.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionRemoveTaxonFromTree.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionSaveTaxon.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/NameTransfer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/SynonymRelationshipTransfer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/TaxonTransfer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/PropertySheetNode.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/EmptyEditorView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MoveDialogView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MultiPageTaxonView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameListView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameViewer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/PropertySheetViewer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/RecentNamesTableViewer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TaxonomicTreeViewer.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TestDragAndDrop.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/UndoView.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/AnnotationMarkerAccess.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/CompositeRectangle.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/ErrorAnnotation.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/GroupComposite.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameViewerVerifyListener.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/TesterooWritableSet.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/WarningAnnotation.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/heterosyn_no_bg.gif -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/homosyn_no_bg.gif -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetContentProvider.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetValueEditingSupport.java -text
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/PropertySheetValueLabelProvider.java -text
index 9795c7838e6de4b63a8364e83d555ecbdcae8b34..4b68c1f0cfbe10eef0bc382242109c8f70d7594d 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>eu.etaxonomy.taxeditor.prototype2</name>\r
+       <name>eu.etaxonomy.taxeditor</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r
index d1deb00575a6b5c149549aa2a7c663b578f647e0..14bc1a000c59e16176bdc83b575434f842afea24 100644 (file)
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Prototype 2
-Bundle-SymbolicName: eu.etaxonomy.taxeditor.prototype2;singleton:=true
+Bundle-SymbolicName: eu.etaxonomy.taxeditor;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: eu.etaxonomy.taxeditor.prototype2.Activator
+Bundle-Activator: eu.etaxonomy.taxeditor.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.databinding,
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.ui,
  eu.etaxonomy.cdmLibrary
 Eclipse-LazyStart: true
 Export-Package: com.swtdesigner,
- eu.etaxonomy.taxeditor.prototype2,
- eu.etaxonomy.taxeditor.prototype2.controller,
- eu.etaxonomy.taxeditor.prototype2.model,
- eu.etaxonomy.taxeditor.prototype2.view
+ eu.etaxonomy.taxeditor,
+ eu.etaxonomy.taxeditor.controller,
+ eu.etaxonomy.taxeditor.model,
+ eu.etaxonomy.taxeditor.view
 Main-Class: eu.etaxonomy.taxeditor.designproposal1.Application
index b2ed4c90f54e1e08a14510f69cd0b1b0e4cd27b0..39c92120689c4221f06a7dd7244962189db68336 100644 (file)
@@ -9,4 +9,4 @@ bin.includes = plugin.xml,\
                .project,\\r
                .classpath,\\r
                build.properties,\\r
-               eu.etaxonomy.taxeditor.prototype2.product\r
+               eu.etaxonomy.taxeditor.product\r
index 3da848dfdc90210b0a615a59646d1b6f10b030f5..8ec481f89058e12490ee62fc171cff559cd88f54 100644 (file)
@@ -7,51 +7,51 @@
          point="org.eclipse.core.runtime.applications">\r
       <application>\r
          <run\r
-               class="eu.etaxonomy.taxeditor.prototype2.Application">\r
+               class="eu.etaxonomy.taxeditor.Application">\r
          </run>\r
       </application>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.perspectives">\r
       <perspective\r
-            class="eu.etaxonomy.taxeditor.prototype2.Perspective"\r
+            class="eu.etaxonomy.taxeditor.Perspective"\r
             fixed="false"\r
-            id="eu.etaxonomy.taxeditor.prototype2.perspective"\r
+            id="eu.etaxonomy.taxeditor.perspective"\r
             name="Perspective">\r
       </perspective>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.views">\r
       <view\r
-            class="eu.etaxonomy.taxeditor.prototype2.view.NameListView"\r
+            class="eu.etaxonomy.taxeditor.view.NameListView"\r
             icon="icons/edit_16x16.gif"\r
-            id="eu.etaxonomy.taxeditor.prototype2.view.namelistview"\r
+            id="eu.etaxonomy.taxeditor.view.namelistview"\r
             name="Name List View">\r
       </view>\r
       <view\r
-            class="eu.etaxonomy.taxeditor.prototype2.view.UndoView"\r
+            class="eu.etaxonomy.taxeditor.view.UndoView"\r
             icon="icons/text.gif"\r
-            id="eu.etaxonomy.taxeditor.prototype2.view.undoview"\r
+            id="eu.etaxonomy.taxeditor.view.undoview"\r
             name="Recent Actions">\r
       </view>\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.editors">\r
       <editor\r
-            class="eu.etaxonomy.taxeditor.prototype2.view.MultiPageTaxonView"\r
+            class="eu.etaxonomy.taxeditor.view.MultiPageTaxonView"\r
             icon="icons/edit_16x16.gif"\r
-            id="eu.etaxonomy.taxeditor.prototype2.view.multipagetaxonview"\r
-            name="Multipart Test">\r
+            id="eu.etaxonomy.taxeditor.view.multipagetaxonview"\r
+            name="Multitabbed Taxon Editor">\r
       </editor>\r
       <editor\r
-            class="eu.etaxonomy.taxeditor.prototype2.view.NameEditorView"\r
+            class="eu.etaxonomy.taxeditor.view.NameEditorView"\r
             icon="icons/edit_16x16.gif"\r
-            id="eu.etaxonomy.taxeditor.prototype2.view.nameeditorview"\r
+            id="eu.etaxonomy.taxeditor.view.nameeditorview"\r
             name="New EditorPart">\r
       </editor>\r
       <editor\r
-            class="eu.etaxonomy.taxeditor.prototype2.view.EmptyEditorView"\r
-            id="eu.etaxonomy.taxeditor.prototype2.view.EmptyEditorView"\r
+            class="eu.etaxonomy.taxeditor.view.EmptyEditorView"\r
+            id="eu.etaxonomy.taxeditor.view.EmptyEditorView"\r
             name="New EditorPart">\r
       </editor>\r
    </extension>\r
@@ -59,8 +59,8 @@
          id="product"\r
          point="org.eclipse.core.runtime.products">\r
       <product\r
-            application="eu.etaxonomy.taxeditor.prototype2.application"\r
-            name="EDIT Taxonomic Editor - Prototype 2">\r
+            application="eu.etaxonomy.taxeditor.application"\r
+            name="EDIT Taxonomic Editor">\r
          <property\r
                name="appName"\r
                value="EDIT Taxonomic Editor - Prototype 2">\r
similarity index 95%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Activator.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Activator.java
index 16d58fca1afc218313b2c89d1cec5f33306036f5..62d9f33c78058c43d9980fa66e92ccd38e528844 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2;\r
+package eu.etaxonomy.taxeditor;\r
 \r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.set.WritableSet;\r
@@ -22,7 +22,7 @@ public class Activator extends AbstractUIPlugin {
        /**\r
         * The plug-in ID\r
         */\r
-       public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.prototype2.activator";\r
+       public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.activator";\r
        /**\r
         * The shared instance\r
         */     \r
similarity index 96%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Application.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Application.java
index b06f3915bfb75e5372a5ff69dad39ec02248a516..96016ec0a188fa01d9df6901d9fca50cd4d0afb3 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2;
+package eu.etaxonomy.taxeditor;
 
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
similarity index 93%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationActionBarAdvisor.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
index 56719978c7f2afd6b5be1eb09e8952866a98c140..c645460c0c937bfa8db5f8771033a9029a8950d0 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2;
+package eu.etaxonomy.taxeditor;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
@@ -9,7 +9,7 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNameEditor;
+import eu.etaxonomy.taxeditor.controller.ActionOpenNameEditor;
 
 /**
  * An action bar advisor is responsible for creating, adding, and disposing of
similarity index 87%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/ApplicationWorkbenchAdvisor.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
index 70b9b972b76872f2a5a469c34a5749c566e7896c..c17b4289fa163c410e1c30fec25bc29e89f9aa83 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2;
+package eu.etaxonomy.taxeditor;
 
 import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
@@ -7,7 +7,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
-       private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.prototype2.perspective";
+       private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.perspective";
 
        public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
                        IWorkbenchWindowConfigurer configurer) {
@@ -23,7 +23,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
                
                // Remembers the user's layout and window size 
                //  for the next time application is started
-               configurer.setSaveAndRestore(true);             
+//             configurer.setSaveAndRestore(true);             
        }
 
 }
similarity index 75%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/Perspective.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/Perspective.java
index b3b78913d7ad7221379f030351ca453d4f6afe83..f7a6478173cc181c3809989226234c90ec885d2d 100644 (file)
@@ -1,13 +1,13 @@
-package eu.etaxonomy.taxeditor.prototype2;
+package eu.etaxonomy.taxeditor;
 
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
-import eu.etaxonomy.taxeditor.prototype2.view.NameListView;
+import eu.etaxonomy.taxeditor.view.NameListView;
 
 public class Perspective implements IPerspectiveFactory {
 
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.perspective";
+       public static final String ID = "eu.etaxonomy.taxeditor.perspective";
        
        public void createInitialLayout(IPageLayout layout) {
                String editorArea = layout.getEditorArea();
similarity index 82%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddQuickName.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddQuickName.java
index f579352c0f262c2c8f6db10db8734811361157e0..ee1c2c170921c7278e9dfd18644bac6297c3d60f 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 import org.eclipse.ui.PlatformUI;\r
@@ -6,9 +6,9 @@ import org.eclipse.ui.PlatformUI;
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameListView;\r
-import eu.etaxonomy.taxeditor.prototype2.view.TaxonomicTreeViewer;\r
+import eu.etaxonomy.taxeditor.Activator;\r
+import eu.etaxonomy.taxeditor.view.NameListView;\r
+import eu.etaxonomy.taxeditor.view.TaxonomicTreeViewer;\r
 \r
 /**\r
  * Open up a celleditor in the taxonomic tree \r
similarity index 84%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionAddSynonymToTaxon.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionAddSynonymToTaxon.java
index e7d9e51cc9d56ed823e212860aea6a5032a2b15c..d4da8cb28d8ab8a958ff71c21ab4ff7142a38598 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 \r
@@ -6,7 +6,7 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.TesterooWritableSet;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.TesterooWritableSet;\r
 \r
 /**\r
  * Add a new synonym to a taxon.\r
similarity index 86%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionMoveTaxon.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionMoveTaxon.java
index ce0e23c3befe538bc25d7f72bd23145ddfe52954..8303314928cc30f03ad48060ab554ab444a8859e 100644 (file)
@@ -1,9 +1,9 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 /**\r
  * Moves taxon in the taxonomic tree by assigning it a new parent\r
similarity index 74%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionOpenNameEditor.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionOpenNameEditor.java
index ad5e147f5c5bb8d46232f042d942f66019edd34c..ad7ace932f2f61ca9413613daebf8b6533460c88 100644 (file)
@@ -1,4 +1,4 @@
-       package eu.etaxonomy.taxeditor.prototype2.controller;\r
+       package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 import org.eclipse.ui.IEditorInput;\r
@@ -8,11 +8,11 @@ import org.eclipse.ui.PlatformUI;
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.model.NameEditorInput;\r
-import eu.etaxonomy.taxeditor.prototype2.view.MultiPageTaxonView;\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameListView;\r
-import eu.etaxonomy.taxeditor.prototype2.view.TaxonomicTreeViewer;\r
+import eu.etaxonomy.taxeditor.Activator;\r
+import eu.etaxonomy.taxeditor.view.MultiPageTaxonView;\r
+import eu.etaxonomy.taxeditor.model.NameEditorInput;\r
+import eu.etaxonomy.taxeditor.view.NameListView;\r
+import eu.etaxonomy.taxeditor.view.TaxonomicTreeViewer;\r
 \r
 /**\r
  * Opens a name editor for an existing or new taxon\r
@@ -23,7 +23,7 @@ import eu.etaxonomy.taxeditor.prototype2.view.TaxonomicTreeViewer;
 public class ActionOpenNameEditor extends Action {\r
 \r
        private Taxon taxon;\r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.controller.opennameeditoraction"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.controller.opennameeditoraction"; //$NON-NLS-1$\r
        \r
        public ActionOpenNameEditor(Taxon taxon) {\r
                this.taxon = taxon;\r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 \r
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 public class ActionOpenNewChildNameEditor extends Action {\r
 \r
        private Taxon taxon;\r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.controller.opennameeditoraction"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.controller.opennameeditoraction"; //$NON-NLS-1$\r
        \r
        public ActionOpenNewChildNameEditor(Taxon parentTaxon) {\r
                \r
@@ -1,9 +1,9 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 /**\r
  * Remove a Taxon from the tree without removing it from\r
similarity index 87%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/controller/ActionSaveTaxon.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/controller/ActionSaveTaxon.java
index bfd1df2dc1e11455d01f86e5188d23393b3b45b5..d9845e016f1b0c831fcc755186c5099e951ea156 100644 (file)
@@ -1,9 +1,9 @@
-package eu.etaxonomy.taxeditor.prototype2.controller;\r
+package eu.etaxonomy.taxeditor.controller;\r
 \r
 import org.eclipse.jface.action.Action;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 /**\r
  * Commit any changes to this taxon to the CDM\r
similarity index 94%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/model/NameTreeContentProvider.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTreeContentProvider.java
index 45ae1ac98d7ff0c429038ad566e17a73d88ed65b..76b3c1b7aec74a8caabacc4778d7116143a38ec0 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import java.util.Set;\r
 \r
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.view.TaxonomicTreeViewer;\r
+import eu.etaxonomy.taxeditor.view.TaxonomicTreeViewer;\r
 \r
 /**\r
  * Adds tree functionality (get parent, get children) to ObservableListContentProvider;\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/AcceptedNameViewer.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/AcceptedNameViewer.java
deleted file mode 100644 (file)
index 67c32eb..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import org.eclipse.core.databinding.DataBindingContext;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.layout.GridData;\r
-import org.eclipse.swt.widgets.Composite;\r
-\r
-import com.swtdesigner.SWTResourceManager;\r
-\r
-public class AcceptedNameViewer extends NameViewer_ {\r
-\r
-       AcceptedNameViewer(TaxonName taxonName, DataBindingContext bindingContext,\r
-                       Composite parent) {\r
-               super(taxonName, bindingContext, parent);\r
-               setViewerLayout();\r
-       }\r
-       \r
-       private void setViewerLayout() {\r
-               styledText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));\r
-               styledText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));                \r
-       }\r
-\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/CarduusEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/CarduusEditorView.java
deleted file mode 100644 (file)
index ea780f6..0000000
+++ /dev/null
@@ -1,471 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import java.beans.PropertyChangeEvent;\r
-\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.source.SourceViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.events.FocusListener;\r
-import org.eclipse.swt.events.MouseEvent;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.events.SelectionListener;\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.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Menu;\r
-import org.eclipse.swt.widgets.MenuItem;\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.swt.widgets.Text;\r
-import org.eclipse.swt.widgets.ToolBar;\r
-import org.eclipse.swt.widgets.ToolItem;\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
-import com.swtdesigner.ResourceManager;\r
-import com.swtdesigner.SWTResourceManager;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionSaveTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.MySourceViewerConfig;\r
-\r
-//public class CarduusEditorView extends EditorPart implements ICdmEventListener {\r
-public class CarduusEditorView extends EditorPart {\r
-\r
-       private Table table_1;\r
-       private Text carduusLSpText;\r
-       private StyledText styledText;\r
-       private TaxonName taxonname;\r
-\r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.carduuseditorview"; //$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
-               //\r
-               \r
-               \r
-//             txtPlay = new Text(container, SWT.BORDER);\r
-//             txtPlay.setCapture(true);\r
-//             final GridData gd_txtPlay = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);\r
-//             gd_txtPlay.heightHint = 96;\r
-//             txtPlay.setLayoutData(gd_txtPlay);\r
-////           txtPlay.addVerifyListener(new VerifyListener() {\r
-////                   @Override\r
-////                   public void verifyText(VerifyEvent e) {\r
-////                   e.doit = Character.isDigit(e.character);\r
-////               }           \r
-////           });\r
-//             txtPlay.addSelectionListener(new SelectionListener() {\r
-//\r
-//                     @Override\r
-//                     public void widgetDefaultSelected(SelectionEvent e) {\r
-//                             // TODO Auto-generated method stub\r
-//                             \r
-//                     }\r
-//\r
-//                     @Override\r
-//                     public void widgetSelected(SelectionEvent e) {\r
-//                             System.out.println(e.toString());\r
-//                     }\r
-//                     \r
-//                     \r
-//             });\r
-//             \r
-//             \r
-//             txtPlay.addKeyListener(new KeyListener() {\r
-//\r
-//                     public void keyPressed(KeyEvent e) {\r
-//                             System.out.println(e.character);\r
-//                             if (e.character == '=') {\r
-//                                     Shell shell = Activator.getDefault().getWorkbench().\r
-//                                             getActiveWorkbenchWindow().getShell();\r
-//                                     PopupList list = new PopupList(shell, SWT.H_SCROLL | SWT.V_SCROLL);\r
-//                                     \r
-////                                   Combo list = new Combo(shell, SWT.H_SCROLL | SWT.V_SCROLL);\r
-//                                     \r
-//                                     // Add the items to the list\r
-//                                     String[] OPTIONS = { "Create homo. syn.",\r
-//                                                     "Create hetero. syn.",\r
-//                                                     "Create mis. name",\r
-//                                                     "Create homonym"};\r
-//\r
-//                                     list.setItems(OPTIONS);\r
-//                                     \r
-//                                     // Open the list and get the selected item\r
-//                                     String selected = list.open(txtPlay.getBounds());\r
-//                                     \r
-//                                     // Print the item to the console\r
-//                                     System.out.println(selected);                                   \r
-//                             }\r
-//                             \r
-//                     }\r
-//\r
-//                     public void keyReleased(KeyEvent e) {\r
-//                             // TODO Auto-generated method stub\r
-//                             \r
-//                     }\r
-//             });\r
-               parent.setLayout(new GridLayout());\r
-               Document doc = new Document("");\r
-\r
-               final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);\r
-               taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));\r
-               taxonomicallyIncludedInLabel.setText("Higher taxon: \"Cardueae Cass.\"");\r
-\r
-               final ToolBar toolBar = new ToolBar(parent, SWT.NONE);\r
-//             toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-\r
-               final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);\r
-               itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemSave.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/save.gif"));\r
-               itemSave.addSelectionListener(new SelectionListener() {\r
-                       public void mouseDown(final MouseEvent e) {\r
-                               \r
-//                             taxonname.setGenus(txtGenus.getText());\r
-//                             taxonname.setSpecificEpithet(txtSpEpi.getText());\r
-                               \r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-\r
-                       public void widgetDefaultSelected(SelectionEvent e) {\r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-\r
-                       public void widgetSelected(SelectionEvent e) {\r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-               });\r
-\r
-               final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemMove.addSelectionListener(new SelectionAdapter() {\r
-                       public void widgetSelected(final SelectionEvent e) {\r
-                       }\r
-               });\r
-               \r
-               final Menu menuMove = new Menu(toolBar);\r
-               menuMove.setData("x", null);\r
-               addDropDown(itemMove, menuMove);\r
-\r
-               final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
-               moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");\r
-\r
-               final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
-               turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");\r
-               \r
-//             });\r
-//             newItemToolItem.setText("New item");\r
-               itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));\r
-\r
-               final ToolItem itemDelete = new ToolItem(toolBar, SWT.NONE);\r
-               itemDelete.setToolTipText("Delete taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemDelete.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
-                               \r
-               final ToolItem separator1 = new ToolItem(toolBar, SWT.SEPARATOR);\r
-\r
-               final ToolItem itemAddRelationship = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemAddRelationship.setToolTipText("Add nom. or tax. relation to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemAddRelationship.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/rel_no_bg.gif"));\r
-               \r
-               final Menu menuAddRel = new Menu(toolBar);\r
-               menuAddRel.setData("x", null);\r
-               addDropDown(itemAddRelationship, menuAddRel);\r
-\r
-               final MenuItem testMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               testMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
-               testMenuItem.setText("Add synonymy (type unknown)");\r
-\r
-               final MenuItem addHomotypicSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHomotypicSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
-               addHomotypicSynonymMenuItem.setText("Add homotypic synonym");\r
-\r
-               final MenuItem addHeterotypicSynoynmMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHeterotypicSynoynmMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
-               addHeterotypicSynoynmMenuItem.setText("Add heterotypic synoynm");\r
-\r
-               final MenuItem addBasionymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addBasionymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
-               addBasionymMenuItem.setText("Add basionym");\r
-\r
-               final MenuItem addReplacedSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addReplacedSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
-               addReplacedSynonymMenuItem.setText("Add replaced synonym");\r
-\r
-               final MenuItem addHomonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHomonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));\r
-               addHomonymMenuItem.setText("Add homonym");\r
-\r
-               final MenuItem addOrthographicVariantMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addOrthographicVariantMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));\r
-               addOrthographicVariantMenuItem.setText("Add orthographic variant");\r
-\r
-               final MenuItem addMisappliedNameMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addMisappliedNameMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));\r
-               addMisappliedNameMenuItem.setText("Add misapplied name");\r
-\r
-               final MenuItem addConceptRelationMenuItem_1 = new MenuItem(menuAddRel, SWT.CASCADE);\r
-               addConceptRelationMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));\r
-               addConceptRelationMenuItem_1.setText("Add concept relation");\r
-\r
-               final Menu menu = new Menu(addConceptRelationMenuItem_1);\r
-               addConceptRelationMenuItem_1.setMenu(menu);\r
-\r
-               final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem.setText("congruent");\r
-\r
-               final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_1.setSelection(true);\r
-               checkboxMenuItem_1.setText("included in");\r
-\r
-               final MenuItem checkboxMenuItem_2 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_2.setText("includes");\r
-\r
-               final MenuItem checkboxMenuItem_3 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_3.setText("overlaps");\r
-\r
-               final MenuItem checkboxMenuItem_4 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_4.setText("excludes");\r
-\r
-               final MenuItem checkboxMenuItem_5 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_5.setSelection(true);\r
-               checkboxMenuItem_5.setText("doubtful");\r
-               \r
-               final ToolItem separator2 = new ToolItem(toolBar, SWT.SEPARATOR);\r
-\r
-               final ToolItem itemAddTaxon = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemAddTaxon.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/add_no_bg2.gif"));\r
-               itemAddTaxon.setToolTipText("Add new taxon");\r
-\r
-               final Menu menuAdd = new Menu(toolBar);\r
-               menuAdd.setData("x", null);\r
-               addDropDown(itemAddTaxon, menuAdd);\r
-\r
-               final MenuItem addTaxonToMenuItem = new MenuItem(menuAdd, SWT.NONE);\r
-               addTaxonToMenuItem.setText("Add new taxon to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-\r
-               final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);\r
-               addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");\r
-\r
-               final Composite composite = new Composite(parent, SWT.NONE);\r
-               composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));\r
-               composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               final GridLayout gridLayout_2 = new GridLayout();\r
-               gridLayout_2.marginWidth = 0;\r
-               gridLayout_2.marginHeight = 0;\r
-//             gridLayout_2.horizontalSpacing = 3;\r
-               gridLayout_2.numColumns = 2;\r
-               composite.setLayout(gridLayout_2);\r
-\r
-               carduusLSpText = new Text(composite, SWT.WRAP);\r
-               carduusLSpText.setText("Carduus L., Sp. Pl.: 820. 1753");\r
-               carduusLSpText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));\r
-               final GridData gd_carduusLSpText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_carduusLSpText.verticalIndent = 2;\r
-               gd_carduusLSpText.heightHint = 169;\r
-               gd_carduusLSpText.horizontalIndent = 2;\r
-               carduusLSpText.setLayoutData(gd_carduusLSpText);\r
-               carduusLSpText.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               carduusLSpText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               carduusLSpText.setBackground(null);                             \r
-                       }\r
-\r
-               });\r
-\r
-               table_1 = new Table(composite, SWT.BORDER);\r
-               table_1.setLinesVisible(true);\r
-               table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 2));\r
-\r
-               final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);\r
-               newColumnTableColumn.setMoveable(true);\r
-               newColumnTableColumn.setWidth(100);\r
-               newColumnTableColumn.setText("New column");\r
-\r
-               final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);\r
-               newColumnTableColumn_1.setMoveable(true);\r
-               newColumnTableColumn_1.setWidth(100);\r
-               newColumnTableColumn_1.setText("New column");\r
-\r
-               final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem.setText(0, "Rank");\r
-               newItemTableItem.setText(1, "genus");\r
-               newItemTableItem.setText("Rank");\r
-               \r
-               final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_1.setText(1, "Carduus");\r
-               newItemTableItem_1.setText(0, "Genus");\r
-\r
-               final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_2.setText(0, "Species epithet");\r
-\r
-               final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_3.setText(1, "L.");\r
-               newItemTableItem_3.setText(0, "Author team");\r
-\r
-               final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_4.setText("...");\r
-//             newItemTableItem_2.setText("Species epithet");\r
-//             newItemTableItem_1.setText("Genus");\r
-               //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-\r
-               SourceViewer sourceviewer = new SourceViewer(composite, null, SWT.WRAP | SWT.FULL_SELECTION | SWT.SINGLE);\r
-               sourceviewer.setAnnotationHover(null);\r
-               styledText = sourceviewer.getTextWidget();\r
-               styledText.setIndent(2);\r
-               final GridData gd_styledText = new GridData(SWT.FILL, SWT.FILL, true, true);\r
-//             gd_styledText.heightHint = 41;\r
-//             gd_styledText.widthHint = 450;\r
-               styledText.setLayoutData(gd_styledText);\r
-               sourceviewer.setDocument(doc);\r
-               sourceviewer.configure(new MySourceViewerConfig());\r
-               sourceviewer.setTabsToSpacesConverter(null);\r
-\r
-               \r
-//             final Menu menu = new Menu(toolBar);\r
-//             addDropDown(newItemToolItem, menu);\r
-//             );\r
-               \r
-//             Action testAction = new ActionOpenNameEditor();\r
-//             testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));\r
-//             testAction.setToolTipText("Add relation");\r
-//             toolBar.add(testAction);\r
-               \r
-               populateForm();         \r
-       }\r
-\r
-//     private void populateForm() {\r
-//             \r
-//             String fulltext = "";\r
-//             \r
-//             if (taxonname.getGenus() != null) {\r
-//                     fulltext = taxonname.getGenus();\r
-//             }\r
-//\r
-//             if (taxonname.getSpecificEpithet() != null) {\r
-//                     fulltext += " " + taxonname.getSpecificEpithet();\r
-//             }\r
-//\r
-//             if (taxonname.getAuthorship() != null) {\r
-//                     fulltext += " " + taxonname.getAuthorship();\r
-//             }\r
-//             \r
-////           txtPlay.setText(fulltext);\r
-////           txtPlay.setToolTipText("Joe mama\njoe daddy\njoe gramammy");\r
-//             \r
-//             this.setPartName(taxonname.getName());\r
-//     }\r
-\r
-       private void populateForm() {\r
-               this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");\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) throws PartInitException {\r
-\r
-               if (!(input instanceof IEditorInput))\r
-                       throw new PartInitException(\r
-                                       "Invalid Input: Must be IFileEditorInput");\r
-               \r
-               if (input.getAdapter(TaxonName.class) != null) {\r
-                       taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-//                     taxonname.addCdmEventListener(this);\r
-               } else {\r
-                       \r
-                       taxonname = null;\r
-               }\r
-               \r
-               setSite(site);\r
-               setInput(input);\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
-       public void propertyChange(PropertyChangeEvent evt) {\r
-//             TaxonName taxonname = (TaxonName)evt.getNewValue();\r
-               this.taxonname = (TaxonName)evt.getNewValue();\r
-               System.out.println(((TaxonName)evt.getNewValue()).getName());\r
-               populateForm();\r
-               \r
-               // for individual fields, do something like:\r
-               //      if (evt.getPropertyName().equalsIgnoreCase("genus"))\r
-               //              txtGenus.setText ...\r
-       }\r
-\r
-//     public void onDelete(ICdmEventListenerRegistration arg0) {\r
-//             // TODO Auto-generated method stub\r
-//             \r
-//     }\r
-\r
-       public void onInsert(Object arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-       public void onLoad(Object arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
-//             // TODO Auto-generated method stub\r
-//             \r
-//     }\r
-       \r
-       private static void addDropDown(final ToolItem item, final Menu menu) {\r
-               item.addListener(SWT.Selection, new Listener() {\r
-                       public void handleEvent(Event event) {\r
-                               if (event.detail == SWT.ARROW) {\r
-                                       Rectangle rect = item.getBounds();\r
-                                       Point pt = new Point(rect.x, rect.y + rect.height);\r
-                                       pt = item.getParent().toDisplay(pt);\r
-                                       menu.setLocation(pt.x, pt.y);\r
-                                       menu.setVisible(true);\r
-                               }\r
-                       }\r
-               });\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EditNameProperties.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EditNameProperties.java
deleted file mode 100644 (file)
index c537fb9..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.ui.dialogs.PropertyPage;\r
-\r
-public class EditNameProperties extends PropertyPage {\r
-\r
-       /**\r
-        * Create the property page\r
-        */\r
-       public EditNameProperties() {\r
-               super();\r
-       }\r
-\r
-       /**\r
-        * Create contents of the property page\r
-        * @param parent\r
-        */\r
-       @Override\r
-       public Control createContents(Composite parent) {\r
-               Composite container = new Composite(parent, SWT.NULL);\r
-               //\r
-               return container;\r
-       }\r
-\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer_.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer_.java
deleted file mode 100644 (file)
index 79c3f19..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import java.beans.PropertyChangeListener;\r
-import java.beans.PropertyChangeSupport;\r
-import java.util.List;\r
-import java.util.Scanner;\r
-\r
-import org.eclipse.core.databinding.Binding;\r
-import org.eclipse.core.databinding.DataBindingContext;\r
-import org.eclipse.core.databinding.beans.BeansObservables;\r
-import org.eclipse.core.databinding.observable.value.IObservableValue;\r
-import org.eclipse.core.resources.IMarker;\r
-import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.jface.text.BadLocationException;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.IDocumentPartitioner;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.jface.text.Position;\r
-import org.eclipse.jface.text.TypedRegion;\r
-import org.eclipse.jface.text.rules.DefaultPartitioner;\r
-import org.eclipse.jface.text.rules.FastPartitioner;\r
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;\r
-import org.eclipse.jface.text.source.Annotation;\r
-import org.eclipse.jface.text.source.AnnotationModel;\r
-import org.eclipse.jface.text.source.AnnotationPainter;\r
-import org.eclipse.jface.text.source.IAnnotationAccess;\r
-import org.eclipse.jface.text.source.IAnnotationAccessExtension;\r
-import org.eclipse.jface.text.source.ImageUtilities;\r
-import org.eclipse.jface.text.source.SourceViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.StyleRange;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.events.FocusListener;\r
-import org.eclipse.swt.events.KeyAdapter;\r
-import org.eclipse.swt.events.KeyEvent;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.GC;\r
-import org.eclipse.swt.graphics.Image;\r
-import org.eclipse.swt.graphics.RGB;\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.Display;\r
-\r
-import com.swtdesigner.SWTResourceManager;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.AnnotationMarkerAccess;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.ErrorAnnotation;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.NamePartitionScanner_;\r
-\r
-/**\r
- * Creates zero-length fieldPartitions for Genus, Specific Epithet, etc., then fills them\r
- *  as data is added. \r
- *  \r
- * Partition data are bound to their respective model properties.\r
- * \r
- * @author p.ciardelli\r
- *\r
- */\r
-/**\r
- * @author p.ciardelli\r
- *\r
- */\r
-public class NameViewer_ extends SourceViewer {\r
-       \r
-       final Document document;\r
-       final IDocumentPartitioner partitioner;\r
-       private TaxonName taxonName;\r
-       private DataBindingContext bindingContext;\r
-       protected Composite parent;\r
-       \r
-       private BoundPartition[] fieldPartitions;\r
-       \r
-       StyledText styledText;\r
-\r
-    // error identifiers, images and colors\r
-    public static String ERROR_TYPE = "error.type";\r
-    public static Image ERROR_IMAGE;\r
-    public static final RGB ERROR_RGB = new RGB(255, 0, 0);\r
-    \r
-    // annotation model\r
-    private AnnotationModel fAnnotationModel = new AnnotationModel();    \r
-       \r
-       NameViewer_(TaxonName taxonName, DataBindingContext bindingContext, Composite parent) {\r
-               super(parent, null, SWT.WRAP | SWT.MULTI | SWT.RESIZE); // null -> no vertical ruler\r
-               \r
-               this.taxonName = taxonName;\r
-               this.bindingContext = bindingContext;\r
-               this.parent = parent;\r
-                               \r
-        Assert.isNotNull(bindingContext,\r
-               "NameViewer_'s binding context must be explicitly set.");\r
-               \r
-               fieldPartitions = new BoundPartition[] {\r
-                               new BoundPartition("genus", SWT.ITALIC),\r
-                               new BoundPartition("specificEpithet", SWT.BOLD)\r
-               };\r
-               \r
-               document = new Document(taxonName.getGenus() + " " + taxonName.getSpecificEpithet());\r
-               \r
-               partitioner = new NamePartitioner(new NamePartitionScanner_(),\r
-                               NamePartitionScanner_.PARTITION_TYPES);\r
-               \r
-               partitioner.connect(document);\r
-               document.setDocumentPartitioner(partitioner);\r
-\r
-               this.setDocument(document, fAnnotationModel); // put this back in nameeditorview so that it functions more like TextViewer\r
-                       \r
-               styledText = this.getTextWidget();\r
-//             styledText.setIndent(8);\r
-               styledText.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               ((StyledText) e.widget).setBackground((Display.getCurrent().getSystemColor(SWT.COLOR_GRAY)));\r
-                               \r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               ((StyledText) e.widget).setBackground((Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)));\r
-                       }\r
-                       \r
-               });\r
-               \r
-               // annotations section\r
-               IAnnotationAccess fAnnotationAccess = new AnnotationMarkerAccess();\r
-               \r
-               // to paint the annotations\r
-        AnnotationPainter ap = new AnnotationPainter(this, fAnnotationAccess);\r
-        ap.addAnnotationType(ERROR_TYPE);\r
-        ap.setAnnotationTypeColor(ERROR_TYPE, new Color(Display.getDefault(), ERROR_RGB));\r
-\r
-        // this will draw the squigglies under the text\r
-        this.addPainter(ap);\r
-        \r
-        // add an annotation\r
-        ErrorAnnotation errorAnnotation = new ErrorAnnotation(1, "Learn how to spell \"text!\"");\r
-\r
-        // lets underline the word "texst"\r
-        fAnnotationModel.addAnnotation(errorAnnotation, new Position(1, 5));\r
-                               \r
-       };\r
-\r
-       \r
-       /**\r
-        * Separate out properties that are different for accepted and related names \r
-        */\r
-       private void setViewerLayoutExtras() {\r
-               styledText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));\r
-               styledText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));                \r
-       }\r
-\r
-       public void setBindingContext(DataBindingContext bindingContext) {\r
-               this.bindingContext = bindingContext;\r
-       }\r
-       \r
-       class NamePartitioner extends FastPartitioner {\r
-\r
-               List<ITypedRegion> wordPartitions;\r
-\r
-               public NamePartitioner(IPartitionTokenScanner scanner,\r
-                               String[] legalContentTypes) {\r
-                       super(scanner, legalContentTypes);\r
-               }\r
-               \r
-               public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) {\r
-\r
-                       int fieldIndex = 0;\r
-                       \r
-//                     System.out.print("Start re-partition at: " + offset + " -");\r
-//                     for (int i = 0; i < fieldPartitions.length; i++) {\r
-//                             System.out.print(" " + fieldPartitions[i].getOffset());\r
-//                     }\r
-//                     System.out.println();\r
-//                                             \r
-//                     // find where the affected partitions begin\r
-//                     while (fieldPartitions[fieldIndex].getOffset() < offset) {\r
-//                             System.out.println(fieldPartitions[fieldIndex].getOffset() + " " + offset);\r
-//                             fieldIndex++;\r
-//                     }\r
-                       \r
-//                     ITypedRegion[] regions = super.computePartitioning(offset, document.getLength() - offset, \r
-//                                     includeZeroLengthPartitions);\r
-                       ITypedRegion[] regions = super.computePartitioning(0, document.getLength(), \r
-                                       includeZeroLengthPartitions);   \r
-                       \r
-                       for (int i = 0; i < regions.length; i++) {\r
-                               if (regions[i].getType() == NamePartitionScanner_.SINGLE_WORD) {\r
-                                       // for now, assign first word to first fieldPartition, etc.\r
-                                       fieldPartitions[fieldIndex].setRegion(regions[i]);\r
-                                       fieldIndex++;\r
-                               }\r
-                       }       \r
-                       \r
-                       // put zero-length regions in remaining fieldPartitions \r
-                       for (int i = fieldIndex; i < fieldPartitions.length; i++) {\r
-                               fieldPartitions[fieldIndex].setRegion(\r
-                                               new TypedRegion(document.getLength(), 0, \r
-                                                               NamePartitionScanner_.SINGLE_WORD));\r
-                       } \r
-                       return regions;\r
-               }\r
-               \r
-               \r
-               public void connect(IDocument document, boolean delayInitialise)\r
-               {\r
-                       super.connect(document, delayInitialise);\r
-//                     computePartitioning(0, document.getLength(), false);\r
-               }               \r
-       }\r
-       \r
-       class BoundPartition {\r
-               private ITypedRegion region;\r
-               private Binding binding;\r
-               private String field; // the name field to track\r
-               private String value; // the current value in this partition\r
-               private int length;\r
-               private int offset;\r
-               private StyleRange style = new StyleRange();\r
-                               \r
-               BoundPartition (String field) {\r
-                       this.field = field;\r
-                       this.length = 0;\r
-                       this.offset = 0;\r
-                       \r
-                       bindPartition();\r
-               }\r
-\r
-               BoundPartition (String field, int fontStyle) {\r
-                       this(field);\r
-                       style.fontStyle = fontStyle;\r
-               }\r
-               \r
-               private void bindPartition() {\r
-                       IObservableValue observePartitionValue =\r
-                                       BeansObservables.observeValue(this, "text");\r
-                       IObservableValue observeModelValue =\r
-                                       BeansObservables.observeValue(taxonName, field);                        \r
-                       this.binding = bindingContext.bindValue(\r
-                                       observePartitionValue, observeModelValue, \r
-                                       null, null);    \r
-               }\r
-               \r
-               public void setRegion (ITypedRegion region) {\r
-                       this.region = region;\r
-                       this.length = region.getLength();\r
-                       this.offset = region.getOffset();\r
-                                               \r
-                       String oldValue = this.value; \r
-                       try {\r
-                               this.value = document.get(this.offset, this.length);\r
-                       } catch (BadLocationException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
-                       }\r
-                       firePropertyChange("text",oldValue,this.value);\r
-\r
-                       this.style.start = this.offset;\r
-                       this.style.length = this.length;\r
-                       styledText.setStyleRange(this.style);\r
-               }\r
-               \r
-               public int getLength () {\r
-                       return this.length;\r
-               }\r
-               \r
-               public int getOffset () {\r
-                       return this.offset;\r
-               }\r
-               \r
-               public void setText(String newText) {\r
-                       try {\r
-                               document.replace(region.getOffset(), region.getLength(), newText);\r
-                       } catch (BadLocationException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
-                       }\r
-               }\r
-               \r
-               public String getText() {\r
-                       return this.value;\r
-               }\r
-               \r
-               protected final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);\r
-               public void addPropertyChangeListener(PropertyChangeListener listener) {\r
-                       propertyChangeSupport.addPropertyChangeListener(listener);\r
-               }\r
-\r
-               public void addPropertyChangeListener(String propertyName,\r
-                               PropertyChangeListener listener) {\r
-                       propertyChangeSupport.addPropertyChangeListener(propertyName, listener);\r
-               }\r
-\r
-               public void removePropertyChangeListener(PropertyChangeListener listener) {\r
-                       propertyChangeSupport.removePropertyChangeListener(listener);\r
-               }\r
-\r
-               public void removePropertyChangeListener(String propertyName,\r
-                               PropertyChangeListener listener) {\r
-                       propertyChangeSupport.removePropertyChangeListener(propertyName,\r
-                                       listener);\r
-               }\r
-\r
-               protected void firePropertyChange(String propertyName, Object oldValue,\r
-                               Object newValue) {\r
-                       propertyChangeSupport.firePropertyChange(propertyName, oldValue,\r
-                                       newValue);\r
-               }\r
-\r
-//             public StyleRange getStyle() {\r
-//                     return style;\r
-//             }\r
-//\r
-//             public void setStyle(StyleRange style) {\r
-//                     this.style = style;\r
-//             }\r
-       }\r
-       \r
-//    class AnnotationMarkerAccess implements IAnnotationAccess, IAnnotationAccessExtension {\r
-//        public Object getType(Annotation annotation) {\r
-//            return annotation.getType();\r
-//        }\r
-//\r
-//        public boolean isMultiLine(Annotation annotation) {\r
-//            return true;\r
-//        }\r
-//\r
-//        public boolean isTemporary(Annotation annotation) {\r
-//            return !annotation.isPersistent();\r
-//        }\r
-//\r
-//        public String getTypeLabel(Annotation annotation) {\r
-//            if (annotation instanceof ErrorAnnotation)\r
-//                return "Errors";\r
-//\r
-//            return null;\r
-//        }\r
-//\r
-//        public int getLayer(Annotation annotation) {\r
-//            if (annotation instanceof ErrorAnnotation)\r
-//                return ((ErrorAnnotation)annotation).getLayer();\r
-//\r
-//            return 0;\r
-//        }\r
-//\r
-//        public void paint(Annotation annotation, GC gc, Canvas canvas, Rectangle bounds) {\r
-//            ImageUtilities.drawImage(((ErrorAnnotation)annotation).getImage(), \r
-//                     gc, canvas, bounds, SWT.CENTER, SWT.TOP);\r
-//        }\r
-//\r
-//        public boolean isPaintable(Annotation annotation) {\r
-//            if (annotation instanceof ErrorAnnotation)\r
-//                return ((ErrorAnnotation)annotation).getImage() != null;\r
-//\r
-//            return false;\r
-//        }\r
-//\r
-//        public boolean isSubtype(Object annotationType, Object potentialSupertype) {\r
-//            if (annotationType.equals(potentialSupertype))\r
-//                return true;\r
-//\r
-//            return false;\r
-//\r
-//        }\r
-//\r
-//        public Object[] getSupertypes(Object annotationType) {\r
-//            return new Object[0];\r
-//        }\r
-//    }\r
-    \r
-    // one error annotation\r
-//    class ErrorAnnotation extends Annotation {\r
-//        private IMarker marker;\r
-//        private String text;\r
-//        private int line;\r
-//        private Position position;\r
-//\r
-//        public ErrorAnnotation(IMarker marker) {\r
-//            this.marker = marker;\r
-//        }\r
-//\r
-//        public ErrorAnnotation(int line, String text) {\r
-//            super(ERROR_TYPE, true, null);\r
-//            this.marker = null;\r
-//            this.line = line;\r
-//            this.text = text;\r
-//        }\r
-//\r
-//        public IMarker getMarker() {\r
-//            return marker;\r
-//        }\r
-//\r
-//        public int getLine() {\r
-//            return line;\r
-//        }\r
-//\r
-//        public String getText() {\r
-//            return text;\r
-//        }\r
-//\r
-//        public Image getImage() {\r
-//            return ERROR_IMAGE;\r
-//        }\r
-//\r
-//        public int getLayer() {\r
-//            return 3;\r
-//        }\r
-//\r
-//        public String getType() {\r
-//            return ERROR_TYPE;\r
-//        }\r
-//\r
-//        public Position getPosition() {\r
-//            return position;\r
-//        }\r
-//\r
-//        public void setPosition(Position position) {\r
-//            this.position = position;\r
-//        }\r
-//    }    \r
-    \r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PilosellaEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PilosellaEditorView.java
deleted file mode 100644 (file)
index e288ba1..0000000
+++ /dev/null
@@ -1,651 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import java.beans.PropertyChangeEvent;\r
-\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.source.SourceViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.events.FocusListener;\r
-import org.eclipse.swt.events.MouseEvent;\r
-import org.eclipse.swt.events.SelectionAdapter;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.events.SelectionListener;\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.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Menu;\r
-import org.eclipse.swt.widgets.MenuItem;\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.swt.widgets.Text;\r
-import org.eclipse.swt.widgets.ToolBar;\r
-import org.eclipse.swt.widgets.ToolItem;\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
-import com.swtdesigner.ResourceManager;\r
-import com.swtdesigner.SWTResourceManager;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionSaveTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.MySourceViewerConfig;\r
-\r
-//public class PilosellaEditorView extends EditorPart implements ICdmEventListener {\r
-public class PilosellaEditorView extends EditorPart {\r
-\r
-       private Text hieraciumFuscoatrumSubspText_1;\r
-       private Text hieraciumRubroonegenseNorrlText;\r
-       private Table table_1;\r
-       private Text text_3;\r
-       private Text hieraciumFuscoatrumSubspText;\r
-       private Text hieraciumAurantiacumSubspText;\r
-       private Text text_1;\r
-       private StyledText styledText;\r
-       private TaxonName taxonname;\r
-\r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.pilosellaeditorview"; //$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
-               //\r
-               \r
-               \r
-//             txtPlay = new Text(container, SWT.BORDER);\r
-//             txtPlay.setCapture(true);\r
-//             final GridData gd_txtPlay = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);\r
-//             gd_txtPlay.heightHint = 96;\r
-//             txtPlay.setLayoutData(gd_txtPlay);\r
-////           txtPlay.addVerifyListener(new VerifyListener() {\r
-////                   @Override\r
-////                   public void verifyText(VerifyEvent e) {\r
-////                   e.doit = Character.isDigit(e.character);\r
-////               }           \r
-////           });\r
-//             txtPlay.addSelectionListener(new SelectionListener() {\r
-//\r
-//                     @Override\r
-//                     public void widgetDefaultSelected(SelectionEvent e) {\r
-//                             // TODO Auto-generated method stub\r
-//                             \r
-//                     }\r
-//\r
-//                     @Override\r
-//                     public void widgetSelected(SelectionEvent e) {\r
-//                             System.out.println(e.toString());\r
-//                     }\r
-//                     \r
-//                     \r
-//             });\r
-//             \r
-//             \r
-//             txtPlay.addKeyListener(new KeyListener() {\r
-//\r
-//                     public void keyPressed(KeyEvent e) {\r
-//                             System.out.println(e.character);\r
-//                             if (e.character == '=') {\r
-//                                     Shell shell = Activator.getDefault().getWorkbench().\r
-//                                             getActiveWorkbenchWindow().getShell();\r
-//                                     PopupList list = new PopupList(shell, SWT.H_SCROLL | SWT.V_SCROLL);\r
-//                                     \r
-////                                   Combo list = new Combo(shell, SWT.H_SCROLL | SWT.V_SCROLL);\r
-//                                     \r
-//                                     // Add the items to the list\r
-//                                     String[] OPTIONS = { "Create homo. syn.",\r
-//                                                     "Create hetero. syn.",\r
-//                                                     "Create mis. name",\r
-//                                                     "Create homonym"};\r
-//\r
-//                                     list.setItems(OPTIONS);\r
-//                                     \r
-//                                     // Open the list and get the selected item\r
-//                                     String selected = list.open(txtPlay.getBounds());\r
-//                                     \r
-//                                     // Print the item to the console\r
-//                                     System.out.println(selected);                                   \r
-//                             }\r
-//                             \r
-//                     }\r
-//\r
-//                     public void keyReleased(KeyEvent e) {\r
-//                             // TODO Auto-generated method stub\r
-//                             \r
-//                     }\r
-//             });\r
-               parent.setLayout(new GridLayout());\r
-               Document doc = new Document("");\r
-\r
-               final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);\r
-               taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));\r
-               taxonomicallyIncludedInLabel.setText("Higher taxon: \"Pilosella fuscoatra coll.\"");\r
-\r
-               final ToolBar toolBar = new ToolBar(parent, SWT.NONE);\r
-//             toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-\r
-               final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);\r
-               itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemSave.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/save.gif"));\r
-               itemSave.addSelectionListener(new SelectionListener() {\r
-                       public void mouseDown(final MouseEvent e) {\r
-                               \r
-//                             taxonname.setGenus(txtGenus.getText());\r
-//                             taxonname.setSpecificEpithet(txtSpEpi.getText());\r
-                               \r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-\r
-                       public void widgetDefaultSelected(SelectionEvent e) {\r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-\r
-                       public void widgetSelected(SelectionEvent e) {\r
-                               new ActionSaveTaxon(taxonname).run();\r
-                       }\r
-               });\r
-\r
-               final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               \r
-               final Menu menuMove = new Menu(toolBar);\r
-               menuMove.setData("x", null);\r
-               addDropDown(itemMove, menuMove);\r
-\r
-               final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
-               moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");\r
-\r
-               final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
-               turnTaxonpilosellaMenuItem.addSelectionListener(new SelectionAdapter() {\r
-                       public void widgetSelected(final SelectionEvent e) {\r
-                               new MoveDialogView(getSite().getShell());\r
-//                             MessageDialog.openInformation(getSite().getShell(),"Readme Editor","View Action executed");                             \r
-                               MoveDialogView dialog = new MoveDialogView(getSite().getShell());\r
-                               dialog.open();                          \r
-                       }\r
-               });\r
-               turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");\r
-               \r
-//             });\r
-//             newItemToolItem.setText("New item");\r
-               itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));\r
-\r
-               final ToolItem itemDelete = new ToolItem(toolBar, SWT.NONE);\r
-               itemDelete.setToolTipText("Delete taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemDelete.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
-                               \r
-               final ToolItem separator1 = new ToolItem(toolBar, SWT.SEPARATOR);\r
-\r
-               final ToolItem itemAddRelationship = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemAddRelationship.setToolTipText("Add nom. or tax. relation to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemAddRelationship.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/rel_no_bg.gif"));\r
-               \r
-               final Menu menuAddRel = new Menu(toolBar);\r
-               menuAddRel.setData("x", null);\r
-               addDropDown(itemAddRelationship, menuAddRel);\r
-\r
-               final MenuItem testMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               testMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
-               testMenuItem.setText("Add synonymy (type unknown)");\r
-\r
-               final MenuItem addHomotypicSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHomotypicSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
-               addHomotypicSynonymMenuItem.setText("Add homotypic synonym");\r
-\r
-               final MenuItem addHeterotypicSynoynmMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHeterotypicSynoynmMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
-               addHeterotypicSynoynmMenuItem.setText("Add heterotypic synoynm");\r
-\r
-               final MenuItem addBasionymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addBasionymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
-               addBasionymMenuItem.setText("Add basionym");\r
-\r
-               final MenuItem addReplacedSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addReplacedSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
-               addReplacedSynonymMenuItem.setText("Add replaced synonym");\r
-\r
-               final MenuItem addHomonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addHomonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));\r
-               addHomonymMenuItem.setText("Add homonym");\r
-\r
-               final MenuItem addOrthographicVariantMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addOrthographicVariantMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));\r
-               addOrthographicVariantMenuItem.setText("Add orthographic variant");\r
-\r
-               final MenuItem addMisappliedNameMenuItem = new MenuItem(menuAddRel, SWT.NONE);\r
-               addMisappliedNameMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));\r
-               addMisappliedNameMenuItem.setText("Add misapplied name");\r
-\r
-               final MenuItem addConceptRelationMenuItem_1 = new MenuItem(menuAddRel, SWT.CASCADE);\r
-               addConceptRelationMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));\r
-               addConceptRelationMenuItem_1.setText("Add concept relation");\r
-\r
-               final Menu menu = new Menu(addConceptRelationMenuItem_1);\r
-               addConceptRelationMenuItem_1.setMenu(menu);\r
-\r
-               final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem.setText("congruent");\r
-\r
-               final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_1.setSelection(true);\r
-               checkboxMenuItem_1.setText("included in");\r
-\r
-               final MenuItem checkboxMenuItem_2 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_2.setText("includes");\r
-\r
-               final MenuItem checkboxMenuItem_3 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_3.setText("overlaps");\r
-\r
-               final MenuItem checkboxMenuItem_4 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_4.setText("excludes");\r
-\r
-               final MenuItem checkboxMenuItem_5 = new MenuItem(menu, SWT.CHECK);\r
-               checkboxMenuItem_5.setSelection(true);\r
-               checkboxMenuItem_5.setText("doubtful");\r
-               \r
-               final ToolItem separator2 = new ToolItem(toolBar, SWT.SEPARATOR);\r
-\r
-               final ToolItem itemAddTaxon = new ToolItem(toolBar, SWT.DROP_DOWN);\r
-               itemAddTaxon.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/add_no_bg2.gif"));\r
-               itemAddTaxon.setToolTipText("Add new taxon");\r
-\r
-               final Menu menuAdd = new Menu(toolBar);\r
-               menuAdd.setData("x", null);\r
-               addDropDown(itemAddTaxon, menuAdd);\r
-\r
-               final MenuItem addTaxonToMenuItem = new MenuItem(menuAdd, SWT.NONE);\r
-               addTaxonToMenuItem.setText("Add new taxon to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-\r
-               final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);\r
-               addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");\r
-\r
-               final Composite composite = new Composite(parent, SWT.NONE);\r
-               composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));\r
-               composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               final GridLayout gridLayout_2 = new GridLayout();\r
-               gridLayout_2.horizontalSpacing = 3;\r
-               gridLayout_2.numColumns = 3;\r
-               composite.setLayout(gridLayout_2);\r
-\r
-               text_3 = new Text(composite, SWT.WRAP);\r
-               text_3.setText("Pilosella fuscoatra (Nägeli & Peter) Soják in Preslia 43: 184. 1971 ");\r
-               text_3.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));\r
-               text_3.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));\r
-               text_3.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               text_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               text_3.setBackground(null);                             \r
-                       }\r
-\r
-               });\r
-\r
-               table_1 = new Table(composite, SWT.BORDER);\r
-               table_1.setLinesVisible(true);\r
-               table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 7));\r
-\r
-               final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);\r
-               newColumnTableColumn.setWidth(100);\r
-               newColumnTableColumn.setText("New column");\r
-\r
-               final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);\r
-               newColumnTableColumn_1.setWidth(100);\r
-               newColumnTableColumn_1.setText("New column");\r
-\r
-               final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem.setText(0, "Rank");\r
-               newItemTableItem.setText(1, "species");\r
-               newItemTableItem.setText("Rank");\r
-               \r
-               final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_1.setText(1, "Pilosella");\r
-               newItemTableItem_1.setText(0, "Genus");\r
-\r
-               final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_2.setText(1, "fuscoatra");\r
-               newItemTableItem_2.setText(0, "Species epithet");\r
-\r
-               final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_3.setText(1, "Nägeli & Peter");\r
-               newItemTableItem_3.setText(0, "Author team");\r
-\r
-               final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);\r
-               newItemTableItem_4.setText("...");\r
-//             newItemTableItem_3.setText("Author team");\r
-//             newItemTableItem_2.setText("Species epithet");\r
-//             newItemTableItem_1.setText("Genus");\r
-\r
-               final Label labelWithMenu = new Label(composite, SWT.NONE);\r
-               labelWithMenu.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               labelWithMenu.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
-               final GridData gd_labelWithMenu = new GridData(SWT.LEFT, SWT.TOP, false, false);\r
-               labelWithMenu.setLayoutData(gd_labelWithMenu);\r
-               \r
-               text_1 = new Text(composite, SWT.WRAP);\r
-               final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_text_1.widthHint = 300;\r
-               text_1.setLayoutData(gd_text_1);\r
-               text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
-               text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");\r
-               text_1.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               text_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               text_1.setBackground(null);                             \r
-                       }\r
-\r
-               });\r
-               \r
-\r
-               final Label label_1 = new Label(composite, SWT.NONE);\r
-               label_1.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
-               label_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
-               label_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-\r
-               hieraciumAurantiacumSubspText = new Text(composite, SWT.WRAP);\r
-               final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumAurantiacumSubspText.widthHint = 300;\r
-               hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);\r
-               hieraciumAurantiacumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
-               hieraciumAurantiacumSubspText.setText("Hieracium aurantiacum subsp. chaetodermum Pohle & Zahn in Allg. Bot. Z. Syst. 13: 110. 1907");\r
-               hieraciumAurantiacumSubspText.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               hieraciumAurantiacumSubspText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               hieraciumAurantiacumSubspText.setBackground(null);                              \r
-                       }\r
-\r
-               });\r
-               \r
-\r
-               final Label label_2 = new Label(composite, SWT.NONE);\r
-               label_2.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
-               label_2.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               label_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
-\r
-               hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);\r
-               final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumFuscoatrumSubspText.widthHint = 300;\r
-               hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);\r
-               hieraciumFuscoatrumSubspText.setText("Hieracium fuscoatrum subsp. chaetodermum (Pohle & Zahn) Zahn in Engler, Pflanzenr. 82: 1267. 1923");\r
-               hieraciumFuscoatrumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
-               hieraciumFuscoatrumSubspText.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               hieraciumFuscoatrumSubspText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               hieraciumFuscoatrumSubspText.setBackground(null);                               \r
-                       }\r
-\r
-               });\r
-\r
-               final Label label = new Label(composite, SWT.NONE);\r
-               label.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
-               label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               label.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
-\r
-               hieraciumRubroonegenseNorrlText = new Text(composite, SWT.WRAP);\r
-               hieraciumRubroonegenseNorrlText.setText("Hieracium rubroonegense Norrl. in Acta Soc. Fauna Fl. Fenn. 26(7): 61. 1904");\r
-               hieraciumRubroonegenseNorrlText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
-               hieraciumRubroonegenseNorrlText.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               hieraciumRubroonegenseNorrlText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               hieraciumRubroonegenseNorrlText.setBackground(null);                            \r
-                       }\r
-\r
-               });             \r
-               final GridData gd_hieraciumRubroonegenseNorrlText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumRubroonegenseNorrlText.widthHint = 300;\r
-               hieraciumRubroonegenseNorrlText.setLayoutData(gd_hieraciumRubroonegenseNorrlText);\r
-\r
-               final Label label_3 = new Label(composite, SWT.NONE);\r
-               label_3.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
-               label_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
-               label_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-\r
-               hieraciumFuscoatrumSubspText_1 = new Text(composite, SWT.WRAP);\r
-               hieraciumFuscoatrumSubspText_1.setText("Hieracium fuscoatrum subsp. rubroonegense (Norrl.) Zahn in Engler, Pflanzenr. 82: 1267. 1923");\r
-               hieraciumFuscoatrumSubspText_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
-               hieraciumFuscoatrumSubspText_1.addFocusListener(new FocusListener() {\r
-\r
-                       public void focusGained(FocusEvent e) {\r
-                               hieraciumFuscoatrumSubspText_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
-                       }\r
-\r
-                       public void focusLost(FocusEvent e) {\r
-                               hieraciumFuscoatrumSubspText_1.setBackground(null);                             \r
-                       }\r
-\r
-               });     \r
-               final GridData gd_hieraciumFuscoatrumSubspText_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumFuscoatrumSubspText_1.widthHint = 300;\r
-               hieraciumFuscoatrumSubspText_1.setLayoutData(gd_hieraciumFuscoatrumSubspText_1);\r
-               \r
-               final Label label_4 = new Label(composite, SWT.NONE);\r
-               label_4.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
-               label_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
-               label_4.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-\r
-               final Menu menu1 = new Menu(labelWithMenu);\r
-               labelWithMenu.setMenu(menu1);\r
-\r
-               final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
-               deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
-               deletehieraciumFuscoatrumMenuItem.setText("Delete \"Hieracium fuscoatrum Nägeli & Peter\" from this taxon");\r
-\r
-               new MenuItem(menu1, SWT.SEPARATOR);\r
-\r
-               final MenuItem moveMenuItem = new MenuItem(menu1, SWT.NONE);\r
-               moveMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));\r
-               moveMenuItem.setText("Move \"Hieracium fuscoatrum Nägeli & Peter\" to another taxon");\r
-\r
-               final MenuItem makehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
-               makehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/a_no_bg.gif"));\r
-               makehieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into an accepted name");\r
-\r
-               new MenuItem(menu1, SWT.SEPARATOR);\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a synonym (type unknown)");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_1 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_1.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homotypic synonym");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_2 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_2.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a heterotypic synoynm");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_3 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_3.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a basionym");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_4 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_4.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a replaced synonym");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_5 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_5.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_5.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homonym");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_6 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_6.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_6.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a orthographic variant");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_7 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_7.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_7.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a misapplied name");\r
-\r
-               final MenuItem turnhieraciumFuscoatrumMenuItem_8 = new MenuItem(menu1, SWT.NONE);\r
-               turnhieraciumFuscoatrumMenuItem_8.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));\r
-               turnhieraciumFuscoatrumMenuItem_8.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a concept relation");\r
-\r
-               SourceViewer sourceviewer = new SourceViewer(composite, null, SWT.WRAP | SWT.FULL_SELECTION);\r
-               sourceviewer.setAnnotationHover(null);\r
-               styledText = sourceviewer.getTextWidget();\r
-               final GridData gd_styledText = new GridData(SWT.FILL, SWT.TOP, true, false);\r
-               gd_styledText.heightHint = 41;\r
-               gd_styledText.widthHint = 450;\r
-               styledText.setLayoutData(gd_styledText);\r
-               sourceviewer.setDocument(doc);\r
-               sourceviewer.configure(new MySourceViewerConfig());\r
-               sourceviewer.setTabsToSpacesConverter(null);\r
-\r
-               \r
-//             final Menu menu = new Menu(toolBar);\r
-//             addDropDown(newItemToolItem, menu);\r
-//             );\r
-               \r
-//             Action testAction = new ActionOpenNameEditor();\r
-//             testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));\r
-//             testAction.setToolTipText("Add relation");\r
-//             toolBar.add(testAction);\r
-               \r
-               populateForm();         \r
-       }\r
-\r
-//     private void populateForm() {\r
-//             \r
-//             String fulltext = "";\r
-//             \r
-//             if (taxonname.getGenus() != null) {\r
-//                     fulltext = taxonname.getGenus();\r
-//             }\r
-//\r
-//             if (taxonname.getSpecificEpithet() != null) {\r
-//                     fulltext += " " + taxonname.getSpecificEpithet();\r
-//             }\r
-//\r
-//             if (taxonname.getAuthorship() != null) {\r
-//                     fulltext += " " + taxonname.getAuthorship();\r
-//             }\r
-//             \r
-////           txtPlay.setText(fulltext);\r
-////           txtPlay.setToolTipText("Joe mama\njoe daddy\njoe gramammy");\r
-//             \r
-//             this.setPartName(taxonname.getName());\r
-//     }\r
-\r
-       private void populateForm() {\r
-               this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");\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) throws PartInitException {\r
-\r
-               if (!(input instanceof IEditorInput))\r
-                       throw new PartInitException(\r
-                                       "Invalid Input: Must be IFileEditorInput");\r
-               \r
-               if (input.getAdapter(TaxonName.class) != null) {\r
-                       taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-//                     taxonname.addCdmEventListener(this);\r
-               } else {\r
-                       \r
-                       taxonname = null;\r
-               }\r
-               \r
-               setSite(site);\r
-               setInput(input);\r
-       }\r
-\r
-       @Override\r
-       public boolean isDirty() {\r
-               return true;\r
-       }\r
-\r
-       @Override\r
-       public boolean isSaveAsAllowed() {\r
-               return false;\r
-       }\r
-\r
-       public void propertyChange(PropertyChangeEvent evt) {\r
-//             TaxonName taxonname = (TaxonName)evt.getNewValue();\r
-               this.taxonname = (TaxonName)evt.getNewValue();\r
-               System.out.println(((TaxonName)evt.getNewValue()).getName());\r
-               populateForm();\r
-               \r
-               // for individual fields, do something like:\r
-               //      if (evt.getPropertyName().equalsIgnoreCase("genus"))\r
-               //              txtGenus.setText ...\r
-       }\r
-\r
-//     public void onDelete(ICdmEventListenerRegistration arg0) {\r
-//             // TODO Auto-generated method stub\r
-//             \r
-//     }\r
-\r
-       public void onInsert(Object arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-       public void onLoad(Object arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
-//             // TODO Auto-generated method stub\r
-//             \r
-//     }\r
-       \r
-       private static void addDropDown(final ToolItem item, final Menu menu) {\r
-               item.addListener(SWT.Selection, new Listener() {\r
-                       public void handleEvent(Event event) {\r
-                               if (event.detail == SWT.ARROW) {\r
-                                       Rectangle rect = item.getBounds();\r
-                                       Point pt = new Point(rect.x, rect.y + rect.height);\r
-                                       pt = item.getParent().toDisplay(pt);\r
-                                       menu.setLocation(pt.x, pt.y);\r
-                                       menu.setVisible(true);\r
-                               }\r
-                       }\r
-               });\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RelatedNameViewer.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RelatedNameViewer.java
deleted file mode 100644 (file)
index 639bf79..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
-\r
-import org.eclipse.core.databinding.DataBindingContext;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.layout.GridData;\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.Label;\r
-\r
-import com.swtdesigner.ResourceManager;\r
-import com.swtdesigner.SWTResourceManager;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-\r
-public class RelatedNameViewer extends NameViewer_ {\r
-\r
-       Control ctlChooseRelType;\r
-       \r
-       RelatedNameViewer(TaxonName taxonName, DataBindingContext bindingContext,\r
-                       Composite parent) {\r
-               super(taxonName, bindingContext, parent);\r
-               setViewerLayout();\r
-       }\r
-       \r
-       private void setViewerLayout() {\r
-               \r
-               ctlChooseRelType = new Label(parent, SWT.NONE);\r
-               ctlChooseRelType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));\r
-               ctlChooseRelType.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               ((Label) ctlChooseRelType).setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
-               \r
-               styledText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));\r
-               styledText.setFont(SWTResourceManager.getFont("Georgia", 10, SWT.NONE));\r
-               styledText.setIndent(12);\r
-       }\r
-\r
-       public Control getCtlChooseRelType() {\r
-               return ctlChooseRelType;\r
-       }\r
-\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyCompletionProcessor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyCompletionProcessor.java
deleted file mode 100644 (file)
index 1b4c03e..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-import org.eclipse.jface.text.ITextViewer;\r
-import org.eclipse.jface.text.contentassist.CompletionProposal;\r
-import org.eclipse.jface.text.contentassist.ContextInformation;\r
-import org.eclipse.jface.text.contentassist.ICompletionProposal;\r
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;\r
-import org.eclipse.jface.text.contentassist.IContextInformation;\r
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.graphics.Image;\r
-\r
-import com.swtdesigner.ResourceManager;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-\r
-public class MyCompletionProcessor implements IContentAssistProcessor {\r
-\r
-       protected final static String[] myProposals = { "Unknown synonymy", \r
-                                                       "Create homotypic synonym",\r
-                                                       "Create heterotypic synoynm",\r
-                                                       "Create basionym",\r
-                                                       "Create replaced synonym",\r
-                                                       "Create homonym",\r
-                                                       "Create orthographic variant",\r
-                                                       "Create misapplied name",\r
-                                                       "Create concept relation"};\r
-       protected final static String[] myIcons = { "icons/unknown.gif", \r
-                                                       "icons/homosyn.gif", \r
-                                                       "icons/heterosyn.gif",\r
-                                                       "icons/basionym.gif",\r
-                                                       "icons/repsyn.gif",\r
-                                                       "icons/homonym.gif",\r
-                                                       "icons/orthovariant.gif",\r
-                                                       "icons/misapplied.gif",\r
-                                                       "icons/concept.gif"};\r
-       protected final static String[] myContexts = { "To create a homotypic synonym, there are many things to consider. I could go on all day.",\r
-                                                       "Create homotypic synonym",\r
-                                                       "Create heterotypic synoynm",\r
-                                                       "Create basionym",\r
-                                                       "Create replaced synonym",\r
-                                                       "Create homonym",\r
-                                                       "Create orthographic variant",\r
-                                                       "Create misapplied name",\r
-                                                       "Create concept relation"};\r
-       \r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public ICompletionProposal[] computeCompletionProposals(\r
-               ITextViewer viewer, int documentOffset) {\r
-               String context = "Describe formatting / parsing of this rel. type.";\r
-//             Image img = ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown.gif");\r
-               ICompletionProposal[] result =\r
-                       new ICompletionProposal[myProposals.length];\r
-               for (int i = 0; i < myProposals.length; i++) {\r
-                     IContextInformation contextInfo = \r
-                                new ContextInformation(null, myProposals[i]+" Style");\r
-                       result[i] = new CompletionProposal(myProposals[i],documentOffset, 0, \r
-                                       myProposals[i].length(), ResourceManager.getPluginImage(Activator.getDefault(), myIcons[i]), \r
-                                       myProposals[i], contextInfo, context);\r
-\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public char[] getCompletionProposalAutoActivationCharacters() {\r
-               return new char[] { '=', (char) SWT.CR };\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public char[] getContextInformationAutoActivationCharacters() {\r
-               return null;\r
-       }\r
-\r
-       // For Context information \r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public IContextInformationValidator getContextInformationValidator() {\r
-               return null;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public IContextInformation[] computeContextInformation(\r
-               ITextViewer viewer,\r
-               int documentOffset) {\r
-               return null;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * Method declared on IContentAssistProcessor\r
-        */\r
-       public String getErrorMessage() {\r
-               return null;\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyRuleScanner.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MyRuleScanner.java
deleted file mode 100644 (file)
index a0b7638..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.TextAttribute;\r
-import org.eclipse.jface.text.rules.EndOfLineRule;\r
-import org.eclipse.jface.text.rules.IRule;\r
-import org.eclipse.jface.text.rules.IToken;\r
-import org.eclipse.jface.text.rules.RuleBasedScanner;\r
-import org.eclipse.jface.text.rules.SingleLineRule;\r
-import org.eclipse.jface.text.rules.Token;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.RGB;\r
-import org.eclipse.swt.widgets.Display;\r
-\r
-public class MyRuleScanner extends RuleBasedScanner {\r
-       private static Color TAG_COLOR= new Color(Display.getCurrent(), new RGB(200, 0, 0));\r
-       private static Color COMMENT_COLOR= new Color(Display.getCurrent(), new RGB(0, 200, 0));\r
-\r
-       public MyRuleScanner() {\r
-               IToken tagToken =\r
-                       new Token(\r
-                               new TextAttribute(TAG_COLOR));\r
-\r
-               IToken commentToken= new Token(new TextAttribute(COMMENT_COLOR));\r
-\r
-               IRule[] rules = new IRule[2];\r
-               //Add rule for processing instructions\r
-               rules[0] = new SingleLineRule("<myTag", "myTag>", tagToken);\r
-               rules[1] = (new EndOfLineRule("//", commentToken)); //$NON-NLS-1$\r
-               setRules(rules);\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MySourceViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/MySourceViewerConfig.java
deleted file mode 100644 (file)
index c088e98..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.TextAttribute;\r
-import org.eclipse.jface.text.contentassist.ContentAssistant;\r
-import org.eclipse.jface.text.contentassist.IContentAssistant;\r
-import org.eclipse.jface.text.presentation.IPresentationReconciler;\r
-import org.eclipse.jface.text.presentation.PresentationReconciler;\r
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;\r
-import org.eclipse.jface.text.rules.Token;\r
-import org.eclipse.jface.text.source.ISourceViewer;\r
-import org.eclipse.jface.text.source.SourceViewerConfiguration;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.RGB;\r
-import org.eclipse.swt.widgets.Display;\r
-\r
-public class MySourceViewerConfig extends SourceViewerConfiguration {\r
-       private MyRuleScanner scanner;\r
-       private static Color DEFAULT_TAG_COLOR =\r
-               new Color(Display.getCurrent(), new RGB(0, 0, 200));\r
-\r
-       public MySourceViewerConfig() {\r
-\r
-       }\r
-\r
-       protected MyRuleScanner getTagScanner() {\r
-               if (scanner == null) {\r
-                       scanner = new MyRuleScanner();\r
-                       scanner.setDefaultReturnToken(\r
-                               new Token(new TextAttribute(DEFAULT_TAG_COLOR)));\r
-               }\r
-               return scanner;\r
-       }\r
-\r
-       /**\r
-        * Define reconciler for MyEditor\r
-        */\r
-       public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {\r
-               PresentationReconciler reconciler = new PresentationReconciler();\r
-               DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getTagScanner());\r
-               reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);\r
-               reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);\r
-               return reconciler;\r
-       }\r
-       \r
-       public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {\r
-\r
-               ContentAssistant assistant = new ContentAssistant();\r
-               assistant.setContentAssistProcessor(\r
-                       new MyCompletionProcessor(),\r
-                       IDocument.DEFAULT_CONTENT_TYPE);\r
-               assistant.enableAutoActivation(true);\r
-               assistant.setAutoActivationDelay(50);\r
-               assistant.setProposalPopupOrientation(\r
-                       IContentAssistant.PROPOSAL_OVERLAY);\r
-               assistant.setStatusLineVisible(true);\r
-               assistant.setStatusMessage("Create a nomenclatural or taxonomic relationship");\r
-               assistant.setProposalSelectorBackground(\r
-                               new Color(Display.getCurrent(), new RGB(255, 255, 255)));\r
-               assistant.setInformationControlCreator(\r
-                               getInformationControlCreator(sourceViewer)); // this is what pops up the yellow context box\r
-               return assistant;\r
-       }\r
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDamagerRepairer.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDamagerRepairer.java
deleted file mode 100644 (file)
index 1e10e2a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IRegion;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;\r
-import org.eclipse.jface.text.rules.ITokenScanner;\r
-\r
-public class NameDamagerRepairer extends DefaultDamagerRepairer {\r
-\r
-       public NameDamagerRepairer(ITokenScanner scanner) {\r
-               super(scanner);\r
-       }\r
-       \r
-       public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {\r
-               \r
-               System.out.println("documentPartitioningChanged: " + documentPartitioningChanged);\r
-               \r
-               return super.getDamageRegion(partition, e, documentPartitioningChanged);\r
-       }\r
-\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocument.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocument.java
deleted file mode 100644 (file)
index 4fa4dd3..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.Document;\r
-\r
-import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-\r
-\r
-/**\r
- * Extends Document to associate a TaxonName\r
- * \r
- * @author p.ciardelli\r
- *\r
- */\r
-public class NameDocument extends Document {\r
-\r
-       private TaxonNameBase taxonName = new BotanicalName(Rank.SPECIES());\r
-\r
-       public NameDocument (String initialContent) {\r
-               super(initialContent);\r
-       }\r
-       \r
-       public NameDocument (TaxonNameBase taxonName) {\r
-               this("");\r
-               this.taxonName = taxonName;\r
-       }\r
-       \r
-       public NameDocument () {\r
-               this("");\r
-       }\r
-\r
-       public TaxonNameBase getTaxonName() {\r
-               return taxonName;\r
-       }\r
-\r
-       public void setTaxonName(TaxonNameBase taxonName) {\r
-               this.taxonName = taxonName;\r
-       }       \r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocumentListener.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameDocumentListener.java
deleted file mode 100644 (file)
index a2d75b8..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import java.util.Scanner;\r
-\r
-import org.eclipse.jface.text.BadLocationException;\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IDocumentListener;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.ModifyEvent;\r
-import org.eclipse.swt.events.ModifyListener;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameEditorView;\r
-\r
-/**\r
- * This listener catches all line breaks other than carriage\r
- *  returns at end-of-line, and creates new name viewers,\r
- *  for instance, if user pastes a block of taxon information.  \r
- * \r
- * @author p.ciardelli\r
- *\r
- */\r
-public class NameDocumentListener implements IDocumentListener {\r
-\r
-       \r
-       /**\r
-        * the View on which createdRelatedName gets called in case of line breaks \r
-        */\r
-       private NameEditorView nameEditorView;\r
-       /**\r
-        * the Control after which any new related names are created  \r
-        */     \r
-       private Control control;\r
-       /**\r
-        * the Composite that is resized after any change  \r
-        */     \r
-       private Composite parent;\r
-       \r
-       public NameDocumentListener(NameEditorView nameEditorView, Control control,\r
-                       Composite parent) {\r
-               this.nameEditorView = nameEditorView;\r
-               this.control = control;\r
-               this.parent = parent;\r
-       }\r
-\r
-       public void documentAboutToBeChanged(DocumentEvent e) {\r
-\r
-               String text = e.getText();\r
-               System.out.println("b4: " + e.getText());\r
-               \r
-               e.fText = "yo";\r
-               System.out.println("aft: " + e.getText());\r
-               \r
-//             int length = e.getLength();\r
-//             int offset = e.getOffset();\r
-//             int docLength = e.getDocument().getLength(); // length of doc BEFORE insert\r
-//                             \r
-//             if (text.contains(System.getProperty("line.separator"))) {\r
-//                     \r
-//                     if (offset < docLength) {\r
-                       // remove text following insert from document,\r
-                       //  add to insert text   \r
-//                             try {\r
-//                                     text += e.getDocument().get(offset, docLength - offset);\r
-//                                     e.getDocument().replace(offset, docLength - offset, "");\r
-//                             } catch (BadLocationException e1) {\r
-//                                     System.out.println(e1.getMessage());\r
-//                                     e1.printStackTrace();\r
-//                             }\r
-//                     }       \r
-//                                             \r
-//                     \r
-//                     \r
-//                     Scanner scanner = new Scanner( text );\r
-//                     scanner.useDelimiter (System.getProperty("line.separator"));\r
-//                     \r
-//                     StyledText SText = (StyledText) control;\r
-//                     nameEditorView.createRelatedName(SText, "test");\r
-//                     StyledText lastSText = null;\r
-//                     while (scanner.hasNext()) {\r
-//                             if (lastSText == null)\r
-//                                     e.getDocument().set(scanner.next());\r
-//                             else\r
-//                                     SText = nameEditorView.createRelatedName(SText, scanner.next()).\r
-//                                                     getTextWidget();\r
-//                             lastSText = SText;\r
-//                     }       \r
-//                     \r
-//                     SText.setFocus();\r
-//                     \r
-//                     // put cursor at EOL of last sourceviewer\r
-//                     SText.setCaretOffset(SText.getText().length()); \r
-//                     \r
-//             }\r
-               \r
-       }\r
-       \r
-       public void documentChanged(DocumentEvent event) {\r
-               \r
-//             System.out.println("Offset: " + event.getOffset());\r
-//             System.out.println("Get: " + event.getDocument().get());\r
-\r
-               String text = event.getDocument().get();\r
-                               \r
-               if (text.endsWith(System.getProperty("line.separator"))) {\r
-                       event.getDocument().set(text.trim());\r
-                       nameEditorView.createRelatedName(control,"help");\r
-               }\r
-//             \r
-//             int breakOffset = text.indexOf(System.getProperty("line.separator"));\r
-//             if (breakOffset > -1) {\r
-//                     try {\r
-//                             event.getDocument().replace(breakOffset, text.length() - breakOffset, "");\r
-//                     } catch (BadLocationException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             System.out.println(e.getMessage());\r
-//                             e.printStackTrace();\r
-//                     }\r
-//             }\r
-\r
-//             if (event.getDocument().get().contains(System.getProperty("line.separator"))) {\r
-//                     Scanner scanner = new Scanner(event.getDocument().get());\r
-//                     scanner.useDelimiter (System.getProperty("line.separator"));\r
-//                     try {\r
-//                             event.getDocument().replace(\r
-//                                             0, event.getDocument().get().length(), scanner.next());\r
-//                     } catch (BadLocationException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     }\r
-////           document.set(scanner.next());\r
-//             \r
-//                     while (scanner.hasNext()) {\r
-//                             System.out.println("Create new relname with: " + scanner.next());\r
-//                     }\r
-//             }               \r
-               \r
-               // re-draw parent in case text controls need re-sizing -\r
-               //  could also be the case if databinding has modified text\r
-//             nameEditorView.createRelatedName(control,"help");\r
-               \r
-//             parent.getParent().layout();            \r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner.java
deleted file mode 100644 (file)
index 6f96cde..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;\r
-import org.eclipse.jface.text.rules.IToken;\r
-import org.eclipse.jface.text.rules.Token;\r
-\r
-\r
-public class NamePartitionScanner implements IPartitionTokenScanner {\r
-       \r
-       public final static String GENUS = "genus";\r
-       public final static String SPECIFIC_EPITHET = "specificEpithet";\r
-       public final static String EVERYTHING_ELSE = "everythingElse";\r
-       \r
-       public final static String[] PARTITION_TYPES = {GENUS, SPECIFIC_EPITHET, EVERYTHING_ELSE};\r
-       \r
-       private NameDocument document;\r
-       private int offset;\r
-       private int currentOffset;\r
-       private int length;\r
-       private TaxonName taxonName;\r
-               \r
-       String [] words;\r
-       int index;\r
-       private String[] words2;\r
-       \r
-       private String text;\r
-       \r
-       public NamePartitionScanner() {\r
-       }\r
-       \r
-       public void setPartialRange(IDocument document, int offset, int length,\r
-                       String contentType, int partitionOffset) {\r
-\r
-               System.out.println("--->\t" + offset + "\n\t" + length\r
-                                + "\n\t" + contentType + "\n\t" + partitionOffset);\r
-               \r
-               Assert.isTrue(document instanceof NameDocument, "NamePartitionScanner can only scan a NameDocument.");\r
-               this.document = (NameDocument) document;\r
-\r
-               text = document.get();\r
-                               \r
-               // check whether this is the initial scan\r
-               if (this.taxonName == null) {\r
-                       \r
-                       this.taxonName = this.document.getTaxonName();\r
-                       \r
-                       // is this a pre-existing taxon name? \r
-                       if (this.taxonName.getGenus() != null) {\r
-                               \r
-                               // map all partition types to their respective taxon name properties\r
-                               words = new String [] {this.taxonName.getGenus(), this.taxonName.getSpecificEpithet()};\r
-                               this.document.set(this.taxonName.getGenus() + " " + this.taxonName.getSpecificEpithet());\r
-                               \r
-                       }\r
-               } else if (text.length() > 0) {\r
-                       \r
-                       // does text contain line breaks?\r
-//                     if (text.contains(System.getProperty("line.separator"))) {\r
-//                             Scanner scanner = new Scanner(text);\r
-//                             scanner.useDelimiter (System.getProperty("line.separator"));\r
-//                             \r
-////                           document.set(scanner.next());\r
-//                             \r
-//                             while (scanner.hasNext()) {\r
-//                                     System.out.println("Create new relname with: " + scanner.next());\r
-//                             }\r
-//                     }\r
-                       \r
-                       // only scan first line if there are line breaks in the text\r
-//                     Scanner scanner = new Scanner(text);\r
-//                     scanner.useDelimiter (System.getProperty("line.separator"));\r
-//                     text = scanner.next();\r
-                       // TODO replace with regexp pattern matching\r
-                       words = text.split("\\s");\r
-               }\r
-               \r
-//             System.out.println("setPartialRange:\n\t" + offset + "\n\t" + length + "\n\t" + contentType + "\n\t" + partitionOffset);\r
-\r
-               this.index = 0;\r
-               this.currentOffset = 0;\r
-       }\r
-\r
-       public int getTokenLength() {           \r
-               return this.length;\r
-       }\r
-\r
-       public int getTokenOffset() {\r
-               return this.offset;\r
-       }\r
-\r
-       public IToken nextToken() {\r
-               IToken token;\r
-               if (index == words.length || index == PARTITION_TYPES.length) {\r
-                       token = Token.EOF;\r
-                       System.out.println("EOFMOFO" + text);\r
-               } else {\r
-                       token = new Token(PARTITION_TYPES[index]);\r
-                       this.length = words[index].length();\r
-                       this.offset = this.currentOffset;\r
-                       \r
-               }\r
-               \r
-               index++;\r
-               currentOffset += this.length + 1; \r
-                       \r
-               return token;\r
-       }\r
-\r
-       public void setRange(IDocument document, int offset, int  length) {\r
-               setPartialRange(document, offset, length, null, -1);\r
-       }\r
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner_.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitionScanner_.java
deleted file mode 100644 (file)
index 275aded..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.rules.ICharacterScanner;\r
-import org.eclipse.jface.text.rules.IPredicateRule;\r
-import org.eclipse.jface.text.rules.IToken;\r
-import org.eclipse.jface.text.rules.IWordDetector;\r
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;\r
-import org.eclipse.jface.text.rules.Token;\r
-import org.eclipse.jface.text.rules.WordRule;\r
-\r
-public class NamePartitionScanner_ extends RuleBasedPartitionScanner {\r
-       public final static String SINGLE_WORD = "__single_word";\r
-       public final static String[] PARTITION_TYPES = {SINGLE_WORD}; \r
-       \r
-       public NamePartitionScanner_()\r
-               {\r
-               super();\r
-                               \r
-               IPredicateRule[] rules = new IPredicateRule[1];\r
-               \r
-               IToken word = new Token(SINGLE_WORD);\r
-               rules[0] = new WordPredicateRule (word);\r
-               \r
-               setPredicateRules(rules);\r
-       }\r
-       \r
-       class WordPredicateRule extends WordRule implements IPredicateRule {\r
-\r
-               private IToken fSuccessToken;\r
-               \r
-               public WordPredicateRule(IToken successToken) {\r
-                       super(new IWordDetector() {\r
-                               \r
-                               public boolean isWordPart(char c) {\r
-                                       return !Character.isWhitespace(c);\r
-                               }\r
-       \r
-                               public boolean isWordStart(char c) {\r
-                                       return !Character.isWhitespace(c);\r
-                               }\r
-                               \r
-                       });\r
-                       this.fSuccessToken = successToken;\r
-               }\r
-\r
-               public IToken evaluate(ICharacterScanner scanner, boolean resume) {\r
-                       return super.evaluate(scanner);\r
-               }\r
-               \r
-               public IToken evaluate(ICharacterScanner scanner) {\r
-                       \r
-                       StringBuffer fBuffer = new StringBuffer();\r
-                       \r
-                       int c = scanner.read();\r
-                       if (c != ICharacterScanner.EOF && fDetector.isWordStart((char) c)) {\r
-                               if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {\r
-\r
-                                       fBuffer.setLength(0);\r
-                                       do {\r
-                                               fBuffer.append((char) c);\r
-                                               c= scanner.read();\r
-                                       } while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c));\r
-                                       scanner.unread();\r
-\r
-                                       return fSuccessToken;\r
-                               }\r
-                       }\r
-\r
-                       scanner.unread();\r
-                       return Token.UNDEFINED;\r
-               }\r
-               \r
-\r
-               public IToken getSuccessToken() {\r
-                       return fSuccessToken;\r
-               }\r
-               \r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner.java
deleted file mode 100644 (file)
index bc98ded..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import java.util.Scanner;\r
-\r
-import org.eclipse.jface.text.BadLocationException;\r
-import org.eclipse.jface.text.BadPositionCategoryException;\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IRegion;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.jface.text.rules.FastPartitioner;\r
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.widgets.Control;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameEditorView;\r
-\r
-public class NamePartitioner extends FastPartitioner {\r
-\r
-       private NameEditorView nameEditorView;\r
-       private Control precedingControl;\r
-\r
-       public NamePartitioner(IPartitionTokenScanner scanner,\r
-                       String[] legalContentTypes, \r
-                       NameEditorView nameEditorView, Control precedingControl) { \r
-               super(scanner, legalContentTypes);\r
-               this.nameEditorView = nameEditorView;\r
-               this.precedingControl = precedingControl;\r
-       }\r
-       \r
-       protected void initialize() {\r
-               \r
-               // if there is unparsed text, put it in the document's taxonname\r
-//             fDocument.addPosition(new Position());\r
-               \r
-               super.initialize();\r
-               try {\r
-                       System.out.println(this.getPositions().length + " positions in new sourceviewer");\r
-               } catch (BadPositionCategoryException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-       \r
-       public IRegion documentChanged2_(DocumentEvent e) {\r
-\r
-               System.out.println("we're in");\r
-               \r
-               String text = e.getText();\r
-               int length = e.getLength();\r
-               int offset = e.getOffset();\r
-               int docLength = e.getDocument().getLength(); // length of doc BEFORE insert\r
-               \r
-               if (text.contains(System.getProperty("line.separator"))) {\r
-                       if (offset < docLength) {\r
-                       // remove text following insert from document,\r
-                       //  add to insert text   \r
-                               try {\r
-                                       text += e.getDocument().get(offset, docLength - offset);\r
-                                       e.getDocument().replace(offset, docLength - offset, "");\r
-                               } catch (BadLocationException e1) {\r
-                                       System.out.println(e1.getMessage());\r
-                                       e1.printStackTrace();\r
-                               }\r
-                       }       \r
-                       \r
-                       Scanner scanner = new Scanner( text );\r
-                       scanner.useDelimiter (System.getProperty("line.separator"));\r
-                       \r
-                       StyledText SText = (StyledText) precedingControl;\r
-                       nameEditorView.createRelatedName(SText, "test");\r
-                       StyledText lastSText = null;\r
-                       while (scanner.hasNext()) {\r
-                               if (lastSText == null)\r
-                                       e.getDocument().set(scanner.next());\r
-                               else\r
-                                       SText = nameEditorView.createRelatedName(SText, scanner.next()).\r
-                                                       getTextWidget();\r
-                               lastSText = SText;\r
-                       }       \r
-                       \r
-                       SText.setFocus();\r
-                       \r
-                       // put cursor at EOL of last sourceviewer\r
-                       SText.setCaretOffset(SText.getText().length()); \r
-                       \r
-                       return null;\r
-               } \r
-               \r
-//             System.out.println("we made it this far");\r
-               \r
-               return super.documentChanged2(e);\r
-       }\r
-       \r
-       public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) {\r
-               System.out.println("computePartitioning called\n\t" + offset + "\n\t" + length + "\n\t" + includeZeroLengthPartitions);\r
-               return super.computePartitioning(offset, length, includeZeroLengthPartitions);\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner__.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NamePartitioner__.java
deleted file mode 100644 (file)
index ff98f26..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import java.beans.PropertyDescriptor;\r
-import java.lang.reflect.Field;\r
-\r
-import org.eclipse.core.databinding.beans.BeansObservables;\r
-import org.eclipse.core.databinding.observable.value.IObservableValue;\r
-import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.jface.text.BadLocationException;\r
-import org.eclipse.jface.text.BadPositionCategoryException;\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.IDocumentPartitioner;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.jface.text.TypedPosition;\r
-import org.eclipse.jface.text.rules.FastPartitioner;\r
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;\r
-\r
-\r
-public class NamePartitioner__ implements IDocumentPartitioner {\r
-\r
-       private static final String NAME_CONTENT_TYPES_CATEGORY = "__name_content_types_category";\r
-       /**\r
-        * The position category this partitioner uses to store the document's partitioning information.\r
-        */\r
-       private final String fPositionCategory;\r
-       private NameDocument fDocument;\r
-       private String[] contentTypes = {"genus","specificEpithet"};\r
-       \r
-       public NamePartitioner__() {\r
-               fPositionCategory = NAME_CONTENT_TYPES_CATEGORY + hashCode();\r
-       }\r
-\r
-       public ITypedRegion[] computePartitioning(int offset, int length) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-       public void connect(IDocument document) {\r
-               Assert.isTrue(document instanceof NameDocument, \r
-                               "NamePartitioner__ requires a NameDocument");\r
-               this.fDocument = (NameDocument) document;\r
-               this.fDocument.addPositionCategory(fPositionCategory);\r
-               \r
-               TaxonName tn = fDocument.getTaxonName();\r
-               \r
-               if (tn == null) {\r
-                       // find matching pattern to init TaxonName\r
-                       \r
-                       document.get(); \r
-               } else {\r
-                       // construct partitions from TaxonName\r
-                                               \r
-                       try {\r
-                               TypedPosition[] positions = new TypedPosition[contentTypes.length];\r
-                               int offset = 0;\r
-                               String text = "";\r
-                               \r
-                               for (int i = 0; i < contentTypes.length; i++) {\r
-                                       String field = contentTypes[i];\r
-                                       \r
-                                       IObservableValue observeValue = BeansObservables.observeValue(tn, field);\r
-                                       \r
-                                       String value = (String) observeValue.getValue();\r
-                                       int length = value.length();\r
-                                                                               \r
-                                       TypedPosition p = new TypedPosition(offset, length, field);\r
-                                       positions[i] = p;\r
-                                       \r
-                                       offset += length + 1;\r
-                                       text += value + " ";    \r
-                               }\r
-                               fDocument.set(text);\r
-                               for (int i = 0; i < positions.length; i++)\r
-                                       fDocument.addPosition(fPositionCategory, positions[i]);\r
-//                     } catch (BadLocationException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     } catch (SecurityException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     } catch (NoSuchFieldException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     } catch (IllegalArgumentException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     } catch (IllegalAccessException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-//                     } catch (BadPositionCategoryException e) {\r
-//                             // TODO Auto-generated catch block\r
-//                             e.printStackTrace();\r
-                       } catch (Exception e) {\r
-                               e.printStackTrace();\r
-                               System.out.println(e.getMessage());\r
-                       }\r
-               }\r
-       }\r
-\r
-       public void disconnect() {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-       public void documentAboutToBeChanged(DocumentEvent event) {\r
-               System.out.println("You are here: " + getContentType(event.fOffset));\r
-//             System.out.println("You are here: " + event.fOffset);\r
-       }\r
-\r
-       public boolean documentChanged(DocumentEvent event) {\r
-               // TODO Auto-generated method stub\r
-               return false;\r
-       }\r
-\r
-       public String getContentType(int offset) {\r
-               ITypedRegion region = null;\r
-               try {\r
-                       region = fDocument.getPartition(offset);\r
-               } catch (BadLocationException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
-               }\r
-               return region.getType();\r
-       }\r
-\r
-       public String[] getLegalContentTypes() {\r
-               return contentTypes;\r
-       }\r
-\r
-       public ITypedRegion getPartition(int offset) {\r
-               ITypedRegion region = null;\r
-               try {\r
-                       region = fDocument.getPartition(offset);\r
-               } catch (BadLocationException e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
-               }\r
-               return region;\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerConfig.java
deleted file mode 100644 (file)
index ce5d5f1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.jface.text.presentation.IPresentationReconciler;\r
-import org.eclipse.jface.text.presentation.PresentationReconciler;\r
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;\r
-import org.eclipse.jface.text.source.ISourceViewer;\r
-import org.eclipse.jface.text.source.SourceViewerConfiguration;\r
-\r
-public class NameViewerConfig extends SourceViewerConfiguration {\r
-\r
-       /** \r
-        * Whenever a change is made to the document, a notification is sent to the \r
-        *  IPresentationDamager for each content type in the affected area of the document. \r
-        *  The IPresentationDamager in turn returns an IRegion indicating the area of the \r
-        *  document which needs to be rebuilt as a result of the change. This information is \r
-        *  then passed on to the IPresentationRepairer, which is responsible for reapplying \r
-        *  the textual presentation for the affected region.\r
-        *  \r
-        *  This all probably sounds quite complicated. Fortunately you probably won't ever need \r
-        *  to implement any of these classes yourself. JFace Text provides a \r
-        *  DefaultDamagerRepairer which does the job both of the IPresentationDamager and the \r
-        *  IPresentationRepairer. It also provides a PresentationReconciler class which performs \r
-        *  the co-ordination role we described earlier.\r
-        *  \r
-        *  ...\r
-        *  \r
-        *  If you understand document partitioning then you are in a very good position to understand \r
-        *  syntax highlighting in a JFace Text application. Essentially, syntax highlighting involves \r
-        *  dividing a region into tokens, each of which has its own text display attributes. The \r
-        *  standard mechanism for doing this also involves the use of the already familiar tokens, \r
-        *  scanners and rules.\r
-        *   \r
-        **/  \r
-       public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer)\r
-       {\r
-           PresentationReconciler reconciler = new PresentationReconciler();\r
-           \r
-           DefaultDamagerRepairer dr = new NameDamagerRepairer(new NamePartitionScanner());\r
-//         reconciler.setDamager(dr, "genus");\r
-//         reconciler.setRepairer(dr, "genus");            \r
-           \r
-           return reconciler;\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerKeyListener.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerKeyListener.java
deleted file mode 100644 (file)
index 2946ef1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.KeyEvent;\r
-import org.eclipse.swt.events.KeyListener;\r
-\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionAddSynonymToTaxon;\r
-\r
-/**\r
- * The only purpose of this listener is to catch carriage returns\r
- *  at end-of-line, and create new empty name viewers.\r
- *  \r
- * Carriage returns in the middle of a line are caught by\r
- *  NameViewerModifyListener. \r
- * \r
- * @author p.ciardelli\r
- *\r
- */\r
-public class NameViewerKeyListener implements KeyListener {\r
-\r
-       private Taxon taxon;\r
-       \r
-       public NameViewerKeyListener(Taxon taxon) {\r
-               \r
-               Assert.isNotNull(taxon);\r
-               this.taxon = taxon;\r
-       }\r
-\r
-       public void keyPressed(KeyEvent e) {\r
-               StyledText sText = (StyledText) e.widget;\r
-                               \r
-               // If user has pressed carriage return at EOL,\r
-               //  the modifyListener doesn't catch it -\r
-               //  make new source viewer\r
-               if (e.character == SWT.CR && \r
-                               sText.getCaretOffset() == sText.getText().length()) {\r
-                       new ActionAddSynonymToTaxon(taxon, "").run();\r
-               }\r
-       }\r
-       public void keyReleased(KeyEvent e) { }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerModifyListener.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/NameViewerModifyListener.java
deleted file mode 100644 (file)
index 2b83f60..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import java.util.Scanner;\r
-\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.ModifyEvent;\r
-import org.eclipse.swt.events.ModifyListener;\r
-\r
-import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionAddSynonymToTaxon;\r
-\r
-/**\r
- * This listener catches all line breaks other than carriage\r
- *  returns at end-of-line, and creates new name viewers,\r
- *  for instance, if user pastes a block of taxon information.  \r
- * \r
- * @author p.ciardelli\r
- *\r
- */\r
-public class NameViewerModifyListener implements ModifyListener {\r
-\r
-       private Taxon taxon;\r
-       \r
-       public NameViewerModifyListener(Taxon taxon) {\r
-               this.taxon = taxon;\r
-       }\r
-\r
-       public void modifyText(ModifyEvent e) {\r
-\r
-               StyledText sText = (StyledText) e.widget;\r
-               NameComposite nameComposite = (NameComposite) sText.getParent();\r
-                               \r
-               // User has copy-pasted multi-line text - \r
-               //  split it into new source viewers\r
-               if (sText.getText().contains("\r") || sText.getText().contains("\n")) {\r
-                       \r
-                       Scanner scanner = new Scanner( sText.getText() );\r
-                       scanner.useDelimiter (System.getProperty("line.separator"));\r
-\r
-                       nameComposite.getName().setTitleCache(scanner.next());\r
-                       while (scanner.hasNext())\r
-                               new ActionAddSynonymToTaxon(taxon, scanner.next()).run();                               \r
-                       \r
-                       // Put cursor at EOL of original sourceviewer\r
-                       sText.setFocus();\r
-                       sText.setCaretOffset(sText.getText().length());\r
-                       return;\r
-               }\r
-                               \r
-               // Text now contains no line breaks - parse it and send it to the name composite\r
-               nameComposite.getName().setTitleCache(sText.getText());\r
-//             nameComposite.setName(BotanicalName.PARSED_NAME(sText.getText()));\r
-               \r
-//             ITaxonNameParser<BotanicalName> parser = TaxonNameParserBotanicalNameImpl.NEW_INSTANCE();       \r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/SimpleNamePartitioner.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/nameviewersupport/SimpleNamePartitioner.java
deleted file mode 100644 (file)
index a2a5b21..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
-\r
-import java.util.Scanner;\r
-\r
-import org.eclipse.jface.text.BadLocationException;\r
-import org.eclipse.jface.text.DocumentEvent;\r
-import org.eclipse.jface.text.IDocument;\r
-import org.eclipse.jface.text.IDocumentPartitioner;\r
-import org.eclipse.jface.text.ITypedRegion;\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.widgets.Control;\r
-\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameEditorView;\r
-\r
-public class SimpleNamePartitioner implements IDocumentPartitioner {\r
-\r
-       private NameEditorView nameEditorView;\r
-       private Control precedingControl;\r
-       \r
-       public SimpleNamePartitioner(NameEditorView nameEditorView, Control precedingControl) {\r
-               this.nameEditorView = nameEditorView;\r
-               this.precedingControl = precedingControl;               \r
-       }\r
-       \r
-       public ITypedRegion[] computePartitioning(int offset, int length) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-       public void connect(IDocument document) {\r
-               // TODO Auto-generated method stub\r
-\r
-       }\r
-\r
-       public void disconnect() {\r
-               // TODO Auto-generated method stub\r
-\r
-       }\r
-\r
-       public void documentAboutToBeChanged(DocumentEvent e) {\r
-\r
-               String text = e.getText();\r
-               int length = e.getLength();\r
-               int offset = e.getOffset();\r
-               int docLength = e.getDocument().getLength(); // length of doc BEFORE insert\r
-               \r
-               if (text.contains(System.getProperty("line.separator"))) {\r
-                       if (offset < docLength) {\r
-       //               remove text following insert from document,\r
-       //                add to insert text     \r
-                               try {\r
-                                       text += e.getDocument().get(offset, docLength - offset);\r
-                                       e.getDocument().replace(offset, docLength - offset, "");\r
-                               } catch (BadLocationException e1) {\r
-                                       System.out.println(e1.getMessage());\r
-                                       e1.printStackTrace();\r
-                               }\r
-                       }       \r
-                       \r
-                       Scanner scanner = new Scanner( text );\r
-                       scanner.useDelimiter (System.getProperty("line.separator"));\r
-                       \r
-                       StyledText SText = (StyledText) precedingControl;\r
-                       nameEditorView.createRelatedName(SText, "test");\r
-                       StyledText lastSText = null;\r
-                       while (scanner.hasNext()) {\r
-                               if (lastSText == null)\r
-                                       e.getDocument().set(scanner.next());\r
-                               else\r
-                                       SText = nameEditorView.createRelatedName(SText, scanner.next()).\r
-                                                       getTextWidget();\r
-                               lastSText = SText;\r
-                       }       \r
-                       \r
-                       SText.setFocus();\r
-                       \r
-                       // put cursor at EOL of last sourceviewer\r
-                       SText.setCaretOffset(SText.getText().length()); \r
-               }\r
-       }\r
-\r
-       public boolean documentChanged(DocumentEvent event) {\r
-               // TODO Auto-generated method stub\r
-               return false;\r
-       }\r
-\r
-       public String getContentType(int offset) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-       public String[] getLegalContentTypes() {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-       public ITypedRegion getPartition(int offset) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-}\r
similarity index 82%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/EmptyEditorView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/EmptyEditorView.java
index f92c6228607c79b7a9e30fd776c5a468a7b8e4ca..15ad42e16f113d337f9be4786e940afbc6f658a1 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.swt.SWT;\r
@@ -10,7 +10,7 @@ import org.eclipse.ui.part.EditorPart;
 \r
 public class EmptyEditorView extends EditorPart {\r
 \r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.EmptyEditorView"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.view.EmptyEditorView"; //$NON-NLS-1$\r
 \r
        /**\r
         * Create contents of the editor part\r
similarity index 95%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MoveDialogView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MoveDialogView.java
index 5fe7da8143117f5c66636d2948879bf7f0784f6f..8d0d68cae7475d08a550133f3a15fbbd5c37a408 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -31,7 +31,7 @@ import com.swtdesigner.ResourceManager;
 import com.swtdesigner.SWTResourceManager;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 public class MoveDialogView extends Dialog {\r
 \r
similarity index 90%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/MultiPageTaxonView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/MultiPageTaxonView.java
index 978fb318402be62e3384efa243287b6eb03927aa..24b5347cc02cffc4ebffddd0488d5d9673bf7398 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import java.beans.PropertyChangeEvent;\r
 import java.beans.PropertyChangeListener;\r
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  */\r
 public class MultiPageTaxonView extends MultiPageEditorPart {\r
 \r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.multipagetaxonview";\r
+       public static final String ID = "eu.etaxonomy.taxeditor.view.multipagetaxonview";\r
        private Taxon taxon;\r
        \r
        @Override\r
similarity index 91%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameEditorView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java
index 60fbc448b9013ef8f6de9dea317841e0d5bda073..3614746e7d482be0a2e458d8160d09497238cfb8 100644 (file)
@@ -1,11 +1,10 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import java.beans.PropertyChangeEvent;\r
 import java.beans.PropertyChangeListener;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import org.eclipse.core.databinding.DataBindingContext;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.set.ISetChangeListener;\r
 import org.eclipse.core.databinding.observable.set.SetChangeEvent;\r
@@ -45,7 +44,6 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;\r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.part.EditorPart;\r
-import org.eclipse.ui.part.WorkbenchPart;\r
 \r
 import com.swtdesigner.ResourceManager;\r
 import com.swtdesigner.SWTResourceManager;\r
@@ -55,19 +53,19 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionDeleteTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNameEditor;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNewChildNameEditor;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionSaveTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.prototype2.model.PropertySheetNode;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.GroupComposite;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.NameComposite;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.TesterooWritableSet;\r
-import eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport.PropertySheetContentProvider;\r
-import eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport.PropertySheetValueEditingSupport;\r
-import eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport.PropertySheetValueLabelProvider;\r
+import eu.etaxonomy.taxeditor.Activator;\r
+import eu.etaxonomy.taxeditor.controller.ActionDeleteTaxon;\r
+import eu.etaxonomy.taxeditor.controller.ActionOpenNameEditor;\r
+import eu.etaxonomy.taxeditor.controller.ActionOpenNewChildNameEditor;\r
+import eu.etaxonomy.taxeditor.controller.ActionSaveTaxon;\r
+import eu.etaxonomy.taxeditor.controller.TaxonTransfer;\r
+import eu.etaxonomy.taxeditor.model.PropertySheetNode;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.GroupComposite;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.NameComposite;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.TesterooWritableSet;\r
+import eu.etaxonomy.taxeditor.view.propertysheetsupport.PropertySheetContentProvider;\r
+import eu.etaxonomy.taxeditor.view.propertysheetsupport.PropertySheetValueEditingSupport;\r
+import eu.etaxonomy.taxeditor.view.propertysheetsupport.PropertySheetValueLabelProvider;\r
 \r
 /**\r
  * TODO: user should always know what kind of name - BotanicalName,\r
@@ -130,7 +128,7 @@ public class NameEditorView extends EditorPart {
        private PropertySheetViewer propertySheetViewer;\r
        private Composite parent;\r
        \r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.nameeditorview"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.view.nameeditorview"; //$NON-NLS-1$\r
 \r
        public NameEditorView() {\r
                \r
similarity index 94%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameListView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameListView.java
index 1f552953d112001d71422402f9e3556324cf7113..d993ceb4693e3fcaf413b3d0d58338cbb7962d74 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.jface.action.IMenuManager;\r
 import org.eclipse.jface.action.IToolBarManager;\r
@@ -25,7 +25,7 @@ import org.eclipse.ui.part.ViewPart;
 import com.swtdesigner.ResourceManager;\r
 import com.swtdesigner.SWTResourceManager;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -44,7 +44,7 @@ public class NameListView extends ViewPart {
        private ExpandItem recentNamesExpandItem;\r
        private ExpandItem searchExpandItem;\r
        private TableViewer recentNamesViewer;  \r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.namelistview"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.view.namelistview"; //$NON-NLS-1$\r
 \r
        private TreeViewer treeViewer;\r
        \r
similarity index 86%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/NameViewer.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameViewer.java
index 4c35a0ef9d1250bd2940ea6b0b32e56aaab1b412..3cc8268f2303b02e04514e761073ffa6717ba30e 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import java.util.Iterator;\r
 \r
@@ -14,9 +14,10 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Display;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.AnnotationMarkerAccess;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.ErrorAnnotation;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.WarningAnnotation;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.AnnotationMarkerAccess;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.ErrorAnnotation;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.WarningAnnotation;\r
+\r
 \r
 /**\r
  * SourceViewer implementation called by NameEditorView.\r
similarity index 93%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/PropertySheetViewer.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/PropertySheetViewer.java
index 0aff10025f5c946ddbd9df8ee2a4cd09e34e63b7..4933fb7e060fb713486c38438ad4c784ab912ef9 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.core.databinding.DataBindingContext;\r
 import org.eclipse.jface.viewers.ColumnLabelProvider;\r
@@ -10,7 +10,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;\r
 import org.eclipse.swt.widgets.Listener;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.model.PropertySheetNode;\r
+import eu.etaxonomy.taxeditor.model.PropertySheetNode;\r
 \r
 /**\r
  * Creates a tree viewer with two columns, one for field names the other\r
similarity index 90%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/RecentNamesTableViewer.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/RecentNamesTableViewer.java
index bcb93ebdeeaf1e8e7d9e5f85323014871d4546d9..f6e4942b0debfc9f05344e9e97229fc5df502e7d 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
@@ -13,8 +13,8 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNameEditor;\r
+import eu.etaxonomy.taxeditor.Activator;\r
+import eu.etaxonomy.taxeditor.controller.ActionOpenNameEditor;\r
 \r
 public class RecentNamesTableViewer extends TableViewer {\r
 \r
similarity index 93%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/TaxonomicTreeViewer.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TaxonomicTreeViewer.java
index 8ad6ce3736513a70361a44afc5e219554e0b14f3..0eab3a40aaa1d95f8e8fe205e146705a5b3dfb17 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
@@ -49,15 +49,14 @@ import org.eclipse.ui.PlatformUI;
 import com.swtdesigner.ResourceManager;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionAddQuickName;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionMoveTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNameEditor;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionOpenNewChildNameEditor;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionRemoveTaxonFromTree;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionSaveTaxon;\r
-import eu.etaxonomy.taxeditor.prototype2.model.NameTreeContentProvider;\r
-\r
+import eu.etaxonomy.taxeditor.Activator;\r
+import eu.etaxonomy.taxeditor.controller.ActionAddQuickName;\r
+import eu.etaxonomy.taxeditor.controller.ActionMoveTaxon;\r
+import eu.etaxonomy.taxeditor.controller.ActionOpenNameEditor;\r
+import eu.etaxonomy.taxeditor.controller.ActionOpenNewChildNameEditor;\r
+import eu.etaxonomy.taxeditor.controller.ActionRemoveTaxonFromTree;\r
+import eu.etaxonomy.taxeditor.controller.ActionSaveTaxon;\r
+import eu.etaxonomy.taxeditor.model.NameTreeContentProvider;\r
 /**\r
  * Taxon tree viewer which responds to events within individual taxa.\r
  * \r
similarity index 86%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/Testeroo.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TestDragAndDrop.java
index 7a597414d8e49ce5e44dbfc2b73de2e8d7a69f00..52a53e2f5c57e9ed44c967302a116cf852477659 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.set.ISetChangeListener;\r
@@ -21,14 +21,14 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.GroupComposite;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.NameComposite;\r
-import eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport.TesterooWritableSet;\r
+import eu.etaxonomy.taxeditor.controller.TaxonTransfer;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.GroupComposite;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.NameComposite;\r
+import eu.etaxonomy.taxeditor.view.nameviewersupport.TesterooWritableSet;\r
 \r
-public class Testeroo {\r
+public class TestDragAndDrop {\r
 \r
-       private static final Logger logger = Logger.getLogger(Testeroo.class);\r
+       private static final Logger logger = Logger.getLogger(TestDragAndDrop.class);\r
        \r
        protected Shell shell;\r
        /**\r
@@ -37,7 +37,7 @@ public class Testeroo {
         */\r
        public static void main(String[] args) {\r
                try {\r
-                       Testeroo window = new Testeroo();\r
+                       TestDragAndDrop window = new TestDragAndDrop();\r
                        window.open();\r
                } catch (Exception e) {\r
                        e.printStackTrace();\r
@@ -159,7 +159,7 @@ public class Testeroo {
                        \r
                        new NameComposite(heteroGroupComposite, synonym, taxon).setFocus();\r
                        \r
-                       Testeroo.this.composite.layout();\r
+                       TestDragAndDrop.this.composite.layout();\r
                }               \r
        };\r
 }\r
similarity index 93%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/prototype2/view/UndoView.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/UndoView.java
index ec566f1b9d2972fdd1519cc24cd92b9d8d16e950..4a138e1ca834f4f6fda9e2f47e01ebe36ce081f9 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view;\r
+package eu.etaxonomy.taxeditor.view;\r
 \r
 import org.eclipse.jface.action.IMenuManager;\r
 import org.eclipse.jface.action.IToolBarManager;\r
@@ -29,11 +29,11 @@ import org.eclipse.ui.part.ViewPart;
 import com.swtdesigner.ResourceManager;\r
 import com.swtdesigner.SWTResourceManager;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.Activator;\r
+import eu.etaxonomy.taxeditor.Activator;\r
 \r
 public class UndoView extends ViewPart {\r
 \r
-       public static final String ID = "eu.etaxonomy.taxeditor.prototype2.view.undoview"; //$NON-NLS-1$\r
+       public static final String ID = "eu.etaxonomy.taxeditor.view.undoview"; //$NON-NLS-1$\r
     private Table table;\r
 \r
     /**\r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
+package eu.etaxonomy.taxeditor.view.nameviewersupport;\r
 \r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.dnd.DND;\r
@@ -19,8 +19,8 @@ import org.eclipse.swt.widgets.Listener;
 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.taxeditor.prototype2.controller.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameEditorView;\r
+import eu.etaxonomy.taxeditor.controller.TaxonTransfer;\r
+import eu.etaxonomy.taxeditor.view.NameEditorView;\r
 \r
 public class GroupComposite extends Composite {\r
        \r
@@ -1,7 +1,6 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
+package eu.etaxonomy.taxeditor.view.nameviewersupport;\r
 \r
 import org.eclipse.core.runtime.Assert;\r
-import org.eclipse.jface.text.Position;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.custom.StyledText;\r
 import org.eclipse.swt.dnd.DND;\r
@@ -20,7 +19,6 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;\r
 import org.eclipse.swt.layout.GridLayout;\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.Label;\r
 import org.eclipse.swt.widgets.Menu;\r
@@ -32,10 +30,9 @@ import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionPopulatePropertySheet;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameEditorView;\r
-import eu.etaxonomy.taxeditor.prototype2.view.NameViewer;\r
+import eu.etaxonomy.taxeditor.controller.TaxonTransfer;\r
+import eu.etaxonomy.taxeditor.view.NameEditorView;\r
+import eu.etaxonomy.taxeditor.view.NameViewer;\r
 \r
 public class NameComposite extends Composite {\r
        \r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view.nameviewersupport;\r
+package eu.etaxonomy.taxeditor.view.nameviewersupport;\r
 \r
 import java.util.Scanner;\r
 \r
@@ -7,7 +7,7 @@ import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.prototype2.controller.ActionAddSynonymToTaxon;\r
+import eu.etaxonomy.taxeditor.controller.ActionAddSynonymToTaxon;\r
 \r
 /**\r
  * Checks text entered into a name viewer for line breaks, creates\r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport;\r
+package eu.etaxonomy.taxeditor.view.propertysheetsupport;\r
 \r
 import java.util.List;\r
 \r
@@ -6,7 +6,7 @@ import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;\r
 import org.eclipse.jface.viewers.Viewer;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.model.PropertySheetNode;\r
+import eu.etaxonomy.taxeditor.model.PropertySheetNode;\r
 \r
 public class PropertySheetContentProvider extends ObservableListContentProvider implements ITreeContentProvider {\r
 \r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport;\r
+package eu.etaxonomy.taxeditor.view.propertysheetsupport;\r
 \r
 import java.util.TreeMap;\r
 \r
@@ -13,8 +13,8 @@ import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.ViewerCell;\r
 import org.eclipse.swt.SWT;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.model.PropertySheetNode;\r
-import eu.etaxonomy.taxeditor.prototype2.view.PropertySheetViewer;\r
+import eu.etaxonomy.taxeditor.model.PropertySheetNode;\r
+import eu.etaxonomy.taxeditor.view.PropertySheetViewer;\r
 \r
 public class PropertySheetValueEditingSupport extends EditingSupport {\r
 \r
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.prototype2.view.propertysheetsupport;\r
+package eu.etaxonomy.taxeditor.view.propertysheetsupport;\r
 \r
 import org.eclipse.core.databinding.DataBindingContext;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
@@ -9,8 +9,8 @@ import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.TreeItem;\r
 \r
-import eu.etaxonomy.taxeditor.prototype2.model.PropertySheetNode;\r
-import eu.etaxonomy.taxeditor.prototype2.view.PropertySheetViewer;\r
+import eu.etaxonomy.taxeditor.model.PropertySheetNode;\r
+import eu.etaxonomy.taxeditor.view.PropertySheetViewer;\r
 \r
 /**\r
  * \r