Generalized UriWithLabelElement to use super class

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / reference / ReferenceDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
index c468b2f43dab6dfa5728a22566b1765aa865e1be..4ca0bef9c70b7024293e25857af7227afd027b82 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.ui.section.reference;
 
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -23,12 +22,11 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.AuthorHelper;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.IErrorIntolerableElement;
 import eu.etaxonomy.taxeditor.ui.element.IExceptionHandler;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -129,7 +127,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                selection_authorTeam = formFactory
                                .createSelectionElement(AgentBase.class,
                                                getConversationHolder(), formElement, "Author",
-                                               AuthorHelper.getAuthor(entity.getAuthorTeam()),
+                                               AuthorHelper.getAuthor(entity.getAuthorship()),
                                                EntitySelectionElement.ALL, style);
 
                ReferenceType referenceType = entity.getType();
@@ -207,6 +205,8 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                switch (referenceType) {
                case Generic:
                        break;
+               case Section:
+                   break;
                case BookSection:
                        label = "Book";
                        break;
@@ -248,7 +248,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
 
                // series
                text_series = formFactory.createTextWithLabelElement(element, "Series",
-                               reference.getSeries(), style);
+                               reference.getSeriesPart(), style);
 
                // volume
                text_volume = formFactory.createTextWithLabelElement(element, "Volume",
@@ -337,7 +337,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                                reference.getVolume(), style);
 
                text_series = formFactory.createTextWithLabelElement(element, "Series",
-                               reference.getSeries(), style);
+                               reference.getSeriesPart(), style);
        }
 
        /**
@@ -362,7 +362,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
 
                // series part
                text_seriesPart = formFactory.createTextWithLabelElement(element,
-                               "Series Part", reference.getSeriesPart(), style);
+                               "Series", reference.getSeriesPart(), style);
 
                if (referenceType.equals(ReferenceType.Book)) {
                        // edition
@@ -381,7 +381,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                text_uri = formFactory.createUriWithLabelElement(element, "URI",
                                reference.getUri(), style);
                // abstract
-               text_referenceAbstract = formFactory.createMultilineTextWithLabel(
+               text_referenceAbstract = formFactory.createMultiLineTextWithLabel(
                                element, "Reference Abstract", 100, style);
                text_referenceAbstract.setText(reference.getReferenceAbstract());
        }
@@ -398,7 +398,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                }
                // selections
                else if (eventSource == selection_authorTeam) {
-                       getEntity().setAuthorTeam(
+                       getEntity().setAuthorship(
                                        (TeamOrPersonBase) selection_authorTeam.getSelection());
                } else if (eventSource == selection_inReference) {
                        getEntity().setInReference(selection_inReference.getSelection());
@@ -432,8 +432,6 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                        getEntity().setPublisher(text_publisher.getText());
                } else if (eventSource == text_referenceAbstract) {
                        getEntity().setReferenceAbstract(text_referenceAbstract.getText());
-               } else if (eventSource == text_series) {
-                       getEntity().setSeries(text_series.getText());
                } else if (eventSource == text_seriesPart) {
                        getEntity().setSeriesPart(text_seriesPart.getText());
                } else if (eventSource == text_title) {
@@ -443,12 +441,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                    getEntity().setAbbrevTitle(text_abbrevTitle.getText());
                    toggleableAbbrevCache.setText(text_abbrevTitle.getText());
                } else if (eventSource == text_uri) {
-                       try {
-                               getEntity().setUri(text_uri.getUri());
-                       } catch (URISyntaxException e) {
-                               AbstractUtility.warningDialog("Invalid URI", getClass(),
-                                               e.getLocalizedMessage());
-                       }
+                       getEntity().setUri(text_uri.parseText());
                } else if (eventSource == text_volume) {
                        getEntity().setVolume(text_volume.getText());
                }