(no commit message)

diff --git a/.gitattributes b/.gitattributes
index d342bbd5c73078237bf2be465266c5d270b6e001..4384eebb49521697c5fccafcd825016b8e968daf 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -469,7 +469,6 @@ eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertys
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CompletionProcessor.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CustomSortPropertySheetEntry.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/MarkersPropertySource.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsDialog.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertyDescriptor.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertySource.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NomStatusPropertySource.java -text

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CustomSortPropertySheetEntry.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CustomSortPropertySheetEntry.java
index 047feaa2f5709538e2c0f615bb1f609b92a26c07..9a6b1d7c0b16d51f34b1f16aaad01527e3cfc7de 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CustomSortPropertySheetEntry.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/CustomSortPropertySheetEntry.java
@@ -36,12 +36,14 @@ public class CustomSortPropertySheetEntry extends PropertySheetEntry {
                // currentThread.getStackTrace()[1] = getDisplayName\r
                // currentThread.getStackTrace()[2] = who is calling getDisplayName\r
 \r
-               if (stackRequestingName.toString().lastIndexOf("compare") != -1)\r
+               if (stackRequestingName.toString().lastIndexOf("compare") != -1) {\r
                        return displayName;\r
+               }\r
                \r
-        int colon = displayName.lastIndexOf(':');\r
-        if (colon != -1)\r
-            displayName = displayName.substring(colon + 1);\r
+               int colon = displayName.lastIndexOf(':');\r
+        if (colon != -1) {\r
+               displayName = displayName.substring(colon + 1);\r
+        }\r
         return displayName;\r
     }      \r
 \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsDialog.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsDialog.java
