From 34f7342e79e1e986ac19b2a8cb6e9464f72f3303 Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Tue, 17 Sep 2013 12:29:14 +0000
Subject: [PATCH] - renamed ComboFieldController to ComboDefinedTermController
---
.gitattributes | 2 +-
...Controller.java => ComboDefinedTermController.java} | 4 ++--
.../ui/campanula/basicFields/PointFieldController.java | 4 ++--
.../specimen/DerivedUnitDetailsElementController.java | 6 +++---
.../specimen/SpecimenDetailsElementController.java | 10 +++++-----
5 files changed, 13 insertions(+), 13 deletions(-)
rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/{ComboFieldController.java => ComboDefinedTermController.java} (97%)
diff --git a/.gitattributes b/.gitattributes
index fd1d81fb8..eca619f02 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1224,7 +1224,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermMana
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboFieldController.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboDefinedTermController.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntityCollectionElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionField.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionFieldController.java -text
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboDefinedTermController.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboFieldController.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboDefinedTermController.java
index 4d34bb2d7..3d25ed10d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboFieldController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ComboDefinedTermController.java
@@ -42,7 +42,7 @@ import eu.etaxonomy.taxeditor.ui.element.ISelectable;
* @date 15.08.2013
*
*/
-public class ComboFieldController extends AbstractCdmFormElement implements SelectionListener, DisposeListener, IEnableableFormElement, ISelectable {
+public class ComboDefinedTermController extends AbstractCdmFormElement implements SelectionListener, DisposeListener, IEnableableFormElement, ISelectable {
private static final int DEFAULT_VISIBLE_ITEMS = 10;
@@ -84,7 +84,7 @@ public class ComboFieldController extends AbstractCdm
* @param
* a T object.
*/
- public ComboFieldController(Combo combo, CdmFormFactory formFactory, ICdmFormElement parentElement, Class termClass, T selection, int style) {
+ public ComboDefinedTermController(Combo combo, CdmFormFactory formFactory, ICdmFormElement parentElement, Class termClass, T selection, int style) {
super(formFactory, parentElement);
this.termClass = termClass;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java
index babf35208..3788716c7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java
@@ -34,7 +34,7 @@ public class PointFieldController extends AbstractCdmFormElement implements IEnt
private final TextFieldController text_latitude;
private final TextFieldController text_longitude;
private final NumberFieldController number_errorRadius;
- private final ComboFieldController combo_referenceSystem;
+ private final ComboDefinedTermController combo_referenceSystem;
private final TextFieldController text_latitudeParsed;
@@ -67,7 +67,7 @@ public class PointFieldController extends AbstractCdmFormElement implements IEnt
text_longitude = new TextFieldController(pointField.getText_longitude(), getFormFactory(), formElement, null, style);
text_longitudeParsed = new TextFieldController(pointField.getText_longitudeParsed(), getFormFactory(), formElement, null, style);
number_errorRadius = new NumberFieldController(pointField.getNumber_errorRadius(), getFormFactory(), formElement, (Integer)null);
- combo_referenceSystem = new ComboFieldController(pointField.getCombo_referenceSystem(), getFormFactory(), formElement, ReferenceSystem.class, null, style);
+ combo_referenceSystem = new ComboDefinedTermController(pointField.getCombo_referenceSystem(), getFormFactory(), formElement, ReferenceSystem.class, null, style);
setPoint(point);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java
index d70b47c7d..f4131c50b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java
@@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
-import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ComboFieldController;
+import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ComboDefinedTermController;
import eu.etaxonomy.taxeditor.ui.campanula.basicFields.EntitySelectionFieldController;
import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController;
import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
@@ -37,7 +37,7 @@ public class DerivedUnitDetailsElementController extends AbstractCdmDetailElemen
private TextFieldController barCode;
private TextFieldController catalogNumber;
- private ComboFieldController preservationMethod;
+ private ComboDefinedTermController preservationMethod;
private EntitySelectionFieldController storedUnder;
private TextFieldController exsiccatum;
@@ -66,7 +66,7 @@ public class DerivedUnitDetailsElementController extends AbstractCdmDetailElemen
AbstractUtility.info(e.getMessage());
entityPreservationMethod = null;
}
- preservationMethod = new ComboFieldController(derivedUnitDetailsElement.getComboPreservationMethod(), getFormFactory(), formElement, PreservationMethod.class, entityPreservationMethod, style);
+ preservationMethod = new ComboDefinedTermController(derivedUnitDetailsElement.getComboPreservationMethod(), getFormFactory(), formElement, PreservationMethod.class, entityPreservationMethod, style);
storedUnder = new EntitySelectionFieldController(derivedUnitDetailsElement.getStoredUnderSelectionField(), getFormFactory(), getConversationHolder(), formElement, TaxonNameBase.class, entity.getStoredUnder(), EntitySelectionElement.ALL);
String entitiyExsiccatum;
try {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java
index 17d9bcf9d..404148750 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java
@@ -11,7 +11,7 @@ package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ComboFieldController;
+import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ComboDefinedTermController;
import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController;
import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -28,8 +28,8 @@ public class SpecimenDetailsElementController extends AbstractCdmDetailElement liveStage;
- private ComboFieldController sex;
+ private ComboDefinedTermController liveStage;
+ private ComboDefinedTermController sex;
public SpecimenDetailsElementController(SpecimenDetailsElement specimenDetailsElement, CdmFormFactory formFactory, ICdmFormElement formElement) {
@@ -47,8 +47,8 @@ public class SpecimenDetailsElementController extends AbstractCdmDetailElement(specimenDetailsElement.getComboLiveStage(), getFormFactory(), formElement, DefinedTerm.class, entity.getLifeStage(), style);
- sex = new ComboFieldController(specimenDetailsElement.getCombo_Sex(), getFormFactory(), formElement, DefinedTerm.class, entity.getSex(), style);
+ liveStage = new ComboDefinedTermController(specimenDetailsElement.getComboLiveStage(), getFormFactory(), formElement, DefinedTerm.class, entity.getLifeStage(), style);
+ sex = new ComboDefinedTermController(specimenDetailsElement.getCombo_Sex(), getFormFactory(), formElement, DefinedTerm.class, entity.getSex(), style);
}
/* (non-Javadoc)
--
2.34.1