- removed TextReadOnly (#4254)

  - just used a Text field with "editable" flag set to false
 - added dummy title cache text as section header
  - just showing the first 10 characters

diff --git a/.gitattributes b/.gitattributes
index 523d0f75715ec73a8e5f507f04fb8bd063afdf50..9b3a9a027040b28bd56f57176b3e53d7da0aaf7a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1403,8 +1403,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/E
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java -text

-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnly.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnlyController.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementMVC.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/interfaces/CdmCompositeController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementMVC.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/interfaces/CdmCompositeController.java -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
index 05dd3a16195997b885d713551e6a46aca0a905f2..d085ec3325c9b60ea2f624b9941b0db64c421308 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
@@ -9,9 +9,6 @@
 */
 package eu.etaxonomy.taxeditor.ui.mvc;
 
 */
 package eu.etaxonomy.taxeditor.ui.mvc;
 

-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-

 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;


@@ -23,7 +20,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  * @date 17.06.2014
  *
  */
  * @date 17.06.2014
  *
  */

-public class OriginalLabelDataController extends AbstractCdmDetailElement<DerivedUnitFacade> implements CdmCompositeController, ModifyListener{
+public class OriginalLabelDataController extends AbstractCdmDetailElement<DerivedUnitFacade> implements CdmCompositeController{

 
     private final OriginalLabelDataElement originalLabelDataElement;
 
 
     private final OriginalLabelDataElement originalLabelDataElement;
 


@@ -39,14 +36,6 @@ public class OriginalLabelDataController extends AbstractCdmDetailElement<Derive
         this.originalLabelDataElement = originalLabelDataElement;
     }
 
         this.originalLabelDataElement = originalLabelDataElement;
     }
 

-    /* (non-Javadoc)
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-     */
-    @Override
-    public void modifyText(ModifyEvent e) {
-        System.out.println("Modify");
-    }
-

     /* (non-Javadoc)
      * @see eu.etaxonomy.taxeditor.ui.element.IRelevantFormElement#setIrrelevant(boolean)
      */
     /* (non-Javadoc)
      * @see eu.etaxonomy.taxeditor.ui.element.IRelevantFormElement#setIrrelevant(boolean)
      */


@@ -77,8 +66,7 @@ public class OriginalLabelDataController extends AbstractCdmDetailElement<Derive
      */
     @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
      */
     @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {

-        System.out.println("Create");
-        originalLabelDataElement.getTextReadOnly().getText().setText(entity.getTitleCache());
+        originalLabelDataElement.getText().setText(entity.getTitleCache());

     }
 
     /* (non-Javadoc)
     }
 
     /* (non-Javadoc)


@@ -86,7 +74,5 @@ public class OriginalLabelDataController extends AbstractCdmDetailElement<Derive
      */
     @Override
     public void handleEvent(Object eventSource) {
      */
     @Override
     public void handleEvent(Object eventSource) {

-        // TODO Auto-generated method stub
-        System.out.println("Hndle");

     }
 }
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java
index ffdc6389d52bb1e1d0dc2e0e1d024214a3599ae5..d064f6d9fcf3c42a1ff9498210e67582ec89015d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java
@@ -12,12 +12,12 @@ package eu.etaxonomy.taxeditor.ui.mvc;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;

-import eu.etaxonomy.taxeditor.ui.mvc.element.TextReadOnly;

 
 /**
  * @author pplitzner
 
 /**
  * @author pplitzner


@@ -25,7 +25,7 @@ import eu.etaxonomy.taxeditor.ui.mvc.element.TextReadOnly;
  *
  */
 public class OriginalLabelDataElement extends AbstractCdmComposite<OriginalLabelDataController>{
  *
  */
 public class OriginalLabelDataElement extends AbstractCdmComposite<OriginalLabelDataController>{

-    private final TextReadOnly textReadOnly;
+    private final Text text;

 
     /**
      * @param parent
 
     /**
      * @param parent


@@ -41,15 +41,18 @@ public class OriginalLabelDataElement extends AbstractCdmComposite<OriginalLabel
             tableWrapLayout.leftMargin = 0;
             tableWrapLayout.horizontalSpacing = 0;
             tableWrapLayout.bottomMargin = 0;
             tableWrapLayout.leftMargin = 0;
             tableWrapLayout.horizontalSpacing = 0;
             tableWrapLayout.bottomMargin = 0;

-            tableWrapLayout.numColumns = 2;
+            tableWrapLayout.numColumns = 3;

             setLayout(tableWrapLayout);
         }
 
         Label lblOriginalLabelData = new Label(this, SWT.NONE);
             setLayout(tableWrapLayout);
         }
 
         Label lblOriginalLabelData = new Label(this, SWT.NONE);

+        lblOriginalLabelData.setLayoutData(new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP, 1, 1));

         lblOriginalLabelData.setText("Original Label Data");
 
         lblOriginalLabelData.setText("Original Label Data");
 

-        textReadOnly = new TextReadOnly(this, SWT.NONE);
-        textReadOnly.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
+        text = new Text(this, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.MULTI);
+        text.setEditable(false);
+        text.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
+        new Label(this, SWT.NONE);

 
         // TODO Auto-generated constructor stub
     }
 
         // TODO Auto-generated constructor stub
     }


@@ -62,7 +65,7 @@ public class OriginalLabelDataElement extends AbstractCdmComposite<OriginalLabel
         controller = new OriginalLabelDataController(formFactory, parentElement, this, SWT.NONE);
     }
 
         controller = new OriginalLabelDataController(formFactory, parentElement, this, SWT.NONE);
     }
 

-    public TextReadOnly getTextReadOnly() {
-        return textReadOnly;
+    public Text getText() {
+        return text;

     }
 }
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnly.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnly.java
deleted file mode 100644 (file)
index 560ace0..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnly.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2014 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.ui.mvc.element;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.mvc.AbstractCdmComposite;
-
-/**
- * @author pplitzner
- * @date 18.06.2014
- *
- */
-public class TextReadOnly extends AbstractCdmComposite<TextReadOnlyController> {
-
-    private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
-    private final Text text;
-
-    /**
-     * Create the composite.
-     * @param parent
-     * @param style
-     */
-    public TextReadOnly(Composite parent, int style) {
-        super(parent, style);
-        addDisposeListener(new DisposeListener() {
-            @Override
-            public void widgetDisposed(DisposeEvent e) {
-                toolkit.dispose();
-            }
-        });
-        toolkit.paintBordersFor(this);
-        {
-            setLayout(new TableWrapLayout());
-        }
-
-        text = new Text(this, SWT.BORDER | SWT.MULTI);
-        text.setEnabled(false);
-        text.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
-
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.mvc.AbstractCdmComposite#initInternalController(eu.etaxonomy.taxeditor.ui.element.CdmFormFactory, eu.etaxonomy.taxeditor.ui.element.ICdmFormElement)
-     */
-    @Override
-    protected void initInternalController(CdmFormFactory formFactory, ICdmFormElement parentElement) {
-        controller = new TextReadOnlyController(this, formFactory, parentElement, null, SWT.NONE);
-    }
-
-    public Text getText() {
-        return text;
-    }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnlyController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnlyController.java
deleted file mode 100644 (file)
index 1f3bd11..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextReadOnlyController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2014 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.ui.mvc.element;
-
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
-
-/**
- * @author pplitzner
- * @date 18.06.2014
- *
- */
-public class TextReadOnlyController extends AbstractCdmFormElement implements IEnableableFormElement, CdmCompositeController, ModifyListener{
-
-    protected Text text;
-
-
-    public TextReadOnlyController(TextReadOnly textReadOnly, CdmFormFactory formFactory, ICdmFormElement parentElement,
-            String initialText, int style) {
-        super(formFactory, parentElement);
-        text = textReadOnly.getText();
-        text.addModifyListener(this);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-     */
-    @Override
-    public void modifyText(ModifyEvent e) {
-        System.out.println("Modify");
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IRelevantFormElement#setIrrelevant(boolean)
-     */
-    @Override
-    public void setIrrelevant(boolean irrelevant) {
-        // TODO Auto-generated method stub
-
-    }
-
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#setEnabled(boolean)
-     */
-    @Override
-    public void setEnabled(boolean enabled) {
-        this.text.setEnabled(enabled);
-    }
-
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
-     */
-    @Override
-    public boolean isEnabled() {
-        return this.text.isEnabled();
-    }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/OriginalLabelDataSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/OriginalLabelDataSection.java
index d0284f486cb3b2c939e2e303e897249ed0a47eb0..635dfd4226ed0bead42cbf829bcacc6fb284af7e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/OriginalLabelDataSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/OriginalLabelDataSection.java
@@ -43,7 +43,26 @@ public class OriginalLabelDataSection extends AbstractCdmDetailSection<DerivedUn
      */
     @Override
     public String getHeading() {
      */
     @Override
     public String getHeading() {

-        return "Original Label Data";
+        return "Original Label Data: ";
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.forms.widgets.ExpandableComposite#setText(java.lang.String)
+     */
+    @Override
+    public void setText(String title) {
+        String text = getHeading();
+        if(getEntity()!=null){// && getEntity().getOriginalLabelData!=null){
+            String titleCache = getEntity().getTitleCache();
+            text += titleCache.substring(0, Math.min(10, titleCache.length()));
+            text += "...";
+        }
+        if(text!=null){
+            super.setText(text);
+        }
+        else{
+            super.setText(title);
+        }

     }
 
     /* (non-Javadoc)
     }
 
     /* (non-Javadoc)