From: Andreas Müller
Date: Wed, 30 Oct 2013 13:00:49 +0000 (+0000)
Subject: rename FieldObservation -> FieldUnit #3566
X-Git-Tag: 3.6.0~908
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/68b83178d5581dbdda4b3b2bbfd92b185cd27154
rename FieldObservation -> FieldUnit #3566
---
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldUnitWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldUnitWizard.java
index 9dfc7ec20..a93e8f185 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldUnitWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldUnitWizard.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- * NewFieldObservationWizard class.
+ * NewFieldUnitWizard class.
*
* @author n.hoffmann
* @created Jun 17, 2010
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
index 7254819d9..054563372 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
@@ -11,6 +11,7 @@
package eu.etaxonomy.taxeditor.preference;
import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
/**
* IPreferenceKeys interface.
@@ -109,9 +110,9 @@ public interface IPreferenceKeys {
public static final String OPENURL_IMAGE_MAX_HEIGHT = "eu.etaxonomy.taxeditor.openUrlImageMaxHeight";
/**
- * Whether the occurrence bulk editor should show {@link FieldObservation} objects
+ * Whether the occurrence bulk editor should show {@link FieldUnit} objects
*/
- public static final String BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS = "eu.etaxonomy.taxeditor.bulkeditor.occurrence.showFieldObservations";
+ public static final String BULK_EDITOR_OCCURRENCE_SHOW_FIELD_UNITS = "eu.etaxonomy.taxeditor.bulkeditor.occurrence.showFieldUnits";
public static final String SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS = "eu.etaxonomy.taxeditor.navigation.search.openResultInSeparateWindows";
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
index 60de9c9d6..8140ee64a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
@@ -54,8 +54,8 @@ public class TaxonomicEditorGeneralPreferences extends
addField(new BooleanFieldEditor(
IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES,
"Show experimental features", getFieldEditorParent()));
- addField(new BooleanFieldEditor(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS,
- "Show FieldObservations in Bulk Editor.",
+ addField(new BooleanFieldEditor(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_UNITS,
+ "Show Field Units in Bulk Editor.",
getFieldEditorParent()));
addField(new BooleanFieldEditor(IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS,
"Open search results in separate windows",
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
index 59a5c9feb..28c6cc18e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
@@ -148,7 +148,7 @@ public class SearchManager {
*/
public List findOccurrences(IIdentifiableEntityServiceConfigurator configurator){
// by default we do not show field units. This may be configured via preferences
- boolean showFieldUnits = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS);
+ boolean showFieldUnits = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_UNITS);
if(! showFieldUnits){
configurator.setClazz(DerivedUnit.class);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
index faba5a4e2..49acf9441 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
/**
- * FilteredFieldObservationSelectionDialog class.
+ * FilteredFieldUnitSelectionDialog class.
*
* @author n.hoffmann
* @created Jun 17, 2010
@@ -49,14 +49,14 @@ public class FieldUnitSelectionDialog extends
}
/**
- * Constructor for FilteredFieldObservationSelectionDialog.
+ * Constructor for FilteredFieldUnitSelectionDialog.
*
* @param shell a {@link org.eclipse.swt.widgets.Shell} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param title a {@link java.lang.String} object.
* @param multi a boolean.
* @param settings a {@link java.lang.String} object.
- * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
+ * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
*/
protected FieldUnitSelectionDialog(Shell shell, ConversationHolder conversation,
String title, boolean multi, String settings,
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index fabdc0a45..adaf493bc 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -1502,7 +1502,7 @@ public class CdmFormFactory extends FormToolkit {
return section;
}
- public FieldUnitDetailSection createFieldObservationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
+ public FieldUnitDetailSection createFieldUnitDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
FieldUnitDetailSection section = new FieldUnitDetailSection(this, conversation, parentElement, selectionProvider, style);
addAndAdaptSection(parentElement, section);
return section;
@@ -1835,7 +1835,7 @@ public class CdmFormFactory extends FormToolkit {
return element;
}
- public FieldUnitDetailElement createFieldObservationDetailElement(ICdmFormElement parentElement) {
+ public FieldUnitDetailElement createFieldUnitDetailElement(ICdmFormElement parentElement) {
FieldUnitDetailElement element = new FieldUnitDetailElement(this, parentElement);
addAndAdaptElement(parentElement, element);
return element;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
index 5a70186e1..56ddc533c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
@@ -39,7 +39,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElementConstructor for DerivedUnitFacadeDetailElement.
@@ -65,7 +65,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElementFieldObservationDetailSection class.
+ * FieldUnitDetailSection class.
*
* @author n.hoffmann
* @created Jun 17, 2010
@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
public class FieldUnitDetailSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{
/**
- * Constructor for FieldObservationDetailSection.
+ * Constructor for FieldUnitDetailSection.
*
* @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
@@ -53,6 +53,6 @@ public class FieldUnitDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) {
- return formFactory.createFieldObservationDetailElement(parentElement);
+ return formFactory.createFieldUnitDetailElement(parentElement);
}
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitWizardPage.java
index 2f6021d6d..5d2624b7a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitWizardPage.java
@@ -49,7 +49,7 @@ public class FieldUnitWizardPage extends AbstractCdmEntityWizardPage createElement(ICdmFormElement rootElement) {
- FieldUnitDetailElement detailElement = formFactory.createFieldObservationDetailElement(rootElement);
+ FieldUnitDetailElement detailElement = formFactory.createFieldUnitDetailElement(rootElement);
detailElement.setEntity(getEntity());
return detailElement;
}
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 4ababe55e..7eaf0dc46 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
@@ -555,7 +555,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
- FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldObservationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
+ FieldUnitDetailSection fieldUnitDetailSection = formFactory.createFieldUnitDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
formFactory.createHorizontalSeparator(parent, SWT.BORDER);