From 148d6eadc058c02c2eb70a0fc71a714f7b2ca847 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?=
Date: Wed, 30 Oct 2013 12:54:26 +0000
Subject: [PATCH] rename FieldObservation -> FieldUnit #3566
---
.gitattributes | 6 +++---
.../newWizard/NewDerivedUnitBaseWizard.java | 4 ++--
.../taxeditor/ui/element/CdmFormFactory.java | 16 ++++++++--------
.../DerivedUnitFacadeDetailElement.java | 2 +-
...lElement.java => FieldUnitDetailElement.java} | 8 ++++----
...lSection.java => FieldUnitDetailSection.java} | 7 +++----
...nWizardPage.java => FieldUnitWizardPage.java} | 8 ++++----
.../ui/selection/EditFromSelectionWizard.java | 4 ++--
.../taxeditor/view/detail/DetailsViewer.java | 10 +++++-----
9 files changed, 32 insertions(+), 33 deletions(-)
rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/{FieldObservationDetailElement.java => FieldUnitDetailElement.java} (93%)
rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/{FieldObservationDetailSection.java => FieldUnitDetailSection.java} (87%)
rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/{FieldObservationWizardPage.java => FieldUnitWizardPage.java} (82%)
diff --git a/.gitattributes b/.gitattributes
index c2559f8ba..73e4c2b94 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1427,9 +1427,9 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occ
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationDetailSection.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationHistoryDetailSection.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationWizardPage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitWizardPage.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java -text
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index 90e1b3e78..30be004c7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.dialog.selection.OriginalSourceTypeSelectionDialog;
import eu.etaxonomy.taxeditor.ui.dialog.selection.SpecimenOrObservationTypeSelectionDialog;
import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
@@ -51,7 +51,7 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizardConstructor for DerivedUnitFacadeDetailElement.
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailElement.java
similarity index 93%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailElement.java
index eef4fdeb2..faa92f9b7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailElement.java
@@ -22,13 +22,13 @@ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
/**
- * FieldObservationDetailElement class.
+ * FieldUnitDetailElement class.
*
* @author n.hoffmann
* @created Jun 17, 2010
* @version 1.0
*/
-public class FieldObservationDetailElement extends AbstractCdmDetailElement {
+public class FieldUnitDetailElement extends AbstractCdmDetailElement {
private TextWithLabelElement text_ecology;
@@ -47,12 +47,12 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement combo_sex;
/**
- * Constructor for FieldObservationDetailElement.
+ * Constructor for FieldUnitDetailElement.
*
* @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
* @param formElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
*/
- public FieldObservationDetailElement(CdmFormFactory formFactory,
+ public FieldUnitDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement) {
super(formFactory, formElement);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailSection.java
similarity index 87%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailSection.java
index cb538c9fc..2af5827b9 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitDetailSection.java
@@ -24,9 +24,8 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
*
* @author n.hoffmann
* @created Jun 17, 2010
- * @version 1.0
*/
-public class FieldObservationDetailSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{
+public class FieldUnitDetailSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{
/**
* Constructor for FieldObservationDetailSection.
@@ -37,7 +36,7 @@ public class FieldObservationDetailSection extends AbstractCdmDetailSection {
+public class FieldUnitWizardPage extends AbstractCdmEntityWizardPage {
/**
* @param formFactory
* @param conversation
* @param entity
*/
- public FieldObservationWizardPage(CdmFormFactory formFactory,
+ public FieldUnitWizardPage(CdmFormFactory formFactory,
ConversationHolder conversation, DerivedUnitFacade entity) {
super(formFactory, conversation, entity);
- setTitle("Field Observation Details");
+ setTitle("Field Unit Details");
setPageComplete(true);
}
@@ -49,7 +49,7 @@ public class FieldObservationWizardPage extends AbstractCdmEntityWizardPage createElement(ICdmFormElement rootElement) {
- FieldObservationDetailElement detailElement = formFactory.createFieldObservationDetailElement(rootElement);
+ FieldUnitDetailElement detailElement = formFactory.createFieldObservationDetailElement(rootElement);
detailElement.setEntity(getEntity());
return detailElement;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index caebbee49..c0ed01d69 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -38,7 +38,7 @@ import eu.etaxonomy.taxeditor.ui.section.agent.TeamWizardPage;
import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectionWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceWizardPage;
@@ -111,7 +111,7 @@ public class EditFromSelectionWizard extends Wizard implements
selectionElement.getConversationHolder(), facade));
addPage(new GatheringEventWizardPage(formFactory,
selectionElement.getConversationHolder(), facade));
- addPage(new FieldObservationWizardPage(formFactory,
+ addPage(new FieldUnitWizardPage(formFactory,
selectionElement.getConversationHolder(), facade));
addPage(new DerivedUnitBaseWizardPage(formFactory,
selectionElement.getConversationHolder(), facade));
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 813e6b782..4ababe55e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -78,7 +78,7 @@ import eu.etaxonomy.taxeditor.ui.section.name.ProtologueSection;
import eu.etaxonomy.taxeditor.ui.section.name.TypeDesignationSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.DeterminationDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailSection;
import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection;
@@ -555,7 +555,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- FieldObservationDetailSection fieldObservationDetailSection = formFactory.createFieldObservationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
+ FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldObservationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
@@ -567,7 +567,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
addPart(generalDetailSection);
addPart(gatheringEventDetailSection);
- addPart(fieldObservationDetailSection);
+ addPart(fieldUnitDetailSection);
addPart(derivedUnitBaseDetailSection);
addPart(determinationDetailSection);
@@ -689,10 +689,10 @@ public class DetailsViewer extends AbstractCdmDataViewer {
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- FieldObservationDetailSection fieldObservationDetailSection = formFactory.createFODetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
+ FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFODetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
addPart(generalDetailSection);
addPart(gatheringEventDetailSection);
- addPart(fieldObservationDetailSection);
+ addPart(fieldUnitDetailSection);
}
}
--
2.34.1