Checkin before trying to move border draw functionality into a decorator class.

diff --git a/.gitattributes b/.gitattributes
index a56ec99af7168e7978c4bfbfb368ca37a7a3795d..ea50a1e8a3c840b4d2f0344d0a09d20a2805ca68 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -414,9 +414,9 @@ eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewe
 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/GroupedComposite.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/RelationComposite.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/propertysheetsupport/BotanicalNamePropertySource.java -text

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java
index 87c05968ab763531833a6eb941281a99258b887f..d2cb1d9204b130459978e483a40e91c04b162a80 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/NameEditorView.java
@@ -256,8 +256,7 @@ public class NameEditorView extends EditorPart implements IAdaptable {
                GroupComposite groupComposite = new GroupComposite(parent, homotypicalGroup);\r
                \r
                // Put newly created interface element onto managed form\r
-               toolkit.adapt(groupComposite);          \r
-               \r
+               toolkit.adapt(groupComposite);\r
                groupComposite.addListener(SWT.FocusIn, new DrawBorderListener(parent));\r
                groupComposite.addListener(SWT.FocusOut, new DrawBorderListener(parent));\r
 \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/RelationComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/GroupedComposite.java
similarity index 92%
rename from eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/RelationComposite.java
rename to eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/GroupedComposite.java
index 0872c66b4f5aa4c802999e42c63201888520ddb6..5db52a7ec13abce0a47a16ee173a84e901649530 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/RelationComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/GroupedComposite.java
@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.controller.WidgetTransfer;
  * @author p.ciardelli\r
  *\r
  */\r
-public class RelationComposite extends Composite {\r
+public class GroupedComposite extends Composite {\r
        \r
        private Label relationLabel;\r
        protected SourceViewer dataViewer;\r
@@ -42,7 +42,7 @@ public class RelationComposite extends Composite {
        \r
        PropertyChangeSupport propertyChangeSupport;\r
        \r
-       public RelationComposite(Composite parent, Object data, boolean draggable) {\r
+       public GroupedComposite(Composite parent, Object data, boolean draggable) {\r
                super(parent, SWT.NONE);\r
                \r
                setData(data);\r
@@ -97,7 +97,7 @@ public class RelationComposite extends Composite {
                        event.doit = true;\r
                }\r
                public void dragSetData (DragSourceEvent event) {\r
-                       WidgetTransfer.getInstance().setWidget(RelationComposite.this);\r
+                       WidgetTransfer.getInstance().setWidget(GroupedComposite.this);\r
                }\r
                public void dragFinished(DragSourceEvent event) {\r
                }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
index f88a0617de1e705824a8a7fbee0a5c41a115ab41..47ee60a99253e6518a37c732227d4d4f163a558d 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
@@ -8,7 +8,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.Activator;\r
 import eu.etaxonomy.taxeditor.view.NameViewer;\r
 \r
-public class NameComposite extends RelationComposite {\r
+public class NameComposite extends GroupedComposite {\r
        \r
        public static final int ACCEPTED = 0;\r
        public static final int HOMOTYPIC_SYNONYM = 1;\r