1) Re-arranged packages:
authorp.ciardelli <p.ciardelli@localhost>
Fri, 12 Sep 2008 15:25:15 +0000 (15:25 +0000)
committerp.ciardelli <p.ciardelli@localhost>
Fri, 12 Sep 2008 15:25:15 +0000 (15:25 +0000)
search, tax. tree, favorites, recent names
-> eu.etaxonomy.taxeditor.navigation

all free-text editing classes
-> eu.etaxonomy.taxeditor.editor

property sheet classes
-> eu.etaxonomy.taxeditor.propertysheet

2) eu.etaxonomy.taxeditor.editor.description - can now create a description, add elements, save, and partially display saved descriptions

.gitattributes
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionElementComposite.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionLabelComposite.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/ElementWithDescription.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/IterableDescriptionList.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionComposite.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionEditorView.java [deleted file]

index b1ceeaf0b288de7adf396188a09e03c75f064e1d..187aad3750e9647c4753eb0eb2478820d996a7c4 100644 (file)
@@ -472,12 +472,6 @@ eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/Taxonomic
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TaxonomicTreeView.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/TaxonomicTreeViewer.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/UndoView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionElementComposite.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionLabelComposite.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/ElementWithDescription.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/IterableDescriptionList.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionComposite.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionEditorView.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/ChangeSynonymToTaxonUiAction.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/CompositeBorderDecorator.java -text
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionElementComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionElementComposite.java
deleted file mode 100644 (file)
index ef4feaf..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
- * http://www.e-taxonomy.eu\r
- * \r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.swt.events.FocusAdapter;\r
-import org.eclipse.swt.events.FocusEvent;\r
-import org.eclipse.swt.graphics.Font;\r
-import org.eclipse.swt.graphics.Image;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.ui.forms.IManagedForm;\r
-\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.actions.ui.description.DeleteElementCompositeAction;\r
-import eu.etaxonomy.taxeditor.view.ContextMenu;\r
-import eu.etaxonomy.taxeditor.view.NameViewer;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.EditorGroupedComposite;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.LineBreakListener;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.LineWrapSupport;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 02.06.2008\r
- * @version 1.0\r
- */\r
-public class DescriptionElementComposite extends EditorGroupedComposite {\r
-       private static final Logger logger = Logger.getLogger(DescriptionElementComposite.class);\r
-\r
-       /**\r
-        * ************ COMPOSITE TYPES ************\r
-        */\r
-       public String compositeType;\r
-       public static final String TEXT_DATA = "text_data";\r
-       public static final String COMMON_TAXON_NAME = "common_taxon_name";\r
-       public static final String DISTRIBUTION = "distribution";\r
-//     public static final String ACCEPTED_TAXON = "accepted_name_composite";\r
-//     public static final String HOMOTYPIC_SYNONYM = "homotypic_name_composite";\r
-//     public static final String HETEROTYPIC_SYNONYM = "heterotypic_name_composite";\r
-//     public static final String MISAPPLIED_NAME = "misappliedname_name_composite";\r
-\r
-       /**\r
-        * ************ INDENTATIONS ************\r
-        */\r
-       public static final int ACCEPTED_INDENT = 0;\r
-       public static final int SYNONYM_INDENT = 15;\r
-       public static final int MISAPPLIEDNAME_INDENT = 15;\r
-\r
-       /**\r
-        * ************ FONTS ************\r
-        */\r
-       public static final Font ACCEPTED_FONT = TaxEditorPlugin.getDefault()\r
-                       .getFont(ITaxEditorConstants.ACCEPTED_TAXON_FONT);\r
-       public static final Font SYNONYM_FONT = TaxEditorPlugin.getDefault()\r
-                       .getFont(ITaxEditorConstants.SYNONYM_FONT);\r
-       public static final Font MISAPPLIEDNAME_FONT = TaxEditorPlugin.getDefault()\r
-                       .getFont(ITaxEditorConstants.MISAPPLIEDNAME_FONT);\r
-\r
-       /**\r
-        * ************ ICONS ************\r
-        */\r
-       public static final Image ACCEPTED_ICON = TaxEditorPlugin.getDefault()\r
-                       .getImage(ITaxEditorConstants.BLACK_SQUARE_ICON);\r
-       public static final Image HOMOTYPIC_SYNONYM_ICON = TaxEditorPlugin\r
-                       .getDefault().getImage(ITaxEditorConstants.HOMOTYPIC_SYN_ICON);\r
-       public static final Image HOMOTYPIC_SYNONYM_ORIGINAL_COMBINATION_ICON = TaxEditorPlugin\r
-                       .getDefault().getImage(\r
-                                       ITaxEditorConstants.HOMOTYPIC_SYN_ORIGINAL_ICON);\r
-       public static final Image HETEROTYPIC_SYNONYM_ICON = TaxEditorPlugin\r
-                       .getDefault().getImage(ITaxEditorConstants.HETEROTYPIC_SYN_ICON);\r
-       public static final Image HETEROTYPIC_SYNONYM_ORIGINAL_COMBINATION_ICON = TaxEditorPlugin\r
-                       .getDefault().getImage(\r
-                                       ITaxEditorConstants.HETEROTYPIC_SYN_ORIGINAL_ICON);\r
-       public static final Image MISAPPLIEDNAME_ICON = TaxEditorPlugin\r
-                       .getDefault().getImage(ITaxEditorConstants.MISAPPLIED_NAME_ICON);\r
-       public static final Image AUTONYM_ICON = TaxEditorPlugin.getDefault()\r
-                       .getImage(ITaxEditorConstants.AUTONYM_ICON);\r
-       public static final Image BASIONYM_ICON = TaxEditorPlugin.getDefault()\r
-                       .getImage(ITaxEditorConstants.BASIONYM_ICON);\r
-       public static final Image MOVE = TaxEditorPlugin.getDefault().getImage(\r
-                       ITaxEditorConstants.MOVE_ICON);\r
-\r
-       /**\r
-        * ************ TRANSFORMATIONS ************\r
-        */\r
-       public static final String ADD_GROUP_BASIONYM = "add_group_basionym";\r
-       public static final String REMOVE_GROUP_BASIONYM = "remove_group_basionym";\r
-\r
-       /**\r
-        * ************ MENU ACTIONS ************\r
-        */\r
-       public Action CHANGE_TAXON_TO_SYNONYM_ACTION;\r
-\r
-       /**\r
-        * The constructor for a DescriptionElementComposite. Takes a parent Composite on which to\r
-        * create itself, and an IManagedForm for Composite life cycle methods, i.e.\r
-        * drawing borders, creating other Composites, creating line wrap support,\r
-        * etc.\r
-        * \r
-        * @param parent\r
-        * @param managedForm\r
-        */\r
-       public DescriptionElementComposite(Composite parent, IManagedForm managedForm, String compositeType, Object data) {\r
-               super(parent, managedForm);\r
-\r
-               createNameViewer();\r
-               createBorderSupport();\r
-               createLineWrapSupport();\r
-\r
-               setData(data);\r
-               transform(compositeType);\r
-               \r
-               setFocus();\r
-       }\r
-\r
-       private void createLineWrapSupport() {\r
-               new LineWrapSupport(getTextViewer(), managedForm);\r
-       }\r
-\r
-       /**\r
-        * All cosmetic - non-data-related, i.e. icons, fonts, etc. -\r
-        * transformations take place in this method.\r
-        * \r
-        * @param transformation\r
-        */\r
-       public void transform(String transformation) {\r
-\r
-               setIcon(ACCEPTED_ICON);\r
-               createMenu();\r
-\r
-               setDirty(true);\r
-               managedForm.getForm().layout();\r
-       }\r
-\r
-       /**\r
-        * Override of Composite.setData() which passes data along to\r
-        * DescriptionElementComposite's TextViewer where appropriate.\r
-        * \r
-        * @see org.eclipse.swt.widgets.Widget#setData(java.lang.Object)\r
-        */\r
-       public void setData(Object data) {\r
-               super.setData(data);\r
-               if (data instanceof DescriptionElementBase) {\r
-\r
-//                     String text = ((DescriptionElementBase) data).getFeature().getLabel();\r
-                       String text = "";\r
-                       ((DescriptionElementBase) data).getFeature();\r
-//                     String text = CdmUtil.getDisplayName((TaxonBase) data);\r
-                       getTextViewer().getTextWidget().setText(text);\r
-\r
-                       if (getTextViewer() instanceof NameViewer) {\r
-                               ((NameViewer) getTextViewer()).setCursorToEOL();\r
-\r
-//                             if (((TaxonBase) data).getName() != null) {\r
-//                                     boolean hasProblem = ((TaxonBase) data).getName()\r
-//                                                     .getHasProblem();\r
-//                                     ((NameViewer) getTextViewer()).setShowError(hasProblem);\r
-//                             }\r
-                       }\r
-               }\r
-       }\r
-\r
-       private NameViewer createNameViewer() {\r
-               final NameViewer nameViewer = new NameViewer(this);\r
\r
-               nameViewer.setLineBreakListener(new LineBreakListener() {\r
-\r
-                       @Override\r
-                       public void handleSplitText(String text) {\r
-\r
-                               // Line breaks are allowed in DescriptionElements\r
-\r
-                       }\r
-\r
-               });\r
-               /*\r
-               nameViewer.setParseListener(new ParseListener() {\r
-\r
-                       @Override\r
-                       public void parse(String text) {\r
-\r
-                               TaxonBase taxonBase = (TaxonBase) getData();\r
-\r
-                               NonViralName nonViralName = (NonViralName) taxonBase.getName();\r
-                               if (nonViralName != null) {\r
-                                       CdmUtil.parseFullName(nonViralName, text, null, true);\r
-                                       nameViewer.setShowError(nonViralName.getHasProblem());\r
-                               }\r
-\r
-                               setDirty(true);\r
-                       }\r
-               });\r
-               */\r
-\r
-               nameViewer.getTextWidget().addFocusListener(new FocusAdapter() {\r
-                       public void focusGained(FocusEvent e) {\r
-                               setFocus();\r
-                       }\r
-               });\r
-\r
-               this.textViewer = nameViewer;\r
-               return nameViewer;\r
-       }\r
-\r
-       private void createMenu() {\r
-               ContextMenu contextMenu = new ContextMenu(getDraggableLabel());\r
-               \r
-               // Delete this description element\r
-               Action deleteElementAction = new DeleteElementCompositeAction(\r
-                               this, getTaxon());\r
-               contextMenu.addAction(deleteElementAction);\r
-               \r
-               // Add new text \r
-       }\r
-       \r
-       \r
-       public boolean setParent(Composite parent) {\r
-\r
-               return super.setParent(parent);\r
-//             if (super.setParent(parent)) {\r
-//\r
-//                     // Has this been moved to the misapplied names group?\r
-//                     if (parent.getData(ITaxEditorConstants.MISAPPLIED_NAME) != null) {\r
-//                             new ChangeCompositeToMisappliedNameAction(this, managedForm)\r
-//                                             .run();\r
-//                     }\r
-//\r
-//                     // Has this been moved to a HomotypicalGroup?\r
-//                     if (parent.getData() instanceof HomotypicalGroup) {\r
-//                             new AdaptCompositeToGroupAction(this,\r
-//                                             (EditorGroupComposite) parent).run();\r
-//                     }\r
-//                     return true;\r
-//\r
-//             }\r
-//             return false;\r
-       }\r
-\r
-       private Taxon getTaxon() {\r
-               Composite parent = getParent();\r
-               Composite grandParent = parent.getParent();\r
-               if (grandParent != null) {\r
-                       Object parentData = grandParent.getData();\r
-                       if (parentData instanceof Taxon) {\r
-                               return (Taxon) parentData;\r
-                       }\r
-               }\r
-               throw new IllegalArgumentException(\r
-                               "The parent of the DescriptionElementComposite's parent does not have a Taxon in its data field as required.");\r
-       }\r
-       \r
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionLabelComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/DescriptionLabelComposite.java
deleted file mode 100644 (file)
index 8d78e0c..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.TextViewer;\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.graphics.Font;\r
-import org.eclipse.swt.graphics.Image;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.ui.forms.IManagedForm;\r
-import org.eclipse.ui.forms.widgets.TableWrapData;\r
-\r
-import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.EditorGroupedComposite;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.NameComposite;\r
-\r
-/**\r
- * Composite for editing a description's label / Title Cache information\r
- * \r
- * @author p.ciardelli\r
- * @created 09.09.2008\r
- * @version 1.0\r
- */\r
-public class DescriptionLabelComposite extends EditorGroupedComposite {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(DescriptionLabelComposite.class);\r
-\r
-       /**\r
-        * ************ FONTS ************\r
-        */\r
-       public static final Font DESCRIPTION_LABEL_FONT = TaxEditorPlugin.getDefault()\r
-                       .getFont(ITaxEditorConstants.ACCEPTED_TAXON_FONT);\r
-       \r
-       /**\r
-        * ************ ICONS ************\r
-        */\r
-       public static final Image DESCRIPTION_LABEL_ICON = TaxEditorPlugin.getDefault()\r
-                       .getImage(ITaxEditorConstants.BLACK_SQUARE_ICON);       \r
-       \r
-       public DescriptionLabelComposite(Composite parent, IManagedForm managedForm, Object data) {\r
-               super(parent, managedForm);\r
-\r
-               createLabelViewer();\r
-               createBorderSupport();\r
-               createLineWrapSupport();\r
-\r
-               setData(data);\r
-               transform(null);\r
-               \r
-               setFocus();\r
-       }\r
-\r
-       @Override\r
-       public void transform(String transformation) {\r
-               setDraggable(false);\r
-               setFont(DESCRIPTION_LABEL_FONT);\r
-               setIcon(DESCRIPTION_LABEL_ICON);\r
-       }       \r
-       \r
-       private void createLabelViewer() {              \r
-               this.textViewer = new SourceViewer(this, null, SWT.WRAP | SWT.MULTI | SWT.RESIZE);\r
-               this.textViewer.setDocument(new Document("Test me"));\r
-               // Lay out StyledText\r
-//             StyledText textWidget = this.getTextWidget();\r
-               this.textViewer.getTextWidget().setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));\r
-       }\r
-\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/ElementWithDescription.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/ElementWithDescription.java
deleted file mode 100644 (file)
index 391b8cb..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 08.09.2008\r
- * @version 1.0\r
- * \r
- * Contains DescriptionElementBase and the Description to which the element\r
- * belongs. Used as a helper class in the IterableDescriptionList, to tell when\r
- * the iterator is returning elements from a different description. \r
- */\r
-public class ElementWithDescription {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ElementWithDescription.class);\r
-       \r
-       DescriptionElementBase element;\r
-       TaxonDescription description;\r
-       \r
-       public DescriptionElementBase getElement() {\r
-               return element;\r
-       }\r
-       public void setElement(DescriptionElementBase element) {\r
-               this.element = element;\r
-       }\r
-       public TaxonDescription getDescription() {\r
-               return description;\r
-       }\r
-       public void setDescription(TaxonDescription description) {\r
-               this.description = description;\r
-       }\r
-       \r
-       \r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/IterableDescriptionList.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/IterableDescriptionList.java
deleted file mode 100644 (file)
index 99b5049..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-\r
-import org.apache.log4j.Logger;\r
-\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-\r
-/**\r
- * Retrieves a taxon's descriptive elements, grouped by TaxonDescription, then\r
- * returns them using an iterator and a sort order optionally passed in.\r
- * \r
- * @author p.ciardelli\r
- * @created 09.05.2008\r
- * @version 1.0\r
- */\r
-public class IterableDescriptionList implements Iterable<ElementWithDescription> {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(IterableDescriptionList.class);\r
-       \r
-       private Taxon taxon;\r
-\r
-       public IterableDescriptionList(Taxon taxon) {\r
-               this.taxon = taxon;\r
-       }\r
-\r
-       @Override\r
-       public Iterator<ElementWithDescription> iterator() {\r
-               return new DescriptionElementIterator(taxon);\r
-       }\r
-       \r
-       class DescriptionElementIterator implements Iterator<ElementWithDescription> {\r
-\r
-               List<ElementWithDescription> elementList;\r
-               int index = 0;\r
-               \r
-               public DescriptionElementIterator(Taxon taxon) {\r
-                       elementList = new ArrayList<ElementWithDescription>();\r
-                       \r
-                       for (TaxonDescription taxonDescription : taxon.getDescriptions()) {\r
-                               for (DescriptionElementBase descriptionElement : taxonDescription.getElements()) {\r
-                                       \r
-                                       // TODO ask Andreas M. to add a descriptionElement.getTaxonDescription\r
-                                       ElementWithDescription element = new ElementWithDescription();\r
-                                       element.setDescription(taxonDescription);\r
-                                       element.setElement(descriptionElement);\r
-                                       \r
-                                       elementList.add(element);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               @Override\r
-               public boolean hasNext() {\r
-                       if (elementList.size() == index) {\r
-                               return false;\r
-                       }\r
-                       return true;\r
-               }\r
-\r
-               @Override\r
-               public ElementWithDescription next() {\r
-                       ElementWithDescription next = elementList.get(index);\r
-                       index++;\r
-                       return next;\r
-               }\r
-\r
-               @Override\r
-               public void remove() {}\r
-       }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionComposite.java
deleted file mode 100644 (file)
index 0037be5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 08.09.2008\r
- * @version 1.0\r
- */\r
-public class TaxonDescriptionComposite extends Composite {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonDescriptionComposite.class);\r
-\r
-       TaxonDescriptionComposite(Composite parent) {\r
-               super(parent, SWT.NONE);\r
-\r
-               // TODO take all formatting info out of GroupComposite,\r
-               //      EditorGroupComposite, merge this class with one of those\r
-               \r
-               \r
-       }\r
-\r
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/descriptionviewersupport/TaxonDescriptionEditorView.java
deleted file mode 100644 (file)
index 47e4848..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.view.descriptionviewersupport;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.TextViewer;\r
-import org.eclipse.jface.text.source.SourceViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.ui.forms.widgets.TableWrapData;\r
-import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
-\r
-import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.view.AbstractTaxonEditorView;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.EditorGroupComposite;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.EditorGroupedComposite;\r
-\r
-/**\r
- * @author p.ciardelli\r
- * @created 25.08.2008\r
- * @version 1.0\r
- */\r
-public class TaxonDescriptionEditorView extends AbstractTaxonEditorView {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(TaxonDescriptionEditorView.class);\r
-       \r
-\r
-       @Override\r
-       public void doSave(IProgressMonitor monitor) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-       @Override\r
-       public void doSaveAs() {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
-\r
-       @Override\r
-       public boolean isDirty() {\r
-               // TODO Auto-generated method stub\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean isSaveAsAllowed() {\r
-               // TODO Auto-generated method stub\r
-               return false;\r
-       }\r
-       \r
-       @Override\r
-       public void createPartControl(Composite composite) {\r
-\r
-               super.createPartControl(composite);\r
-               \r
-               Taxon taxon = getTaxon();\r
-               \r
-               // First program dummy case for a taxon with no descirptions\r
-               // Refactor after\r
-               \r
-               TaxonDescription description = TaxonDescription.NewInstance(taxon);\r
-\r
-               // The property sheet should show this Description upon this EditorView\r
-               //      receiving focus\r
-               setDefaultPropertySheetObject(description);\r
-               \r
-               // Create a composite for an empty description\r
-               EditorGroupComposite descriptionComposite = new EditorGroupComposite(parent, managedForm, description);\r
-               descriptionComposite.setDroppable(false);\r
-               \r
-               // Add a grouped composite for the description's label\r
-               EditorGroupedComposite descriptionLabelComposite = new DescriptionLabelComposite(descriptionComposite, \r
-                               managedForm, description.getTitleCache());\r
-               \r
-               addFeatureTypeComposite(descriptionComposite, "Ecology");\r
-               addFeatureTypeComposite(descriptionComposite, "Etymology");             \r
-               \r
-               \r
-//             descriptionLabelComposite\r
-               \r
-               \r
-//             descriptionComposite\r
-\r
-//              Make a Description group to hold all elements\r
-//             IterableDescriptionList elementList = new IterableDescriptionList(taxon);\r
-//             \r
-//             boolean hasElements = false;\r
-//             \r
-//             for (ElementWithDescription descriptionElement : elementList) {\r
-//                     \r
-//                     // Display first DescriptionElement in property sheet \r
-//                     if (!hasElements) {\r
-//                             hasElements = true;\r
-//                     }\r
-//                     hasElements = true;\r
-//                     new DescriptionElementComposite(descriptionComposite, managedForm, DescriptionElementComposite.TEXT_DATA, descriptionElement);\r
-//             }\r
-//             \r
-//             // If taxon has no DescriptionElements, create an empty DescriptionElementComposite\r
-//             if (!hasElements) {\r
-//                     DescriptionElementBase newElement = TextData.NewInstance(); \r
-//                     new DescriptionElementComposite(descriptionComposite, managedForm, DescriptionElementComposite.TEXT_DATA, newElement);\r
-//                     provider.setSelection(\r
-//                             new StructuredSelection(\r
-//                                             new PropertySourceAdapter(newElement).getPropertySource()\r
-//                     ));\r
-//             }\r
-\r
-               // Listen for names being dragged outside of existing homotypic groups -\r
-               //  user wants to create a new group\r
-//             Transfer[] types = new Transfer[] {WidgetTransfer.getInstance()};\r
-//             int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT;\r
-//             DropTarget target = new DropTarget(parent, operations);\r
-//             target.setTransfer(types);\r
-//             target.addDropListener(new DropTargetAdapter() {\r
-//                     \r
-//                     public void drop(DropTargetEvent event) {\r
-//                             \r
-//                             EditorGroupComposite newGroupComposite = new EditorGroupComposite(parent, managedForm, new HomotypicalGroup());                                                 \r
-//                             \r
-//                             NameComposite nameComposite = (NameComposite) event.data;\r
-//                             nameComposite.setParent(newGroupComposite);                             \r
-//                             \r
-//                             new AdaptCompositeToGroupAction(nameComposite, newGroupComposite).run();\r
-//                     }               \r
-//             });\r
-               \r
-               // We've added elements to the managed form, so redraw it\r
-               scrolledForm.reflow(true);\r
-       }\r
-       \r
-       private void addFeatureTypeComposite (Composite composite, String featureTypeString) {\r
-               \r
-               // Add a group composite for a feature type\r
-               EditorGroupComposite featureTypeComposite = new EditorGroupComposite(composite, managedForm, null);\r
-//             featureTypeComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));\r
-               TableWrapLayout tlLayout = new TableWrapLayout();\r
-               tlLayout.topMargin = 0;\r
-               tlLayout.leftMargin = 10;\r
-               featureTypeComposite.setLayout(tlLayout);\r
-//             featureTypeComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-               \r
-               // Make a composite for the feature type label\r
-               Composite labelComposite = new Composite(featureTypeComposite, SWT.NONE);\r
-               final TableWrapLayout tableWrapLayout = new TableWrapLayout();\r
-               tableWrapLayout.horizontalSpacing = 1;\r
-               tableWrapLayout.rightMargin = 10;\r
-               tableWrapLayout.leftMargin = 10;\r
-               tableWrapLayout.bottomMargin = 1;\r
-               tableWrapLayout.topMargin = 1;\r
-               tableWrapLayout.verticalSpacing = 1;\r
-               labelComposite.setLayout(tableWrapLayout);\r
-               labelComposite.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.MIDDLE));\r
-               \r
-               // Add the label\r
-               final Label label = new Label(labelComposite, SWT.NONE);\r
-               label.setText(featureTypeString);\r
-               \r
-               addFeatureComposite(featureTypeComposite);\r
-               addFeatureComposite(featureTypeComposite);\r
-       }\r
-       \r
-       private void addFeatureComposite (Composite composite) {\r
-               // Add a feature composite\r
-               EditorGroupedComposite featureComposite = new EditorGroupedComposite(composite, managedForm) {\r
-\r
-                       @Override\r
-                       public void transform(String transformation) {\r
-                               // TODO Auto-generated method stub\r
-                               \r
-                       }\r
-               };\r
-               \r
-               featureComposite.setIcon(TaxEditorPlugin.getDefault()\r
-                               .getImage(ITaxEditorConstants.BLACK_SQUARE_ICON));\r
-               \r
-               TextViewer featureTypeSourceViewer = new SourceViewer(featureComposite, null, SWT.NONE);\r
-               featureTypeSourceViewer.setDocument(new Document(""));\r
-               featureComposite.setTextViewer(featureTypeSourceViewer);\r
-               featureTypeSourceViewer.getTextWidget().setText("Test me");\r
-               \r
-               featureComposite.setDraggable(true);\r
-       }\r
-}\r