merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java

index 00519c8e4510fd871ab1588745e92814b6697309..b32f182c54fcd21831987ed1ae04bd728b8e81c7 100644 (file)
@@ -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) {
index 5706de506a24193742ce81c2f697ff017bc3de8b..7c530b852805255b537529fa8543fca84940b425 100644 (file)
@@ -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) {