From: Patric Plitzner Date: Wed, 13 Aug 2014 09:26:27 +0000 (+0000) Subject: merge-update from trunk X-Git-Tag: 3.6.0~393^2~48 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0eafce3b8120aa81638466596dc8b4e0f715b4ce?hp=60f606b4369404cd13d7580c4eb33273fb7cf6d8 merge-update from trunk --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java index 00519c8e4..b32f182c5 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java @@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity; public class BulkEditorQuery { private String searchString; - private Comparator comparator; + private Comparator comparator; private IIdentifiableEntityServiceConfigurator searchConfigurator; public BulkEditorQuery (String searchString, Comparator comparator) { 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 5706de506..7c530b852 100644 --- 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 @@ -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 @@ -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) {