deleted file mode 100644 (file)
index 9956dc6..0000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsDialog.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package eu.etaxonomy.taxeditor.view.propertysheetsupport;\r
-\r
-import java.util.HashSet;\r
-import java.util.Set;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.databinding.beans.BeansObservables;\r
-import org.eclipse.core.databinding.observable.list.WritableList;\r
-import org.eclipse.core.databinding.observable.map.IObservableMap;\r
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;\r
-import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;\r
-import org.eclipse.jface.text.Document;\r
-import org.eclipse.jface.text.source.SourceViewer;\r
-import org.eclipse.jface.viewers.TableViewer;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.custom.CCombo;\r
-import org.eclipse.swt.events.MouseAdapter;\r
-import org.eclipse.swt.events.MouseEvent;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.layout.GridData;\r
-import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Button;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Dialog;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.List;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.eclipse.swt.widgets.Table;\r
-import org.eclipse.swt.widgets.TableColumn;\r
-\r
-import eu.etaxonomy.cdm.model.common.Annotation;\r
-import eu.etaxonomy.cdm.model.name.NameRelationship;\r
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-\r
-public class NameRelationsDialog extends Dialog {\r
-       private List relationList;\r
-       private Table table;\r
-       private static final Logger logger = Logger\r
-                       .getLogger(NameRelationsDialog.class);\r
-       protected Object result;\r
-       protected Shell shell;\r
-       \r
-       private WritableList list = new WritableList();\r
-\r
-       /**\r
-        * Create the dialog\r
-        * @param parent\r
-        * @param style\r
-        */\r
-       public NameRelationsDialog(Shell parent, int style) {\r
-               super(parent, style);\r
-       }\r
-\r
-       /**\r
-        * Create the dialog\r
-        * @param parent\r
-        */\r
-       public NameRelationsDialog(Shell parent) {\r
-               this(parent, SWT.NONE);\r
-       }\r
-\r
-       public NameRelationsDialog(Shell parent, Set<NameRelationship> nameRelationships) {\r
-               this(parent, SWT.NONE);\r
-               for (NameRelationship nameRelationship : nameRelationships) {\r
-                       list.add(nameRelationship);\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Open the dialog\r
-        * @return the result\r
-        */\r
-       public Object open() {\r
-               createContents();\r
-               shell.open();\r
-               shell.layout();\r
-               Display display = getParent().getDisplay();\r
-               while (!shell.isDisposed()) {\r
-                       if (!display.readAndDispatch())\r
-                               display.sleep();\r
-               }\r
-               return result;\r
-       }\r
-\r
-       /**\r
-        * Create contents of the dialog\r
-        */\r
-       protected void createContents() {\r
-               shell = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);\r
-               shell.setLayout(new FillLayout());\r
-               shell.setSize(500, 375);\r
-               shell.setText("Name Relations");\r
-               \r
-               final Composite composite = new Composite(shell, SWT.NONE);\r
-               final GridLayout gridLayout = new GridLayout();\r
-               gridLayout.numColumns = 2;\r
-               composite.setLayout(gridLayout);\r
-               for (NameRelationshipType relationType : TaxEditorPlugin.getDefault().getNameRelationshipTypeVocabulary()) {\r
-                       combo.add(relationType.getLabel());\r
-               }\r
-               new Label(composite, SWT.NONE);\r
-\r
-//             sourceViewer = new Text(composite, SWT.BORDER);\r
-\r
-               final Button btnAdd = new Button(composite, SWT.NONE);\r
-               final GridData gd_btnAdd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);\r
-               btnAdd.setLayoutData(gd_btnAdd);\r
-               btnAdd.setText("Add ...");\r
-               btnAdd.addMouseListener(new MouseAdapter() {\r
-                       @Override\r
-                       public void mouseDown(MouseEvent e) {\r
-//                             NameRelationship annotation = NameRelationship.NewInstance(sourceViewer.getTextWidget().getText(), null);\r
-//                             list.add(annotation);\r
-//                             sourceViewer.getTextWidget().setText("");\r
-                       }\r
-               });\r
-\r
-               final TableViewer tableViewer = new TableViewer(composite, SWT.BORDER);\r
-               table = tableViewer.getTable();\r
-               table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));\r
-               table.setLinesVisible(true);\r
-               table.setHeaderVisible(true);\r
-               \r
-               new TableColumn(table, SWT.NONE).setWidth(190);\r
-               new TableColumn(table, SWT.NONE).setWidth(100);\r
-               new TableColumn(table, SWT.NONE).setWidth(190);\r
-\r
-               ObservableListContentProvider providerList = new ObservableListContentProvider();\r
-               tableViewer.setContentProvider(providerList);\r
-               \r
-               IObservableMap[] providerMaps = BeansObservables.observeMaps(\r
-                               providerList.getKnownElements(), NameRelationship.class, new String[]{"fromName", "toName", "type"});\r
-               tableViewer.setLabelProvider(new ObservableMapLabelProvider(providerMaps) {\r
-                       public String getColumnText(Object element, int columnIndex) {\r
-                               NameRelationship nameRelationship = (NameRelationship) element;\r
-                               String returnString = null;\r
-                               switch (columnIndex) {\r
-                                       case 0 :\r
-                                               String fromName = nameRelationship.getFromName().getTitleCache();\r
-                                               returnString = fromName;\r
-                                               break;\r
-                                       case 1 :\r
-                                               String relationshipType = nameRelationship.getType().getLabel();\r
-                                               returnString = " is " + relationshipType + " of ";\r
-                                               break;\r
-                                       case 2 :\r
-                                               String toName = nameRelationship.getToName().getTitleCache();\r
-                                               returnString = toName;\r
-                               } \r
-                               return returnString;\r
-                       }\r
-               });\r
-               tableViewer.setInput(list);\r
-\r
-               final Button cancelButton = new Button(composite, SWT.NONE);\r
-               cancelButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));\r
-               cancelButton.setText("Cancel");\r
-               cancelButton.addMouseListener(new MouseAdapter() {\r
-                       @Override\r
-                       public void mouseUp(MouseEvent e) {\r
-                               shell.dispose();\r
-                       }\r
-               });\r
-                       \r
-               final Button okButton = new Button(composite, SWT.NONE);\r
-               final GridData gd_okButton = new GridData();\r
-               okButton.setLayoutData(gd_okButton);\r
-               okButton.setText("OK");\r
-               okButton.addMouseListener(new MouseAdapter() {\r
-                       @Override\r
-                       public void mouseUp(MouseEvent e) {\r
-                               result = new HashSet(list);\r
-                               shell.dispose();\r
-                       }\r
-               });\r
-       }\r
-}
\ No newline at end of file

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertyDescriptor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertyDescriptor.java
index 149ca9fa2a9c5c55ced5b62dc219023873df984e..2142629e61d98a4768a87e2032ee995b07af9468 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertyDescriptor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertyDescriptor.java
@@ -49,13 +49,7 @@ abstract public class NameRelationsPropertyDescriptor extends PropertyDescriptor
                        @Override\r
                        protected Object openDialogBox(\r
                                        Control cellEditorWindow) {\r
-//                     dialog = new NameRelationsDialog(cellEditorWindow.getShell(), name.getNameRelations());\r
-//                     Object value = ((NameRelationsDialog) dialog).open();\r
-//                             if (value instanceof Set) {\r
-//                                     logger.warn("Dialog returned set with " + ((Set) value).size() + " elements.");\r
-//                                     saveNameRelations((Set) value);\r
-//                             }\r
-//                             NameRelationWizard wizard = new NameRelationWizard();\r
+                               \r
                                new OpenNameRelationsListWizardAction(name).run();\r
                                return null;\r
                        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertySource.java
index e469da367a42aeac91c1f367a916a84d1154b72f..92931051d08f307db1177afd0da36ab043387a3e 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NameRelationsPropertySource.java
@@ -31,7 +31,6 @@ public class NameRelationsPropertySource extends CollectionPropertySource {
                        }\r
                }\r
                return itemDisplayName;\r
-               // TODO sort out difference b/w to and from rels\r
        }\r
 \r
        @Override\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NonViralNamePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NonViralNamePropertySource.java
index d3c9d46dcead25e63cb038216df3661213a7f3e7..b18d0521ad132edddf8bbc44dacfbd4005d34049 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NonViralNamePropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/propertysheetsupport/NonViralNamePropertySource.java
@@ -145,7 +145,7 @@ public class NonViralNamePropertySource implements IPropertySource {
                List<NomenclaturalStatusType> nomStatusTypesList = new ArrayList<NomenclaturalStatusType>();\r
                nomStatusTypesList.addAll(nomStatusVocabulary.getTerms());\r
                \r
-//             // Populate nom status type menu labels \r
+               // Populate nom status type menu labels \r
                List<String> nomStatusTypesMenuList = new ArrayList<String>();\r
                for (NomenclaturalStatusType nomStatusType : nomStatusTypesList) {\r
                        nomStatusTypesMenuList.add(nomStatusType.getLabel());\r