From: Patric Plitzner Date: Tue, 28 Jan 2014 12:19:02 +0000 (+0000) Subject: - cleaned up package structure X-Git-Tag: 3.6.0~834 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/913c77b430224910937884f2a293e79b6bcb64d5 - cleaned up package structure - removed campanula package --- diff --git a/.gitattributes b/.gitattributes index 7b40a166d..8e49d1387 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1261,43 +1261,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/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 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/LanguageTextFieldController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NamedAreaFieldController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointField.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/TextFieldController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextField.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextFieldController.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/compatibility/ICdmFormElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/compatibility/IEntitySelectionElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchComposite.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElementController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsView.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElementController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenGeneralSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchComposite.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchController.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/LoginDialog.java -text @@ -1496,7 +1460,6 @@ 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/DerivedUnitBaseDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitDetailsWizardPage.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java -text @@ -1507,8 +1470,6 @@ 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/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/EmptySection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailsWizardPage.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationGeneralWizardPage.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/FieldUnitGeneralDetailElement.java -text @@ -1517,15 +1478,12 @@ 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/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/GatheringEventDetailsWizardPage.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenDetailsWizardPage.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenGeneralWizardPage.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenAbstractDeterminationEventDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenCurrentDeterminationDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java -text @@ -1634,10 +1592,16 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasourc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/ResourceManager.java -text diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java index ec952902a..b7e850932 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java @@ -15,7 +15,7 @@ import org.eclipse.ui.progress.IProgressConstants; import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; -import eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView; +import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView; import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart; import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java index 080c85ffd..4f75dbd39 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java @@ -13,7 +13,7 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.widgets.Composite; import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery; -import eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchController; +import eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchController; /** diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java index 325fd55df..6b63d7631 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java @@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData; import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData; -import eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateLabelProvider; +import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider; /** * Displays the derivate hierarchy of all derivates belonging to a taxon. diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 8992b7597..26bd4ff95 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -30,8 +30,6 @@ Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.taxeditor.store.internal, eu.etaxonomy.taxeditor.store.operations, eu.etaxonomy.taxeditor.ui.bar, - eu.etaxonomy.taxeditor.ui.campanula.derivatesearch, - eu.etaxonomy.taxeditor.ui.campanula.specimenSearch, eu.etaxonomy.taxeditor.ui.combo, eu.etaxonomy.taxeditor.ui.dialog, eu.etaxonomy.taxeditor.ui.dialog.selection, @@ -51,7 +49,9 @@ Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.taxeditor.view, eu.etaxonomy.taxeditor.view.datasource, eu.etaxonomy.taxeditor.view.datasource.handler, + eu.etaxonomy.taxeditor.view.derivateSearch, eu.etaxonomy.taxeditor.view.detail, + eu.etaxonomy.taxeditor.view.specimenSearch, eu.etaxonomy.taxeditor.view.supplementaldata Require-Bundle: org.eclipse.osgi, org.eclipse.ui, diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 28f8b2242..d5995fd3a 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -228,7 +228,7 @@ restorable="true"> extends AbstractCdmFormElement implements SelectionListener, DisposeListener, IEnableableFormElement, ISelectable { - - private static final int DEFAULT_VISIBLE_ITEMS = 10; - - private T selection; - - private T emptyElement; - private static String EMPTY_ELEMENT_LABEL = ""; - -// protected Label label; - private Combo combo; - - private ArrayList terms; - - private Comparator termComparator; - - private Class termClass; - - private List customPreferredTerms; - - /** - *

- * Constructor for AbstractTermComboElement. - *

- * - * @param parentElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @param style - * a int. - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param labelString - * a {@link java.lang.String} object. - * @param selection - * a T object. - * @param visibleItems - * a int. - * @param - * a T object. - */ - public ComboDefinedTermController(Combo combo, CdmFormFactory formFactory, ICdmFormElement parentElement, Class termClass, T selection, int style) { - super(formFactory, parentElement); - - this.termClass = termClass; - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); -// if (labelString != null) { -// label = formFactory.createLabel(getLayoutComposite(), labelString); -// addControl(label); -// } - - // create combo - this.combo = combo;//new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY); - addControl(combo); -// combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY()); - combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS); - - populateTerms(getPreferredTerms()); - - combo.addSelectionListener(this); - combo.addDisposeListener(this); - PreferencesUtil.getPreferenceStore().addPropertyChangeListener(this); - - if (selection != null) { - setSelection(selection); - } - } - - /** - *

- * Getter for the field selection. - *

- * - * @return a T object. - */ - public T getSelection() { - return selection; - } - - /** - *

- * Sets the selection of the combo to the given T object. - *

- *

- * Passing null to this method will set the selection to the - * empty element and effectively clear the selection - *

- * - * @param selection - * a T object or null to clear the selection - */ - public void setSelection(T selection) { - this.selection = selection; - - this.selection = selection; - - Listener[] listeners = combo.getListeners(SWT.Selection); - - for (Listener listener : listeners) { - combo.removeListener(SWT.Selection, listener); - } - int selectedIndex; - if (selection == null) { - // set selection to the emptyElement - selectedIndex = 0; - } else { - selectedIndex = terms.indexOf(selection); - if (selectedIndex == -1) { - createTermNotInPreferredTerms(selection); - selectedIndex = terms.indexOf(selection); - } - } - combo.select(selectedIndex); - - for (Listener listener : listeners) { - combo.addListener(SWT.Selection, listener); - } - } - - /** - * Fills the combo with elements and sets up the convenience functions for - * selection index - * - * @param preferredTerms - */ - private void populateTerms(List preferredTerms) { - - combo.removeAll(); - - terms = new ArrayList(); - - int i = 1; - int index = 0; - - // Add an empty element for when nothing was selected yet - combo.add(EMPTY_ELEMENT_LABEL); - terms.add(emptyElement); - - if (termComparator != null) { - Collections.sort(preferredTerms, termComparator); - } - for (T term : preferredTerms) { - String label = getLabel(term); - if (label == null) { - if (term.getTitleCache() != null) { - label = term.getTitleCache(); - StoreUtil.warn(getClass(), "Term does not have a representation: " + term + ", " + term.getUuid()); - } else { - label = "Unknown"; - StoreUtil.warn(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid()); - } - - } - - combo.add(label); - terms.add(term); - - i++; - if (selection != null) { - if (selection.equals(term)) { - index = i; - } - } - } - - if (selection != null && index == 0) { - createTermNotInPreferredTerms(selection); - } - - combo.select(index); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean) - */ - /** {@inheritDoc} */ - @Override - public void setEnabled(boolean enabled) { - combo.setEnabled(enabled); - } - - /** - *

- * preferredTerms - *

- * - * @return a {@link java.util.List} object. - */ - protected List getPreferredTerms() { - if (customPreferredTerms != null) { - return customPreferredTerms; - } - return getTermManager().getPreferredTerms(termClass); - } - - /** - * May be overridden by derived classes if the desired label string does not - * reside in term.getLabel(); - * - * @param term - * a T object. - * @return a {@link java.lang.String} object. - */ - protected String getLabel(T term) { - return term.getLabel(CdmStore.getDefaultLanguage()); - } - - /** - * - * - * @param term - */ - private void createTermNotInPreferredTerms(T term) { - List preferredTerms = getPreferredTerms(); - - preferredTerms.add(term); - - populateTerms(preferredTerms); - } - - /** - *

- * addSelectionListener - *

- * - * @param listener - * a {@link org.eclipse.swt.events.SelectionListener} object. - */ - public void addSelectionListener(SelectionListener listener) { - combo.addSelectionListener(listener); - } - - /** - *

- * removeSelectionListener - *

- * - * @param listener - * a {@link org.eclipse.swt.events.SelectionListener} object. - */ - public void removeSelectionListener(SelectionListener listener) { - combo.removeSelectionListener(listener); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt - * .events.SelectionEvent) - */ - /** {@inheritDoc} */ - @Override - public void widgetSelected(SelectionEvent e) { - selection = terms.get(combo.getSelectionIndex()); - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); - } - - /* - * (non-Javadoc) - * - * @see java.beans.PropertyChangeListener#propertyChange(java.beans. - * PropertyChangeEvent) - */ - /** {@inheritDoc} */ - @Override - public void propertyChange(PropertyChangeEvent event) { - super.propertyChange(event); - if (event != null && PreferencesUtil.PREFERRED_TERMS_CHANGE.equals(event.getProperty())) { - populateTerms(getPreferredTerms()); - } - } - - /** {@inheritDoc} */ - @Override - public void setSelected(boolean selected) { - setBackground(selected ? SELECTED : getPersistentBackground()); - } - - /** {@inheritDoc} */ - @Override - public void widgetDisposed(DisposeEvent e) { - PreferencesUtil.getPreferenceStore().removePropertyChangeListener(this); - } - - // not used - /** {@inheritDoc} */ - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - - /** {@inheritDoc} */ - @Override - public void setIrrelevant(boolean irrelevant) { - String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND; - - Color color = StoreUtil.getColor(colorId); - combo.setBackground(color); - } - -// /** {@inheritDoc} */ -// @Override -// public void setBackground(Color color) { -// if (label != null) -// label.setBackground(color); -// } - - /** -* -*/ - protected TermManager getTermManager() { - return CdmStore.getTermManager(); - } - - /** - * - * @return - */ - public int getVisibleItemCount() { - return combo.getVisibleItemCount(); - } - - /** - * - * @param count - */ - public void setVisibleItemCount(int count) { - combo.setVisibleItemCount(count); - } - - /** - *

- * A {@link List} of term objects may be passed to this combo box. In this - * case, the default behaviour of displaying the preferred terms for the T - * type will be overridden and the combo will only display the given terms. - * Also, any previous selection will be reseted. - *

- * - *

- * To return to the default of displaying the preferred terms, simply pass - * null. - *

- * - * @param terms - * a {@link List} of T objects or null for default - * preferred terms - */ - public void setTerms(List terms) { - setSelection(null); - customPreferredTerms = terms; - populateTerms(customPreferredTerms); - } -} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntityCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntityCollectionElement.java deleted file mode 100644 index 37590d99a..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntityCollectionElement.java +++ /dev/null @@ -1,79 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.ToolBarManager; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.wb.swt.ResourceManager; -import org.eclipse.wb.swt.SWTResourceManager; - -/** - * @author pplitzner - * @date 16.08.2013 - * - */ -public class EntityCollectionElement extends ExpandableComposite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - - /** - * Create the composite. - * @param parent - * @param style - */ - public EntityCollectionElement(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - setExpanded(true); - - ToolBar toolBar = new ToolBar(this, SWT.FLAT | SWT.RIGHT); - setTextClient(toolBar); - - Label label = formToolkit.createLabel(this, "", SWT.NONE); - setClient(label); - - ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT); - - Action addAction = new Action("add", IAction.AS_PUSH_BUTTON){ - /* (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ - @Override - public void run() { -// ELEMENT element = createNewElement(); -// if(element != null){ -// addElement(element); -// if(! getSection().isExpanded()) { -// getSection().setExpanded(true); -// } -// internalUpdateSection(true); -// } - } - }; - addAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor("eu.etaxonomy.taxeditor.store", "icons/add_no_bg2.gif")); -// addAction.setToolTipText(getTooltipString()); - - toolBarManager.add(addAction); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionField.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionField.java deleted file mode 100644 index 0c60974a5..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionField.java +++ /dev/null @@ -1,100 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.ResourceManager; - -/** - * @author pplitzner - * @date 13.08.2013 - * - */ -public class EntitySelectionField extends Composite { - private FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Label text; - private Button button_selection; - private Button button_edit; - private Button button_remove; - - /** - * Create the composite. - * @param parent - * @param style - */ - public EntitySelectionField(Composite parent, int style) { - super(parent, style); - setBackgroundMode(SWT.INHERIT_DEFAULT); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.verticalSpacing = 0; - tableWrapLayout.topMargin = 0; - tableWrapLayout.rightMargin = 0; - tableWrapLayout.numColumns = 4; - tableWrapLayout.leftMargin = 0; - tableWrapLayout.horizontalSpacing = 0; - tableWrapLayout.bottomMargin = 0; - setLayout(tableWrapLayout); - } - - text = formToolkit.createLabel(this, "", SWT.WRAP); - TableWrapData twd_text = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1); - twd_text.align = TableWrapData.LEFT; - text.setLayoutData(twd_text); - - button_selection = formToolkit.createButton(this, "", SWT.NONE); - button_selection.setToolTipText("Browse existing"); - button_selection.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/prj_obj.gif")); - - button_edit = formToolkit.createButton(this, "", SWT.NONE); - button_edit.setToolTipText("Edit"); - button_edit.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/text.gif")); - - button_remove = formToolkit.createButton(this, "", SWT.NONE); - button_remove.setToolTipText("Remove"); - button_remove.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/trash.gif")); - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - public Label getText() { - return text; - } - public Button getButton_selection() { - return button_selection; - } - public Button getButton_edit() { - return button_edit; - } - public Button getButton_remove() { - return button_remove; - } - - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#setEnabled(boolean) - */ - @Override - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - text.setEnabled(enabled); - button_selection.setEnabled(enabled); - button_edit.setEnabled(enabled); - button_remove.setEnabled(enabled); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionFieldController.java deleted file mode 100644 index 00ecc4d95..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/EntitySelectionFieldController.java +++ /dev/null @@ -1,435 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.springframework.security.core.GrantedAuthority; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; -import eu.etaxonomy.cdm.common.CdmUtils; -import eu.etaxonomy.cdm.model.common.Group; -import eu.etaxonomy.cdm.model.common.ICdmBase; -import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; -import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; -import eu.etaxonomy.taxeditor.model.AbstractUtility; -import eu.etaxonomy.taxeditor.model.ImageResources; -import eu.etaxonomy.taxeditor.preference.Resources; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; -import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement; -import eu.etaxonomy.taxeditor.ui.element.IEntityElement; -import eu.etaxonomy.taxeditor.ui.element.ILabeledElement; -import eu.etaxonomy.taxeditor.ui.element.ISelectableElement; -import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; -import eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator; -import eu.etaxonomy.taxeditor.ui.selection.EditFromSelectionWizard; -import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; - -/** - * @author pplitzner - * @date 13.08.2013 - * - */ -public class EntitySelectionFieldController extends AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement, ILabeledElement, IConversationEnabled { - - /** - * Bitmask for configuring functionality of selection element - */ - public static final int NOTHING = 0; // 000 - public static final int EDITABLE = 1 << 0; // 001 - public static final int DELETABLE = 1 << 1; // 010 - public static final int SELECTABLE = 1 << 2; // 100 - public static final int ALL = EDITABLE | DELETABLE | SELECTABLE; // 111 - - protected T entity; - - //TODO also control "label" with this class? -// protected Label label; - protected Label text; - protected Button button_selection; - - private SelectionArbitrator selectionArbitrator; - - protected Button button_edit; - -// private final String labelString; - - private Composite selectableComposite; - - private Button button_remove; - - private final boolean isEditable; - - private final boolean isDeletable; - - private final ConversationHolder conversation; - private Class clazz; - - /** - *

- * Constructor for AbstractSelectionElement. - *

- * - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param conversation - * TODO - * @param parentElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @param labelString - * a {@link java.lang.String} object. - * @param entity - * a T object. - * @param isEditable - * a boolean. - * @param isSelectable - * a boolean. - * @param isDeletable - * a boolean. - * @param style - * a int. - * @param - * a T object. - */ - public EntitySelectionFieldController(EntitySelectionField entitySelectionField, CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, T entity, int mode) { - super(formFactory, parentElement); - - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - - this.isEditable = (mode & EDITABLE) == EDITABLE; - this.isDeletable = (mode & DELETABLE) == DELETABLE; - boolean isSelectable = (mode & SELECTABLE) == SELECTABLE; - -// this.labelString = labelString; - - this.conversation = conversation; - - if (isSelectable && formFactory.getSelectionProvider() != null) { - selectionArbitrator = formFactory.createSelectionArbitrator(this); - } - - createControls(entitySelectionField); - - setEntity(entity); - } - - public EntitySelectionFieldController(EntitySelectionField entitySelectionField, CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, Class clazz, T entity, int mode) { - this(entitySelectionField, formFactory, conversation, parentElement, entity, mode); - this.clazz = clazz; - } - - private void createControls(EntitySelectionField entitySelectionField) { - -// label = formFactory.createLabel(getLayoutComposite(), labelString, SWT.NULL); -// -// addControl(label); - - selectableComposite = entitySelectionField; - - int columns = 2; - if (isEditable) { - columns += 1; - } - if (isDeletable) { - columns += 1; - } - - selectableComposite.setLayout(LayoutConstants.LAYOUT(columns, false)); - selectableComposite.setLayoutData(LayoutConstants.FILL_HORIZONTALLY()); - - addControl(selectableComposite); - - text = entitySelectionField.getText(); - addControl(text); - - text.setLayoutData(LayoutConstants.FILL_HORIZONTALLY()); - text.setBackground(AbstractUtility.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND)); - - button_selection = entitySelectionField.getButton_selection(); - button_selection.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON)); - button_selection.setToolTipText("Browse existing"); - - addControl(button_selection); - button_selection.addSelectionListener(this); - - button_edit = entitySelectionField.getButton_edit(); - if (isEditable) { - addControl(button_edit); - //TODO: this worked with the extracted (but now reverted) interfaces done for campanula -// button_edit.addSelectionListener(new EditListener(this)); - } - else{ - button_edit.setVisible(false); - } - - button_remove = entitySelectionField.getButton_remove(); - if (isDeletable) { - addControl(button_remove); - button_remove.addSelectionListener(new DeleteListener(this)); - } - else{ - button_remove.setVisible(false); - } - } - - @Override - public void widgetSelected(SelectionEvent e) { - T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(), getConversationHolder(), getEntity()); - setSelectionInternal(selection); - } - - /** - * Return the selected object - * - * @return a T object. - */ - public T getSelection() { - return entity; - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean) - */ - /** {@inheritDoc} */ - @Override - public void setEnabled(boolean enabled) { - button_selection.setEnabled(enabled); - if (isEditable) { - button_edit.setEnabled(enabled && entity != null); - } - } - - /** - *

- * setSelectionInternal - *

- * - * @param selection - * a T object. - */ - protected void setSelectionInternal(T selection) { - if (selection != null && !selection.equals(this.entity)) { - setEntity(selection); - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); - } - } - - /** - *

- * Setter for the field entity. - *

- * - * @param selection - * a T object. - */ - public void setEntity(T selection) { - this.entity = selection; - updateElement(); - } - - /** - * Updates this elements view - */ - protected void updateElement() { - String title = CdmUtils.Nz(getTitle()); - // we have to duplicate ampersands otherwise they are treated as - // mnenomic (see Label.setText() documentation) - title = title.replace("&", "&&"); - text.setText(title); // title can be null - if (isEditable) { - button_edit.setEnabled(entity != null); - } - } - - public void updateFromWizard() { - updateElement(); - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); - } - - /** - *

- * getTitle - *

- * - * @return a {@link java.lang.String} object. - */ - protected String getTitle() { - if (entity != null) { - if (entity instanceof IIdentifiableEntity) { - return ((IIdentifiableEntity) entity).getTitleCache(); - } else if (entity instanceof Group) { - return ((Group) entity).getName(); - } else if (entity instanceof GrantedAuthority) { - return ((GrantedAuthority) entity).getAuthority(); - } - } - return ""; - } - - /** {@inheritDoc} */ - @Override - public void setSelected(boolean selected) { - setBackground(selected ? SELECTED : getPersistentBackground()); - } - - /* - * (non-Javadoc) - * - * @see eu.etaxonomy.taxeditor.forms.IEntityElement#getEntity() - */ - /** - *

- * Getter for the field entity. - *

- * - * @return a T object. - */ - @Override - public T getEntity() { - return entity; - } - - /* - * (non-Javadoc) - * - * @see eu.etaxonomy.taxeditor.forms.section.cdmdetail.ISelectableElement# - * getSelectionArbitrator() - */ - /** - *

- * Getter for the field selectionArbitrator. - *

- * - * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator} - * object. - */ - @Override - public SelectionArbitrator getSelectionArbitrator() { - return selectionArbitrator; - } - - public Shell getShell() { - return getLayoutComposite().getShell(); - } - - /** {@inheritDoc} */ - @Override - public void setIrrelevant(boolean irrelevant) { - String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_TEXT_DISABLED_BACKGROUND; - - Color color = AbstractUtility.getColor(colorId); - text.setBackground(color); - } - - private class DeleteListener extends SelectionAdapter { - - private final EntitySelectionFieldController selectionElement; - - public DeleteListener(EntitySelectionFieldController selectionElement) { - this.selectionElement = selectionElement; - } - - @Override - public void widgetSelected(SelectionEvent e) { - setEntity(null); - firePropertyChangeEvent(new CdmPropertyChangeEvent(selectionElement, null)); - } - } - - private class EditListener extends SelectionAdapter { - - private final EntitySelectionElement selectionElement; - - public EditListener(EntitySelectionElement selectionElement) { - this.selectionElement = selectionElement; - } - - /** {@inheritDoc} */ - @Override - public void widgetSelected(SelectionEvent e) { - WizardDialog dialog = new WizardDialog(selectionElement.getShell(), new EditFromSelectionWizard(selectionElement)); - if (dialog.open() == IStatus.OK) { - selectionElement.updateFromWizard(); - } - } - } - - // not used - /** {@inheritDoc} */ - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - - /** - *

- * getConversationHolder - *

- * - * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} - * object. - */ - @Override - public ConversationHolder getConversationHolder() { - return conversation; - } - - /** {@inheritDoc} */ - @Override - public void setBackground(Color color) { -// label.setBackground(color); - } - - /** {@inheritDoc} */ - @Override - public void setLabel(String labelString) { -// if (label != null) { -// label.setText(labelString); -// } - } - - /** - *

- * Getter for the field label. - *

- * - * @return a {@link java.lang.String} object. - */ - @Override - public String getLabel() { -// if (label != null) { -// return label.getText(); -// } - return null; - } - - /** {@inheritDoc} */ - @Override - public void update(CdmDataChangeMap changeEvents) { - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/LanguageTextFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/LanguageTextFieldController.java deleted file mode 100644 index fc656f7cc..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/LanguageTextFieldController.java +++ /dev/null @@ -1,100 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.widgets.Text; - -import eu.etaxonomy.cdm.model.common.LanguageString; -import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class LanguageTextFieldController extends TextFieldController{ - - private LanguageString languageString; - - /** - *

Constructor for LanguageStringWithLabelElement.

- * - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param labelString a {@link java.lang.String} object. - * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object. - * @param style a int. - */ - public LanguageTextFieldController(Text controlledText, CdmFormFactory formFactory, - ICdmFormElement parentElement, - LanguageString languageString) { - this(controlledText, formFactory, parentElement, languageString, null); - } - - /** - *

Constructor for LanguageStringWithLabelElement.

- * - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param labelString a {@link java.lang.String} object. - * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object. - * @param height a int. - * @param style a int. - */ - protected LanguageTextFieldController(Text controlledText, CdmFormFactory formFactory, - ICdmFormElement parentElement, - LanguageString languageString, Integer height) { - super(controlledText, formFactory, parentElement, null, height); - - setLanguageString(languageString); - } - - /** - *

Getter for the field languageString.

- * - * @return a {@link eu.etaxonomy.cdm.model.common.LanguageString} object. - */ - public LanguageString getLanguageString() { - return languageString; - } - - /** {@inheritDoc} */ - @Override - public void modifyText(ModifyEvent e) { - if(languageString == null){ - languageString = LanguageString.NewInstance("", CdmStore.getDefaultLanguage()); - } - - languageString.setText(text.getText()); - super.modifyText(e); - } - - /** {@inheritDoc} */ - @Override - public void setText(String text) { - if(text != null && languageString!=null){ - languageString.setText(text); - super.setText(text); - } - } - - /** - *

Setter for the field languageString.

- * - * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object. - */ - public void setLanguageString(LanguageString languageString) { - this.languageString = languageString; - super.setText(languageString != null ? languageString.getText() : ""); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NamedAreaFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NamedAreaFieldController.java deleted file mode 100644 index f78e941ac..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NamedAreaFieldController.java +++ /dev/null @@ -1,94 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionListener; - -import eu.etaxonomy.cdm.model.location.NamedArea; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; -import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class NamedAreaFieldController extends AbstractEntityCollectionElement { - - private EntitySelectionFieldController selection_namedArea; - - /** - *

- * Constructor for CollectingAreasDetailElement. - *

- * - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param section - * a - * {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} - * object. - * @param entity - * a {@link eu.etaxonomy.cdm.model.location.NamedArea} object. - * @param removeListener - * a {@link org.eclipse.swt.events.SelectionListener} object. - * @param style - * a int. - */ - public NamedAreaFieldController(CdmFormFactory formFactory, AbstractFormSection section, NamedArea entity, SelectionListener removeListener, int style) { - super(formFactory, section, entity, removeListener, null, style); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity - * (java.lang.Object) - */ - /** {@inheritDoc} */ - @Override - public void setEntity(NamedArea entity) { - selection_namedArea.setEntity(entity); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls - * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int) - */ - /** {@inheritDoc} */ - @Override - public void createControls(ICdmFormElement formElement, int style) { - selection_namedArea = new EntitySelectionFieldController(new EntitySelectionField(formElement.getLayoutComposite(), SWT.NONE), getFormFactory(), getConversationHolder(), formElement, NamedArea.class, null, EntitySelectionElement.NOTHING); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent - * (java.lang.Object) - */ - /** {@inheritDoc} */ - @Override - public void handleEvent(Object eventSource) { - if (eventSource == selection_namedArea) { - setEntity(selection_namedArea.getSelection()); - } - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java deleted file mode 100644 index 34d7415aa..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java +++ /dev/null @@ -1,171 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Text; - -import eu.etaxonomy.cdm.common.CdmUtils; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; - -/** - * @author pplitzner - * @date 12.08.2013 - * - */ -public class NumberFieldController extends TextFieldController { - private Float start; - private Float end; - - private NumberFormatException exception; - - /** - *

Constructor for NumberWithLabelElement.

- * - * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param labelString a {@link java.lang.String} object. - * @param initialNumber a {@link java.lang.Integer} object. - * @param style a int. - */ - public NumberFieldController(Text controlledText, CdmFormFactory formFactory, ICdmFormElement parentElement, Number initialNumber){ - super(controlledText, formFactory, parentElement, null, null); - //WindowBuilder exception handling - if(initialNumber==null){ - initialNumber = 0; - } - setNumber(initialNumber); - } - - /** - *

setInteger

- * - * @param number a {@link java.lang.Integer} object. - */ - public void setInteger(Integer number) { - super.setText(getStringRepresentation(number)); - } - - /** - *

setNumber

- * - * @param number a {@link java.lang.Number} object. - */ - public void setNumber(Number number) { - super.setText(getStringRepresentation(number)); - } - - /** - *

getInteger

- * - * @return a {@link java.lang.Integer} object. - */ - public Integer getInteger() { - String text = super.getText().trim(); - return text.equals("") ? 0 : new Integer(text); - } - - /** - *

getFloat

- * - * @return a {@link java.lang.Float} object. - */ - public Float getFloat(){ - String text = super.getText(); - return new Float(text); - } - - /** - *

getDouble

- * - * @return a {@link java.lang.Float} object. - */ - public Double getDouble(){ - String text = super.getText(); - return new Double(text); - } - - private String getStringRepresentation(Object number){ - if(number != null){ - return number.toString(); - } - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ - /** {@inheritDoc} */ - @Override - public void modifyText(ModifyEvent event) { - String value = text.getText(); - if(CdmUtils.isEmpty(value)){ - text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - return; - } - - try{ - - Float number = Float.parseFloat(value); - - if((start != null && number < start) || (end != null && number > end)){ - throw new NumberFormatException("You entered a number that is not within the allowed bounds."); - } - - }catch(NumberFormatException e){ - text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED)); - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); - exception = e; - return; - } - - exception = null; - text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - - super.modifyText(event); - } - - /** - *

setLimits

- * - * @param numberOfDigits a int. - * @param start a {@link java.lang.Integer} object. - * @param end a {@link java.lang.Integer} object. - */ - public void setLimits(int numberOfDigits, Integer start, Integer end){ - setLimits(numberOfDigits, start.floatValue(), end.floatValue()); - } - - /** - *

setLimits

- * - * @param numberOfDigits a int. - * @param start a {@link java.lang.Float} object. - * @param end a {@link java.lang.Float} object. - */ - public void setLimits(int numberOfDigits, Float start, Float end){ - text.setTextLimit(numberOfDigits); - this.start = start; - this.end = end; - } - - /** - *

Getter for the field exception.

- * - * @return the exception - */ - public NumberFormatException getException() { - return exception; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointField.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointField.java deleted file mode 100644 index 9e12ff6a8..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointField.java +++ /dev/null @@ -1,112 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class PointField extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text text_latitude; - private Text text_latitudeParsed; - private Text text_longitude; - private Text text_longitudeParsed; - private Text number_errorRadius; - private Combo combo_referenceSystem; - - /** - * Create the composite. - * @param parent - * @param style - */ - public PointField(Composite parent, int style) { - super(parent, style); - { - setLayout(new TableWrapLayout()); - } - - text_latitude = formToolkit.createText(this, "New Text", SWT.NONE); - text_latitude.setText(""); - text_latitude.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - text_latitudeParsed = formToolkit.createText(this, "New Text", SWT.NONE); - text_latitudeParsed.setEnabled(false); - text_latitudeParsed.setText(""); - text_latitudeParsed.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - text_longitude = formToolkit.createText(this, "New Text", SWT.NONE); - text_longitude.setText(""); - text_longitude.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - text_longitudeParsed = formToolkit.createText(this, "New Text", SWT.NONE); - text_longitudeParsed.setEnabled(false); - text_longitudeParsed.setText(""); - text_longitudeParsed.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - number_errorRadius = formToolkit.createText(this, "New Text", SWT.NONE); - number_errorRadius.setText(""); - number_errorRadius.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - combo_referenceSystem = new Combo(this, SWT.READ_ONLY); - combo_referenceSystem.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(combo_referenceSystem); - formToolkit.paintBordersFor(combo_referenceSystem); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getText_latitude() { - return text_latitude; - } - public Text getText_latitudeParsed() { - return text_latitudeParsed; - } - public Text getText_longitude() { - return text_longitude; - } - public Text getText_longitudeParsed() { - return text_longitudeParsed; - } - public Text getNumber_errorRadius() { - return number_errorRadius; - } - public Combo getCombo_referenceSystem() { - return combo_referenceSystem; - } - - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Control#setEnabled(boolean) - */ - @Override - public void setEnabled(boolean enabled) { - super.setEnabled(enabled); - text_latitude.setEnabled(enabled); - text_latitudeParsed.setEnabled(enabled); - text_longitude.setEnabled(enabled); - text_longitudeParsed.setEnabled(enabled); - number_errorRadius.setEnabled(enabled); - combo_referenceSystem.setEnabled(enabled); - } -} 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 deleted file mode 100644 index 3788716c7..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/PointFieldController.java +++ /dev/null @@ -1,187 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import java.text.ParseException; - -import org.eclipse.jface.util.PropertyChangeEvent; - -import eu.etaxonomy.cdm.model.location.Point; -import eu.etaxonomy.cdm.model.location.ReferenceSystem; -import eu.etaxonomy.taxeditor.preference.Resources; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; -import eu.etaxonomy.taxeditor.ui.element.IEntityElement; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class PointFieldController extends AbstractCdmFormElement implements IEntityElement { - - private Point point; - - private final TextFieldController text_latitude; - private final TextFieldController text_longitude; - private final NumberFieldController number_errorRadius; - private final ComboDefinedTermController combo_referenceSystem; - - private final TextFieldController text_latitudeParsed; - - private final TextFieldController text_longitudeParsed; - - /** - *

- * Constructor for PointElement. - *

- * - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param formElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - * @param point - * a {@link eu.etaxonomy.cdm.model.location.Point} object. - * @param style - * a int. - */ - public PointFieldController(PointField pointField, CdmFormFactory formFactory, ICdmFormElement formElement, Point point, final int style) { - super(formFactory, formElement); - - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - - text_latitude = new TextFieldController(pointField.getText_latitude(), getFormFactory(), formElement, null, style); - text_latitudeParsed = new TextFieldController(pointField.getText_latitudeParsed(), getFormFactory(), formElement, null, style); - 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 ComboDefinedTermController(pointField.getCombo_referenceSystem(), getFormFactory(), formElement, ReferenceSystem.class, null, style); - - setPoint(point); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org - * .eclipse.jface.util.PropertyChangeEvent) - */ - /** {@inheritDoc} */ - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event == null) { - return; - } - - boolean propagate = false; - - Object eventSource = event.getSource(); - if (eventSource == text_latitude) { - try { - getPoint().setLatitudeByParsing(text_latitude.getText()); - text_latitudeParsed.setText(point.getLatitudeSexagesimal().toString(false)); - text_latitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND)); - propagate = true; - } catch (ParseException e) { - text_latitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR)); - } - } else if (eventSource == text_longitude) { - try { - getPoint().setLongitudeByParsing(text_longitude.getText()); - text_longitudeParsed.setText(point.getLongitudeSexagesimal().toString(false)); - text_longitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND)); - propagate = true; - } catch (ParseException e) { - text_longitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR)); - } - } else if (eventSource == number_errorRadius) { - getPoint().setErrorRadius(number_errorRadius.getInteger()); - propagate = true; - } else if (eventSource == combo_referenceSystem) { - getPoint().setReferenceSystem(combo_referenceSystem.getSelection()); - propagate = true; - } - - if (propagate) { - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event)); - } - } - - /* - * (non-Javadoc) - * - * @see eu.etaxonomy.taxeditor.forms.IEntityElement#getEntity() - */ - /** {@inheritDoc} */ - @Override - public Point getEntity() { - return getPoint(); - } - - /** - *

- * setEntity - *

- * - * @param point - * a {@link eu.etaxonomy.cdm.model.location.Point} object. - */ - public void setEntity(Point point) { - setPoint(point); - } - - /** - *

- * Setter for the field point. - *

- * - * @param point - * the point to set - */ - public void setPoint(Point point) { - this.point = point; - if (point != null) { - String latitude = point.getLatitudeSexagesimal() == null ? "" : point.getLatitudeSexagesimal().toString(false); - String longitude = point.getLongitudeSexagesimal() == null ? "" : point.getLongitudeSexagesimal().toString(false); - text_latitude.setText(latitude); - text_latitudeParsed.setText(latitude); - text_longitude.setText(longitude); - text_longitudeParsed.setText(longitude); - number_errorRadius.setInteger(point.getErrorRadius()); - combo_referenceSystem.setSelection(point.getReferenceSystem()); - } - } - - /** - *

- * Getter for the field point. - *

- * - * @return the point - */ - public Point getPoint() { - if (point == null) { - point = Point.NewInstance(); - } - - return point; - } - - @Override - public void setSelected(boolean selected) { - setBackground(selected ? SELECTED : getPersistentBackground()); - } -} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/TextFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/TextFieldController.java deleted file mode 100644 index a306b0e4d..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/TextFieldController.java +++ /dev/null @@ -1,210 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; -import org.eclipse.wb.swt.SWTResourceManager; - -import eu.etaxonomy.cdm.common.CdmUtils; -import eu.etaxonomy.taxeditor.preference.Resources; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; -import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement; -import eu.etaxonomy.taxeditor.ui.element.ISelectable; - -/** - * @author pplitzner - * @date 09.08.2013 - * - */ -public class TextFieldController extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement, ISelectable{ - - protected Text text; - - /** Constant MAX_HEIGHT=0 */ - public static final int MAX_HEIGHT = 0; - /** Constant SINGLE=-1 */ - public static final int SINGLE = -1; - - /** - * Create the composite. - * @param parent - * @param style - * @param initialText - * @param textHeight - */ - public TextFieldController(Text controlledText, CdmFormFactory formFactory, ICdmFormElement parentFormElement, String initialText, Integer textHeight) { - super(formFactory, parentFormElement); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - - //vvvvvvvvvvvvv - - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - - initialText = initialText==null?"":initialText; -// -// int scrollStyle = textHeight == null ? SWT.NULL : (SWT.V_SCROLL | SWT.MULTI); -// -// int combinedStyle = style | SWT.BORDER | scrollStyle; -// -// // SWT.PASSWORD does not work when SWT.WRAP is set. -// if (style != SWT.PASSWORD) { -// combinedStyle = combinedStyle | SWT.WRAP; -// } - //^^^^^^^^^^^^^^ - - this.text = controlledText; -// TableWrapData twd_text_1 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP); -// twd_text_1.grabHorizontal = true; - setText(initialText); -// text.setLayoutData(twd_text_1); - - - //vvvvvvvvvvvvvvvvvv - if (textHeight == null) { - text.addKeyListener(new KeyAdapter() { - @Override - public void keyPressed(KeyEvent e) { - if (e.character == SWT.CR) { - // Don't accept carriage returns as input when in single - // line mode - e.doit = false; - } else if (e.character == SWT.TAB) { - // traverse is not working for wrapped text widgets so - // we reintroduce it here - e.doit = false; - TextFieldController.this.text.traverse(SWT.TRAVERSE_TAB_NEXT); - } - } - }); - } - -// if (textHeight != null && textHeight > 0) { -// TableWrapData layoutData = LayoutConstants.FILL(); -// (layoutData).heightHint = textHeight; -// text.setLayoutData(layoutData); -// } - - text.addModifyListener(this); - - addControl(text); - - } - - /** - * Get the text of this composites text composite - * - * @return a {@link java.lang.String} object. - */ - public String getText() { - return text.getText(); - } - - /** - * Set the text of this composites text composite - * - * @param string - * a {@link java.lang.String} object. - */ - public void setText(String string) { - Listener[] listeners = text.getListeners(SWT.Modify); - - for (Listener listener : listeners) { - text.removeListener(SWT.Modify, listener); - } - - text.setText(CdmUtils.Nz(string)); - - for (Listener listener : listeners) { - text.addListener(SWT.Modify, listener); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events - * .ModifyEvent) - */ - /** {@inheritDoc} */ - @Override - public void modifyText(ModifyEvent e) { - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); - } - - /** {@inheritDoc} */ - @Override - public void setEnabled(boolean enabled) { - text.setEnabled(enabled); - String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED; - text.setForeground(getColor(symbolicName)); - } - - /** {@inheritDoc} */ - @Override - public void setIrrelevant(boolean irrelevant) { - String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND; - - Color color = getColor(colorId); - text.setBackground(color); - } - - @Override - public void setSelected(boolean selected) { - setBackground(selected ? SELECTED : getPersistentBackground()); - } - - /* - * (non-Javadoc) - * - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#setFocus() - */ - /** {@inheritDoc} - * @return */ - @Override - public void setFocus() { - text.setFocus(); - } - - /** - *

- * getMainControl - *

- * - * @return a {@link org.eclipse.swt.widgets.Control} object. - */ - public Control getMainControl() { - return text; - } - - /** - *

- * setTextLimit - *

- * - * @param limit - * a int. - */ - public void setTextLimit(int limit) { - text.setTextLimit(limit); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextField.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextField.java deleted file mode 100644 index 55ed58a11..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextField.java +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; - -/** - * @author pplitzner - * @date 14.08.2013 - * - */ -public class ToggleableTextField extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text text; - private Button editButton; - - /** - * Create the composite. - * @param parent - * @param style - */ - public ToggleableTextField(Composite parent, int style) { - super(parent, style); - setBackgroundMode(SWT.INHERIT_DEFAULT); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 2; - tableWrapLayout.verticalSpacing = 0; - tableWrapLayout.topMargin = 0; - tableWrapLayout.rightMargin = 0; - tableWrapLayout.leftMargin = 0; - tableWrapLayout.horizontalSpacing = 0; - tableWrapLayout.bottomMargin = 0; - setLayout(tableWrapLayout); - } - - text = formToolkit.createText(this, "New Text", SWT.WRAP); - text.setText(""); - TableWrapData twd_text = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1); - twd_text.grabVertical = true; - text.setLayoutData(twd_text); - - editButton = formToolkit.createButton(this, "Edit", SWT.TOGGLE); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getText() { - return text; - } - public Button getEditButton() { - return editButton; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextFieldController.java deleted file mode 100644 index 1307f0496..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/ToggleableTextFieldController.java +++ /dev/null @@ -1,218 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.basicFields; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Text; - -import eu.etaxonomy.cdm.common.CdmUtils; -import eu.etaxonomy.taxeditor.preference.Resources; -import eu.etaxonomy.taxeditor.store.StoreUtil; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; -import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement; -import eu.etaxonomy.taxeditor.ui.element.ISelectable; -import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; - -/** - * @author pplitzner - * @date 14.08.2013 - * - */ -public class ToggleableTextFieldController extends AbstractCdmFormElement implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectable { - - private ToggleableTextField toggleableTextField; - - private boolean state; - private Set selectionListener = new HashSet(); - //TODO also connect label -// private Label label; - - /** - *

Constructor for ToggleableTextElement.

- * - * @param style a int. - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param labelString a {@link java.lang.String} object. - * @param initialText a {@link java.lang.String} object. - * @param initialState a boolean. - */ - public ToggleableTextFieldController(ToggleableTextField toggleableTextField, CdmFormFactory formFactory, ICdmFormElement parentElement, - String initialText, boolean initialState, int style) { - super(formFactory, parentElement); - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - - this.toggleableTextField = toggleableTextField; - -// label = formFactory.createLabel(getLayoutComposite(), labelString, style); -// addControl(label); - - Text text = toggleableTextField.getText(); - addControl(text); - text.addModifyListener(this); - text.setLayoutData(LayoutConstants.FILL()); - - // Don't accept carriage returns as input - text.addKeyListener( new KeyAdapter(){ - @Override - public void keyPressed(KeyEvent e) { - if(e.character == SWT.CR) { - e.doit = false; - } - } - }); - - Button editButton = toggleableTextField.getEditButton(); - addControl(editButton); - editButton.addSelectionListener(this); - - setState(initialState); - } - - /** - *

setText

- * - * @param text a {@link java.lang.String} object. - */ - public void setText(String text){ - if(text != null){ - // store current caret position - Text textField = toggleableTextField.getText(); - int caretPosition = textField.getCaretPosition(); - - Listener[] listeners = textField.getListeners(SWT.Modify); - for (Listener listener : listeners) { - textField.removeListener(SWT.Modify, listener); - } - textField.setText(CdmUtils.Nz(text)); - for (Listener listener : listeners) { - textField.addListener(SWT.Modify, listener); - } - - // restore caret position - textField.setSelection(caretPosition); - } - } - - /** - *

getText

- * - * @return a {@link java.lang.String} object. - */ - public String getText(){ - return toggleableTextField.getText().getText(); - } - - /** - *

Setter for the field state.

- * - * @param state a boolean. - */ - public void setState(boolean state) { - this.state = state; - setEnabled(state); - } - - /** {@inheritDoc} */ - @Override - public void setEnabled(boolean enabled) { - toggleableTextField.getText().setEnabled(enabled); - String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED; - toggleableTextField.getText().setForeground(StoreUtil.getColor(symbolicName)); - toggleableTextField.getEditButton().setSelection(enabled); - } - - /** - *

Getter for the field state.

- * - * @return a boolean. - */ - public boolean getState(){ - return state; - } - - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ - /** {@inheritDoc} */ - @Override - public void widgetSelected(SelectionEvent e) { - setState(toggleableTextField.getEditButton().getSelection()); - for(SelectionListener listener : selectionListener){ - listener.widgetSelected(e); - } - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); - } - - /** - *

addSelectionListener

- * - * @param listener a {@link org.eclipse.swt.events.SelectionListener} object. - */ - public void addSelectionListener(SelectionListener listener){ - selectionListener.add(listener); - } - - /** - *

removeSelectionListener

- * - * @param listener a {@link org.eclipse.swt.events.SelectionListener} object. - */ - public void removeSelectionListener(SelectionListener listener){ - selectionListener.remove(listener); - } - - /** {@inheritDoc} */ - @Override - public void widgetDefaultSelected(SelectionEvent e) {} - - /** {@inheritDoc} */ - @Override - public void modifyText(ModifyEvent e) { - firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); - } - - /** {@inheritDoc} */ - @Override - public void setIrrelevant(boolean irrelevant) { - String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND; - - Color color = getColor(colorId); - toggleableTextField.getText().setBackground(color); - } - - /** {@inheritDoc} */ - @Override - public void setBackground(Color color) { -// label.setBackground(color); - toggleableTextField.setBackground(color); - } - - @Override - public void setSelected(boolean selected) { - setBackground(selected ? SELECTED : getPersistentBackground()); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/compatibility/IEntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/compatibility/IEntitySelectionElement.java deleted file mode 100644 index 2acc168d6..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/compatibility/IEntitySelectionElement.java +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.compatibility; - -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Shell; - -import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; -import eu.etaxonomy.cdm.model.common.ICdmBase; -import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement; -import eu.etaxonomy.taxeditor.ui.element.IEntityElement; -import eu.etaxonomy.taxeditor.ui.element.ILabeledElement; -import eu.etaxonomy.taxeditor.ui.element.ISelectableElement; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public interface IEntitySelectionElement extends SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement, ILabeledElement, IConversationEnabled { - /** - * Convenient access to current shell - * - * @return a {@link org.eclipse.swt.widgets.Shell} object. - */ - public abstract Shell getShell(); - - /** - *

- * updateFromWizard - *

- */ - public abstract void updateFromWizard(); - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElement.java deleted file mode 100644 index 4fe05d364..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElement.java +++ /dev/null @@ -1,97 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.SWTResourceManager; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class FieldObservationDetailsElement extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text text_ecology; - private Text text_plantDescription; - private Text text_FieldNotes; - private Text text_IndividualCount; - - /** - * Create the composite. - * @param parent - * @param style - */ - public FieldObservationDetailsElement(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 2; - tableWrapLayout.verticalSpacing = 0; - tableWrapLayout.topMargin = 0; - tableWrapLayout.rightMargin = 0; - tableWrapLayout.leftMargin = 0; - tableWrapLayout.horizontalSpacing = 0; - tableWrapLayout.bottomMargin = 0; - setLayout(tableWrapLayout); - } - - Label lblEcology = formToolkit.createLabel(this, "Ecology", SWT.NONE); - - text_ecology = formToolkit.createText(this, "New Text", SWT.NONE); - text_ecology.setText(""); - text_ecology.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblPlantDescription = formToolkit.createLabel(this, "Plant Description", SWT.NONE); - - text_plantDescription = formToolkit.createText(this, "New Text", SWT.NONE); - text_plantDescription.setText(""); - text_plantDescription.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblFieldNotes = formToolkit.createLabel(this, "Field Notes", SWT.NONE); - - text_FieldNotes = formToolkit.createText(this, "New Text", SWT.NONE); - text_FieldNotes.setText(""); - text_FieldNotes.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblIndividualCount = formToolkit.createLabel(this, "Individual Count", SWT.NONE); - - text_IndividualCount = formToolkit.createText(this, "New Text", SWT.NONE); - text_IndividualCount.setText(""); - text_IndividualCount.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getText_ecology() { - return text_ecology; - } - public Text getText_plantDescription() { - return text_plantDescription; - } - public Text getText_FieldNotes() { - return text_FieldNotes; - } - public Text getText_IndividualCount() { - return text_IndividualCount; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElementController.java deleted file mode 100644 index 151e7bb9f..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsElementController.java +++ /dev/null @@ -1,83 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.NumberFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 15.08.2013 - * - */ -public class FieldObservationDetailsElementController extends AbstractCdmDetailElement { - - private FieldObservationDetailsElement fieldObservationDetailsElement; - - private TextFieldController text_ecology; - - private TextFieldController text_plantDescription; - - private TextFieldController text_fieldObjectDefinition; - - private TextFieldController text_fieldNotes; - - private NumberFieldController number_individualCount; - - /** - *

- * Constructor for FieldObservationDetailElement. - *

- * - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param formElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - */ - public FieldObservationDetailsElementController(FieldObservationDetailsElement fieldObservationDetailsElement, CdmFormFactory formFactory, ICdmFormElement formElement) { - super(formFactory, formElement); - this.fieldObservationDetailsElement = fieldObservationDetailsElement; - } - - /** {@inheritDoc} */ - @Override - protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { -// text_ecology = new TextFieldController(fieldObservationDetailsElement.getText_ecology(), getFormFactory(), formElement, entity.getEcology(CdmStore.getDefaultLanguage()), null); -// text_plantDescription = new TextFieldController(fieldObservationDetailsElement.getText_plantDescription(), getFormFactory(), formElement, entity.getPlantDescription(CdmStore.getDefaultLanguage()), style); - // Disable for now - // text_fieldObjectDefinition = formFactory.createTextWithLabelElement(formElement, "Field Object Definition", entity.getFieldObjectDefinition(CdmStore.getDefaultLanguage()), style); - text_fieldNotes = new TextFieldController(fieldObservationDetailsElement.getText_FieldNotes(), getFormFactory(), formElement, entity.getFieldNotes(), style); - - number_individualCount = new NumberFieldController(fieldObservationDetailsElement.getText_IndividualCount(), getFormFactory(), formElement, entity.getIndividualCount()); - } - - /** {@inheritDoc} */ - @Override - public void handleEvent(Object eventSource) { -// if (eventSource == text_ecology) { -// getEntity().setEcology(text_ecology.getText()); -// } else if (eventSource == text_plantDescription) { -// getEntity().setPlantDescription(text_plantDescription.getText()); -// } else if (eventSource == text_fieldObjectDefinition) { -// getEntity().addFieldObjectDefinition(text_fieldObjectDefinition.getText(), CdmStore.getDefaultLanguage()); -// } else - if (eventSource == text_fieldNotes) { - getEntity().setFieldNotes(text_fieldNotes.getText()); - } else if (eventSource == number_individualCount) { - getEntity().setIndividualCount(number_individualCount.getInteger()); - } - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsSection.java deleted file mode 100644 index c417edd9a..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsSection.java +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 21.08.2013 - * - */ -public class FieldObservationDetailsSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{ - - /** - *

Constructor for FieldObservationDetailSection.

- * - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object. - * @param style a int. - */ - public FieldObservationDetailsSection(CdmFormFactory formFactory, ConversationHolder conversation, - ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Field Observation Details"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createFieldObservationDetailsElementController(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsView.java deleted file mode 100644 index 8a46c9e74..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationDetailsView.java +++ /dev/null @@ -1,88 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.SWTResourceManager; - -/** - * @author pplitzner - * @date 07.08.2013 - * - */ -public class FieldObservationDetailsView extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - - /** - * Create the composite. - * @param parent - * @param style - */ - public FieldObservationDetailsView(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 1; - setLayout(tableWrapLayout); - } - - ExpandableComposite xpndblcmpstNewExpandablecomposite = formToolkit.createExpandableComposite(this, ExpandableComposite.TWISTIE); - TableWrapData twd_xpndblcmpstNewExpandablecomposite = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_xpndblcmpstNewExpandablecomposite.grabHorizontal = true; - xpndblcmpstNewExpandablecomposite.setLayoutData(twd_xpndblcmpstNewExpandablecomposite); - formToolkit.paintBordersFor(xpndblcmpstNewExpandablecomposite); - xpndblcmpstNewExpandablecomposite.setText("FieldObservation"); - xpndblcmpstNewExpandablecomposite.setExpanded(true); - - FieldObservationGeneralElement fieldObservationGeneralElement = new FieldObservationGeneralElement(xpndblcmpstNewExpandablecomposite, SWT.NONE); - formToolkit.adapt(fieldObservationGeneralElement); - formToolkit.paintBordersFor(fieldObservationGeneralElement); - xpndblcmpstNewExpandablecomposite.setClient(fieldObservationGeneralElement); - - ExpandableComposite xpndblcmpstNewExpandablecomposite_1 = formToolkit.createExpandableComposite(this, ExpandableComposite.TWISTIE); - TableWrapData twd_xpndblcmpstNewExpandablecomposite_1 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_xpndblcmpstNewExpandablecomposite_1.grabHorizontal = true; - xpndblcmpstNewExpandablecomposite_1.setLayoutData(twd_xpndblcmpstNewExpandablecomposite_1); - formToolkit.paintBordersFor(xpndblcmpstNewExpandablecomposite_1); - xpndblcmpstNewExpandablecomposite_1.setText("Gathering Event Details"); - xpndblcmpstNewExpandablecomposite_1.setExpanded(true); - - GatheringEventDetailsElement gatheringEventDetailsElement = new GatheringEventDetailsElement(xpndblcmpstNewExpandablecomposite_1, SWT.NONE); - formToolkit.adapt(gatheringEventDetailsElement); - formToolkit.paintBordersFor(gatheringEventDetailsElement); - xpndblcmpstNewExpandablecomposite_1.setClient(gatheringEventDetailsElement); - - ExpandableComposite xpndblcmpstFieldObservationDetails = formToolkit.createExpandableComposite(this, ExpandableComposite.TWISTIE); - TableWrapData twd_xpndblcmpstFieldObservationDetails = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_xpndblcmpstFieldObservationDetails.grabHorizontal = true; - xpndblcmpstFieldObservationDetails.setLayoutData(twd_xpndblcmpstFieldObservationDetails); - formToolkit.paintBordersFor(xpndblcmpstFieldObservationDetails); - xpndblcmpstFieldObservationDetails.setText("Field Observation Details"); - xpndblcmpstFieldObservationDetails.setExpanded(true); - - FieldObservationDetailsElement fieldObservationDetailsElement = new FieldObservationDetailsElement(xpndblcmpstFieldObservationDetails, SWT.NONE); - formToolkit.adapt(fieldObservationDetailsElement); - formToolkit.paintBordersFor(fieldObservationDetailsElement); - xpndblcmpstFieldObservationDetails.setClient(fieldObservationDetailsElement); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElement.java deleted file mode 100644 index e3de5d0c0..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElement.java +++ /dev/null @@ -1,227 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; - -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.EntitySelectionField; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.PointField; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ToggleableTextField; - -/** - * @author pplitzner - * @date 07.08.2013 - * - */ -public class FieldObservationGeneralElement extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private final Text textLocality; - private final Text textElevation; - private final Text textCollectingNumber; - private EntitySelectionField countrySelectionField; - private EntitySelectionField collectorSelectionField; - private ToggleableTextField toggleableTextField; - private PointField pointField; - private Text textAccessionNumber; - private EntitySelectionField collectionSelectionField; - private Label lblCollection; - private Label lblAccesionNumber; - private Label lblCountry; - private Label lblLocality; - private Label lblLatitude; - private Label lblLongitude; - private Label lblErrorRadiusm; - private Label lblReferenceSystem; - private Label lblAbsoluteElevationm; - private Label lblDate; - private Label lblCollector; - private Label lblCollectingNumber; - - /** - * Create the composite. - * - * @param parent - * @param style - */ - public FieldObservationGeneralElement(Composite parent, int style) { - super(parent, SWT.NONE); - setBackgroundMode(SWT.INHERIT_DEFAULT); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 2; - setLayout(tableWrapLayout); - } - - Label lblTitleCache = formToolkit.createLabel(this, "Title Cache", SWT.NONE); - - toggleableTextField = new ToggleableTextField(this, SWT.NONE); - toggleableTextField.setBackgroundMode(SWT.INHERIT_DEFAULT); - TableWrapData twd_toggleableTextField = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_toggleableTextField.grabHorizontal = true; - toggleableTextField.setLayoutData(twd_toggleableTextField); - formToolkit.adapt(toggleableTextField); - formToolkit.paintBordersFor(toggleableTextField); - - lblCountry = new Label(this, SWT.NONE); - formToolkit.adapt(lblCountry, true, true); - lblCountry.setText("Country"); - - countrySelectionField = new EntitySelectionField(this, SWT.NONE); - countrySelectionField.setBackgroundMode(SWT.INHERIT_DEFAULT); - countrySelectionField.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(countrySelectionField); - formToolkit.paintBordersFor(countrySelectionField); - - lblLocality = formToolkit.createLabel(this, "Locality", SWT.NONE); - - textLocality = formToolkit.createText(this, "New Text", SWT.NONE); - textLocality.setText(""); - textLocality.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - lblLatitude = formToolkit.createLabel(this, "Latitude", SWT.NONE); - - pointField = new PointField(this, SWT.NONE); - TableWrapLayout twl_pointField = (TableWrapLayout) pointField.getLayout(); - twl_pointField.verticalSpacing = 0; - twl_pointField.topMargin = 0; - twl_pointField.rightMargin = 0; - twl_pointField.leftMargin = 0; - twl_pointField.horizontalSpacing = 0; - twl_pointField.bottomMargin = 0; - pointField.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 6, 1)); - formToolkit.adapt(pointField); - formToolkit.paintBordersFor(pointField); - new Label(this, SWT.NONE); - - lblLongitude = formToolkit.createLabel(this, "Longitude", SWT.NONE); - new Label(this, SWT.NONE); - - lblErrorRadiusm = formToolkit.createLabel(this, "Error Radius (m)", SWT.NONE); - - lblReferenceSystem = formToolkit.createLabel(this, "Reference System", SWT.NONE); - - lblAbsoluteElevationm = formToolkit.createLabel(this, "Absolute Elevation (m)", SWT.NONE); - - textElevation = formToolkit.createText(this, "New Text", SWT.NONE); - textElevation.setText(""); - textElevation.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - lblDate = formToolkit.createLabel(this, "Date", SWT.NONE); - new Label(this, SWT.NONE); - - lblCollector = formToolkit.createLabel(this, "Collector", SWT.NONE); - - collectorSelectionField = new EntitySelectionField(this, SWT.NONE); - collectorSelectionField.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(collectorSelectionField); - formToolkit.paintBordersFor(collectorSelectionField); - - lblCollectingNumber = formToolkit.createLabel(this, "Collecting Number", SWT.NONE); - - textCollectingNumber = formToolkit.createText(this, "New Text", SWT.NONE); - textCollectingNumber.setText(""); - textCollectingNumber.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - lblCollection = formToolkit.createLabel(this, "Collection", SWT.NONE); - - collectionSelectionField = new EntitySelectionField(this, SWT.NONE); - formToolkit.adapt(collectionSelectionField); - formToolkit.paintBordersFor(collectionSelectionField); - - lblAccesionNumber = formToolkit.createLabel(this, "Accesion Number", SWT.NONE); - - textAccessionNumber = formToolkit.createText(this, "New Text", SWT.NONE); - textAccessionNumber.setText(""); - textAccessionNumber.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public EntitySelectionField getCountrySelectionField() { - return countrySelectionField; - } - - public EntitySelectionField getCollectorSelectionField() { - return collectorSelectionField; - } - - public Text getTextElevation() { - return textElevation; - } - - public Text getTextLocality() { - return textLocality; - } - - public Text getTextCollectingNumber() { - return textCollectingNumber; - } - - public ToggleableTextField getToggleableTextField() { - return toggleableTextField; - } - - public PointField getPointField() { - return pointField; - } - public EntitySelectionField getCollectionSelectionField() { - return collectionSelectionField; - } - public Text getTextAccessionNumber() { - return textAccessionNumber; - } - public Label getLblCollection() { - return lblCollection; - } - public Label getLblAccesionNumber() { - return lblAccesionNumber; - } - public Label getLblCountry() { - return lblCountry; - } - public Label getLblLocality() { - return lblLocality; - } - public Label getLblLatitude() { - return lblLatitude; - } - public Label getLblLongitude() { - return lblLongitude; - } - public Label getLblErrorRadiusm() { - return lblErrorRadiusm; - } - public Label getLblReferenceSystem() { - return lblReferenceSystem; - } - public Label getLblAbsoluteElevation() { - return lblAbsoluteElevationm; - } - public Label getLblDate() { - return lblDate; - } - public Label getLblCollector() { - return lblCollector; - } - public Label getLblCollectingNumber() { - return lblCollectingNumber; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java deleted file mode 100644 index c5b8d3620..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralElementController.java +++ /dev/null @@ -1,168 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.model.agent.AgentBase; -import eu.etaxonomy.cdm.model.common.LanguageString; -import eu.etaxonomy.cdm.model.location.NamedArea; -import eu.etaxonomy.cdm.model.occurrence.Collection; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.EntitySelectionFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.LanguageTextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.NumberFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.PointFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.ToggleableTextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; - -/** - * @author pplitzner - * @date 13.08.2013 - * - */ -public class FieldObservationGeneralElementController extends AbstractCdmDetailElement { - - private FieldObservationGeneralElement fieldObservationGeneralElement; - - private ToggleableTextFieldController toggleableText_titleCache; - private EntitySelectionFieldController selection_country; - private LanguageTextFieldController languageText_locality; - private PointFieldController element_point; - private NumberFieldController number_elevation; - private TimePeriodElement element_date;//TODO convert - private EntitySelectionFieldController selection_collector; - private TextFieldController text_collectingNumber; - private EntitySelectionFieldController selectionCollection; - private TextFieldController textAccessionNumber; - - boolean isSpecimen; - boolean isWizard; - - /** - * @param formFactory - * @param formElement - */ - public FieldObservationGeneralElementController(FieldObservationGeneralElement fieldObservationGeneralElement, CdmFormFactory formFactory, ICdmFormElement formElement, boolean isSpecimen, boolean isWizard) { - super(formFactory, formElement); - this.fieldObservationGeneralElement = fieldObservationGeneralElement; - this.isSpecimen = isSpecimen; - this.isWizard = isWizard; - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls - * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int) - */ - @Override - protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { - toggleableText_titleCache = new ToggleableTextFieldController(fieldObservationGeneralElement.getToggleableTextField(), getFormFactory(), formElement, entity.getTitleCache(), entity.isProtectedTitleCache(), style); - - selection_country = new EntitySelectionFieldController(fieldObservationGeneralElement.getCountrySelectionField(), getFormFactory(), getConversationHolder(), formElement, NamedArea.class, entity.getCountry(), EntitySelectionElement.NOTHING); - languageText_locality = new LanguageTextFieldController(fieldObservationGeneralElement.getTextLocality(), getFormFactory(), formElement, entity.getLocality()); - element_point = new PointFieldController(fieldObservationGeneralElement.getPointField(),getFormFactory(), formElement, entity.getExactLocation(), style); - number_elevation = new NumberFieldController(fieldObservationGeneralElement.getTextElevation(), getFormFactory(), formElement, entity.getAbsoluteElevation()); - element_date = formFactory.createTimePeriodElement(formElement, "Date", entity.getGatheringPeriod(), style); - selection_collector = new EntitySelectionFieldController(fieldObservationGeneralElement.getCollectorSelectionField(), getFormFactory(), getConversationHolder(), formElement, AgentBase.class, entity.getCollector(), EntitySelectionElement.ALL); - text_collectingNumber = new TextFieldController(fieldObservationGeneralElement.getTextCollectingNumber(), getFormFactory(), formElement, entity.getFieldNumber(), null); - if(isWizard){ - if(!isSpecimen){ - fieldObservationGeneralElement.getLblCollection().setVisible(false); - fieldObservationGeneralElement.getCollectionSelectionField().setVisible(false); - fieldObservationGeneralElement.getLblAccesionNumber().setVisible(false); - fieldObservationGeneralElement.getTextAccessionNumber().setVisible(false); - } - else{ - selectionCollection = new EntitySelectionFieldController(fieldObservationGeneralElement.getCollectionSelectionField(), getFormFactory(), getConversationHolder(), formElement, Collection.class, entity.getCollection(), EntitySelectionElement.ALL); - textAccessionNumber = new TextFieldController(fieldObservationGeneralElement.getTextAccessionNumber(), getFormFactory(), formElement, entity.getAccessionNumber(), null); - } - } - else{ - if(isSpecimen){ - selectionCollection = new EntitySelectionFieldController(fieldObservationGeneralElement.getCollectionSelectionField(), getFormFactory(), getConversationHolder(), formElement, Collection.class, entity.getCollection(), EntitySelectionElement.ALL); - textAccessionNumber = new TextFieldController(fieldObservationGeneralElement.getTextAccessionNumber(), getFormFactory(), formElement, entity.getAccessionNumber(), null); - fieldObservationGeneralElement.getLblCountry().setEnabled(false); - fieldObservationGeneralElement.getCountrySelectionField().setEnabled(false); - fieldObservationGeneralElement.getLblLocality().setEnabled(false); - fieldObservationGeneralElement.getTextLocality().setEnabled(false); - - fieldObservationGeneralElement.getPointField().setEnabled(false); - // fieldObservationGeneralElement.getPointField().getText_latitude().setEnabled(false); - fieldObservationGeneralElement.getLblLatitude().setEnabled(false); - // fieldObservationGeneralElement.getPointField().getText_longitude().setEnabled(false); - fieldObservationGeneralElement.getLblLongitude().setEnabled(false); - // fieldObservationGeneralElement.getPointField().getNumber_errorRadius().setEnabled(false); - fieldObservationGeneralElement.getLblErrorRadiusm().setEnabled(false); - // fieldObservationGeneralElement.getPointField().getCombo_referenceSystem().setEnabled(false); - fieldObservationGeneralElement.getLblReferenceSystem().setEnabled(false); - - fieldObservationGeneralElement.getLblAbsoluteElevation().setEnabled(false); - fieldObservationGeneralElement.getTextElevation().setEnabled(false); - fieldObservationGeneralElement.getLblDate().setEnabled(false); - - fieldObservationGeneralElement.getLblCollector().setEnabled(false); - fieldObservationGeneralElement.getCollectorSelectionField().setEnabled(false); - fieldObservationGeneralElement.getLblCollectingNumber().setEnabled(false); - fieldObservationGeneralElement.getTextCollectingNumber().setEnabled(false); - } - else{ - fieldObservationGeneralElement.getLblCollection().setVisible(false); - fieldObservationGeneralElement.getCollectionSelectionField().setVisible(false); - fieldObservationGeneralElement.getLblAccesionNumber().setVisible(false); - fieldObservationGeneralElement.getTextAccessionNumber().setVisible(false); - } - } - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java - * .lang.Object) - */ - @Override - public void handleEvent(Object eventSource) { - if (eventSource == toggleableText_titleCache) { - getEntity().setTitleCache(toggleableText_titleCache.getText(), toggleableText_titleCache.getState()); - } else if (eventSource == selection_country) { - getEntity().setCountry(selection_country.getSelection()); - } else if (eventSource == languageText_locality) { - LanguageString locality = languageText_locality.getLanguageString(); - getEntity().setLocality(locality); - } else if (eventSource == element_point) { - getEntity().setExactLocation(element_point.getPoint()); - } else if (eventSource == number_elevation) { - getEntity().setAbsoluteElevation(number_elevation.getInteger()); - } else if (eventSource == element_date) { - getEntity().setGatheringPeriod(element_date.getTimePeriod()); - } else if (eventSource == selection_collector) { - getEntity().setCollector(selection_collector.getSelection()); - } else if (eventSource == text_collectingNumber) { - getEntity().setFieldNumber(text_collectingNumber.getText()); - } else if (eventSource == selectionCollection) { - getEntity().setCollection(selectionCollection.getSelection()); - } else if (eventSource == textAccessionNumber) { - getEntity().setAccessionNumber(textAccessionNumber.getText()); - } - if (eventSource != toggleableText_titleCache) { - toggleableText_titleCache.setText(getEntity().getTitleCache()); - } - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralSection.java deleted file mode 100644 index e9d459be3..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/FieldObservationGeneralSection.java +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 16.08.2013 - * - */ -public class FieldObservationGeneralSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{ - - /** - *

Constructor for FieldObservationDetailSection.

- * - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object. - * @param style a int. - */ - public FieldObservationGeneralSection(CdmFormFactory formFactory, ConversationHolder conversation, - ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Field Observation"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createFieldObservationGeneralElementController(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElement.java deleted file mode 100644 index d1d436e3e..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElement.java +++ /dev/null @@ -1,127 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.SWTResourceManager; - -/** - * @author pplitzner - * @date 07.08.2013 - * - */ -public class GatheringEventDetailsElement extends Composite { - private FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text textElevationError; - private Text text_ElevationMinimum; - private Text text_ElevationMaximum; - private Text text_CollectingMethod; - private Text text_DistanceToGround; - private Text text_DistanceToWaterSurface; - private Text text_GatheringEventDescription; - - /** - * Create the composite. - * @param parent - * @param style - */ - public GatheringEventDetailsElement(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.verticalSpacing = 0; - tableWrapLayout.topMargin = 0; - tableWrapLayout.rightMargin = 0; - tableWrapLayout.leftMargin = 0; - tableWrapLayout.horizontalSpacing = 0; - tableWrapLayout.bottomMargin = 0; - tableWrapLayout.numColumns = 2; - setLayout(tableWrapLayout); - } - - Label lblElevationError = formToolkit.createLabel(this, "Elevation Error", SWT.NONE); - - textElevationError = formToolkit.createText(this, "New Text", SWT.NONE); - textElevationError.setText(""); - textElevationError.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblElevationMinimumm = formToolkit.createLabel(this, "Elevation Minimum (m)", SWT.NONE); - - text_ElevationMinimum = formToolkit.createText(this, "New Text", SWT.NONE); - text_ElevationMinimum.setText(""); - text_ElevationMinimum.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblElevationMaximumm = formToolkit.createLabel(this, "Elevation Maximum (m)", SWT.NONE); - - text_ElevationMaximum = formToolkit.createText(this, "New Text", SWT.NONE); - text_ElevationMaximum.setText(""); - text_ElevationMaximum.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblCollectingMethod = formToolkit.createLabel(this, "Collecting Method", SWT.NONE); - - text_CollectingMethod = formToolkit.createText(this, "New Text", SWT.NONE); - text_CollectingMethod.setText(""); - text_CollectingMethod.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblDistanceToGround = formToolkit.createLabel(this, "Distance To Ground (m)", SWT.NONE); - - text_DistanceToGround = formToolkit.createText(this, "New Text", SWT.NONE); - text_DistanceToGround.setText(""); - text_DistanceToGround.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblDistanceToWater = formToolkit.createLabel(this, "Distance To Water Surface (m)", SWT.NONE); - - text_DistanceToWaterSurface = formToolkit.createText(this, "New Text", SWT.NONE); - text_DistanceToWaterSurface.setText(""); - text_DistanceToWaterSurface.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblGatheringEventDescription = formToolkit.createLabel(this, "Gathering Event Description", SWT.NONE); - - text_GatheringEventDescription = formToolkit.createText(this, "New Text", SWT.NONE); - text_GatheringEventDescription.setText(""); - text_GatheringEventDescription.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getTextElevationError() { - return textElevationError; - } - public Text getText_ElevationMinimum() { - return text_ElevationMinimum; - } - public Text getText_ElevationMaximum() { - return text_ElevationMaximum; - } - public Text getText_CollectingMethod() { - return text_CollectingMethod; - } - public Text getText_DistanceToGround() { - return text_DistanceToGround; - } - public Text getText_DistanceToWaterSurface() { - return text_DistanceToWaterSurface; - } - public Text getText_GatheringEventDescription() { - return text_GatheringEventDescription; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElementController.java deleted file mode 100644 index 56f104594..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventDetailsElementController.java +++ /dev/null @@ -1,115 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.ui.forms.widgets.ExpandableComposite; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.NumberFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectingAreasDetailSection; - -/** - * @author pplitzner - * @date 14.08.2013 - * - */ -public class GatheringEventDetailsElementController extends AbstractCdmDetailElement { - - private GatheringEventDetailsElement gatheringEventDetailsElement; - -// private NumberFieldController number_absoluteElevationError; - -// private NumberFieldController number_absoluteElevationMinimum; - - private NumberFieldController number_absoluteElevationMaximum; - - private TextFieldController text_collectingMethod; - - private NumberFieldController number_distanceToGround; - - private NumberFieldController number_distanceToWaterSurface; - - private TextFieldController text_gatheringEventDescription; - - private CollectingAreasDetailSection section_collectingAreas; - - /** - *

- * Constructor for GatheringEventDetailElement. - *

- * - * @param formFactory - * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} - * object. - * @param formElement - * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} - * object. - */ - public GatheringEventDetailsElementController(GatheringEventDetailsElement gatheringEventDetailsElement, CdmFormFactory formFactory, ICdmFormElement formElement) { - super(formFactory, formElement); - this.gatheringEventDetailsElement = gatheringEventDetailsElement; - } - - /** {@inheritDoc} */ - @Override - protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { - -// number_absoluteElevationError = new NumberFieldController(gatheringEventDetailsElement.getTextElevationError(), formFactory, this, entity.getAbsoluteElevation()); -// number_absoluteElevationMinimum = new NumberFieldController(gatheringEventDetailsElement.getText_ElevationMinimum(), formFactory, this, entity.getAbsoluteElevationMinimum()); - number_absoluteElevationMaximum = new NumberFieldController(gatheringEventDetailsElement.getText_ElevationMaximum(), formFactory, this, entity.getAbsoluteElevationMaximum()); - text_collectingMethod = new TextFieldController(gatheringEventDetailsElement.getText_CollectingMethod(), formFactory, this, entity.getCollectingMethod(), null); - number_distanceToGround = new NumberFieldController(gatheringEventDetailsElement.getText_DistanceToGround(), formFactory, this, entity.getDistanceToGround()); - number_distanceToWaterSurface = new NumberFieldController(gatheringEventDetailsElement.getText_DistanceToWaterSurface(), formFactory, this, entity.getDistanceToWaterSurface()); - text_gatheringEventDescription = new TextFieldController(gatheringEventDetailsElement.getText_GatheringEventDescription(), formFactory, this, entity.getGatheringEventDescription(), null); - section_collectingAreas = formFactory.createCollectingAreasDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE); - section_collectingAreas.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - section_collectingAreas.setEntity(entity); - } - - /** {@inheritDoc} */ - @Override - public void handleEvent(Object eventSource) { -// if (eventSource == number_absoluteElevationError) { -// getEntity().setAbsoluteElevationError(number_absoluteElevationError.getDouble()); -// } -// else if (eventSource == number_absoluteElevationMinimum) { -// try { -// getEntity().setAbsoluteElevationRange(number_absoluteElevationMinimum.getInteger(), number_absoluteElevationMaximum.getInteger()); -// number_absoluteElevationMinimum.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND)); -// } catch (IllegalArgumentException e) { -// number_absoluteElevationMinimum.setBackground(getColor(Resources.COLOR_PARSE_ERROR)); -// AbstractUtility.warn(getClass(), e.getLocalizedMessage()); -// } -// } -// else if (eventSource == number_absoluteElevationMaximum) { -// try { -// getEntity().setAbsoluteElevationRange(number_absoluteElevationError.getInteger(), number_absoluteElevationMaximum.getInteger()); -// number_absoluteElevationMaximum.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND)); -// } catch (IllegalArgumentException e) { -// number_absoluteElevationMaximum.setBackground(getColor(Resources.COLOR_PARSE_ERROR)); -// AbstractUtility.warn(getClass(), e.getLocalizedMessage()); -// } -// } else - if (eventSource == text_collectingMethod) { - getEntity().setCollectingMethod(text_collectingMethod.getText()); - } else if (eventSource == number_distanceToGround) { - getEntity().setDistanceToGround(number_distanceToGround.getDouble()); - } else if (eventSource == number_distanceToWaterSurface) { - getEntity().setDistanceToWaterSurface(number_distanceToWaterSurface.getDouble()); - } else if (eventSource == text_gatheringEventDescription) { - getEntity().setGatheringEventDescription(text_gatheringEventDescription.getText()); - } - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventSection.java deleted file mode 100644 index d548812e0..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/fieldObservation/GatheringEventSection.java +++ /dev/null @@ -1,61 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 21.08.2013 - * - */ -public class GatheringEventSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{ - - /** - *

Constructor for GatheringEventDetailSection.

- * - * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object. - * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object. - * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object. - * @param style a int. - */ - public GatheringEventSection(CdmFormFactory formFactory, - ConversationHolder conversation, ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() - */ - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Gathering Event Details"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createGatheringEventDetailsElementController(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElement.java deleted file mode 100644 index db4c70d84..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElement.java +++ /dev/null @@ -1,105 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.SWTResourceManager; - -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.EntitySelectionField; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class DerivedUnitDetailsElement extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text textBarcode; - private Text textCatalogNumber; - private Text txtExsiccatum; - private Combo comboPreservationMethod; - private EntitySelectionField storedUnderSelectionField; - - /** - * Create the composite. - * @param parent - * @param style - */ - public DerivedUnitDetailsElement(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 2; - setLayout(tableWrapLayout); - } - - Label lblBarcode = formToolkit.createLabel(this, "Barcode", SWT.NONE); - - textBarcode = formToolkit.createText(this, "New Text", SWT.NONE); - textBarcode.setText(""); - textBarcode.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblCatalognumber = formToolkit.createLabel(this, "CatalogNumber", SWT.NONE); - - textCatalogNumber = formToolkit.createText(this, "New Text", SWT.NONE); - textCatalogNumber.setText(""); - textCatalogNumber.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblPreservationMethod = formToolkit.createLabel(this, "Preservation Method", SWT.NONE); - - comboPreservationMethod = new Combo(this, SWT.NONE); - comboPreservationMethod.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(comboPreservationMethod); - formToolkit.paintBordersFor(comboPreservationMethod); - - Label lblStoredUnder = formToolkit.createLabel(this, "Stored Under", SWT.NONE); - - storedUnderSelectionField = new EntitySelectionField(this, SWT.NONE); - formToolkit.adapt(storedUnderSelectionField); - formToolkit.paintBordersFor(storedUnderSelectionField); - - Label lblExsiccatum = formToolkit.createLabel(this, "Exsiccatum", SWT.NONE); - - txtExsiccatum = formToolkit.createText(this, "New Text", SWT.NONE); - txtExsiccatum.setText(""); - txtExsiccatum.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getTextBarcode() { - return textBarcode; - } - public Text getTextCatalogNumber() { - return textCatalogNumber; - } - public Combo getComboPreservationMethod() { - return comboPreservationMethod; - } - public EntitySelectionField getStoredUnderSelectionField() { - return storedUnderSelectionField; - } - public Text getTxtExsiccatum() { - return txtExsiccatum; - } -} 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 deleted file mode 100644 index 22c34391e..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsElementController.java +++ /dev/null @@ -1,110 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.ui.forms.widgets.ExpandableComposite; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -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.EntitySelectionFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.occurrence.SourceCollectionDetailSection; -import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class DerivedUnitDetailsElementController extends AbstractCdmDetailElement { - - private DerivedUnitDetailsElement derivedUnitDetailsElement; - - private TextFieldController barCode; - private TextFieldController catalogNumber; -// private ComboDefinedTermController preservationMethod; - private EntitySelectionFieldController storedUnder; - private TextFieldController exsiccatum; - - private SourceCollectionDetailSection section_source; - - - public DerivedUnitDetailsElementController(DerivedUnitDetailsElement derivedUnitDetailsElement, CdmFormFactory formFactory, ICdmFormElement formElement) { - super(formFactory, formElement); - this.derivedUnitDetailsElement = derivedUnitDetailsElement; - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement, java.lang.Object, int) - */ - @Override - protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { - barCode = new TextFieldController(derivedUnitDetailsElement.getTextBarcode(), getFormFactory(), formElement, entity.getBarcode(), null); - catalogNumber = new TextFieldController(derivedUnitDetailsElement.getTextCatalogNumber(), getFormFactory(), formElement, entity.getCatalogNumber(), null); - PreservationMethod entityPreservationMethod; - try { - entityPreservationMethod = entity.getPreservationMethod(); - } catch (MethodNotSupportedByDerivedUnitTypeException e) { - // we ignore this - AbstractUtility.info(e.getMessage()); - entityPreservationMethod = null; - } -// 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 { - entitiyExsiccatum = entity.getExsiccatum(); - } catch (MethodNotSupportedByDerivedUnitTypeException e) { - // we ignore this - AbstractUtility.info(e.getMessage()); - entitiyExsiccatum = null; - } - exsiccatum = new TextFieldController(derivedUnitDetailsElement.getTxtExsiccatum(), getFormFactory(), formElement, entitiyExsiccatum, null); - - section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE); - section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1)); - section_source.setEntity(entity); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object) - */ - @Override - public void handleEvent(Object eventSource) { - if (eventSource == barCode) { - getEntity().setBarcode(barCode.getText()); - } else if (eventSource == catalogNumber) { - getEntity().setCatalogNumber(catalogNumber.getText()); -// } else if (eventSource == preservationMethod) { -// try { -// getEntity().setPreservationMethod(preservationMethod.getSelection()); -// } catch (MethodNotSupportedByDerivedUnitTypeException e) { -// AbstractUtility.errorDialog("MethodNotSupportedByDerivedUnitTypeException", this, "MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit", e); -// } - } else if (eventSource == storedUnder) { - getEntity().setStoredUnder(storedUnder.getEntity()); - } else if (eventSource == exsiccatum) { - try { - getEntity().setExsiccatum(exsiccatum.getText()); - } catch (Exception e) { - AbstractUtility.error(this.getClass(), e); - } - } - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsSection.java deleted file mode 100644 index db2f504a2..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/DerivedUnitDetailsSection.java +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class DerivedUnitDetailsSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection { - - public DerivedUnitDetailsSection(CdmFormFactory formFactory, ConversationHolder conversation, - ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Derived Unit Details"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createDerivedUnitDetailsElementController(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElement.java deleted file mode 100644 index bcd543288..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElement.java +++ /dev/null @@ -1,104 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.TableWrapData; -import org.eclipse.ui.forms.widgets.TableWrapLayout; -import org.eclipse.wb.swt.SWTResourceManager; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class SpecimenDetailsElement extends Composite { - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - private Text text_IndividualEcology; - private Text text_PlantDesriptionDetails; - private Text text_IndividualFieldNotes; - private Combo comboLiveStage; - private Combo combo_Sex; - - /** - * Create the composite. - * @param parent - * @param style - */ - public SpecimenDetailsElement(Composite parent, int style) { - super(parent, style); - setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); - { - TableWrapLayout tableWrapLayout = new TableWrapLayout(); - tableWrapLayout.numColumns = 2; - setLayout(tableWrapLayout); - } - - Label lblNewLabel = formToolkit.createLabel(this, "Individual Ecology", SWT.NONE); - - text_IndividualEcology = formToolkit.createText(this, "New Text", SWT.NONE); - text_IndividualEcology.setText(""); - text_IndividualEcology.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblPlantDescriptionDetails = formToolkit.createLabel(this, "Plant Description Details", SWT.NONE); - - text_PlantDesriptionDetails = formToolkit.createText(this, "New Text", SWT.NONE); - text_PlantDesriptionDetails.setText(""); - text_PlantDesriptionDetails.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblIndividualFieldNotes = formToolkit.createLabel(this, "Individual Field Notes", SWT.NONE); - - text_IndividualFieldNotes = formToolkit.createText(this, "New Text", SWT.NONE); - text_IndividualFieldNotes.setText(""); - text_IndividualFieldNotes.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - - Label lblLiveStage = formToolkit.createLabel(this, "Live Stage", SWT.NONE); - - comboLiveStage = new Combo(this, SWT.NONE); - comboLiveStage.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(comboLiveStage); - formToolkit.paintBordersFor(comboLiveStage); - - Label lblSex = formToolkit.createLabel(this, "Sex", SWT.NONE); - - combo_Sex = new Combo(this, SWT.NONE); - combo_Sex.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1)); - formToolkit.adapt(combo_Sex); - formToolkit.paintBordersFor(combo_Sex); - - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public Text getText_IndividualEcology() { - return text_IndividualEcology; - } - public Text getText_PlantDesriptionDetails() { - return text_PlantDesriptionDetails; - } - public Text getText_IndividualFieldNotes() { - return text_IndividualFieldNotes; - } - public Combo getComboLiveStage() { - return comboLiveStage; - } - public Combo getCombo_Sex() { - return combo_Sex; - } -} 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 deleted file mode 100644 index 404148750..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsElementController.java +++ /dev/null @@ -1,75 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -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.ComboDefinedTermController; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.TextFieldController; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class SpecimenDetailsElementController extends AbstractCdmDetailElement { - - private SpecimenDetailsElement specimenDetailsElement; - private TextFieldController individualEcology; - private TextFieldController plantDescriptionDetails; - private TextFieldController individualFieldNotes; - private ComboDefinedTermController liveStage; - private ComboDefinedTermController sex; - - - public SpecimenDetailsElementController(SpecimenDetailsElement specimenDetailsElement, CdmFormFactory formFactory, ICdmFormElement formElement) { - super(formFactory, formElement); - this.specimenDetailsElement = specimenDetailsElement; - setPropertyChangeListeners(formFactory.getPropertyChangeListeners()); - formFactory.addPropertyChangeListener(this); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement, java.lang.Object, int) - */ - @Override - protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { - individualEcology = new TextFieldController(specimenDetailsElement.getText_IndividualEcology(), getFormFactory(), formElement, entity.getEcology(), null); - plantDescriptionDetails = new TextFieldController(specimenDetailsElement.getText_PlantDesriptionDetails(), getFormFactory(), formElement, entity.getPlantDescription(), null); - plantDescriptionDetails = new TextFieldController(specimenDetailsElement.getText_IndividualFieldNotes(), getFormFactory(), formElement, entity.getFieldNotes(), null); - 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) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object) - */ - @Override - public void handleEvent(Object eventSource) { - if(eventSource == individualEcology){ - getEntity().setEcology(individualEcology.getText()); - } - else if(eventSource == plantDescriptionDetails){ - getEntity().setPlantDescription(plantDescriptionDetails.getText()); - } - else if(eventSource == individualFieldNotes){ - getEntity().setFieldNotes(individualFieldNotes.getText()); - } - else if(eventSource == liveStage){ - getEntity().setLifeStage(liveStage.getSelection()); - } - else if(eventSource == sex){ - getEntity().setSex(sex.getSelection()); - } - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsSection.java deleted file mode 100644 index 4854f72c9..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenDetailsSection.java +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 29.08.2013 - * - */ -public class SpecimenDetailsSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection { - - public SpecimenDetailsSection(CdmFormFactory formFactory, ConversationHolder conversation, - ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Specimen Details"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createSpecimenDetailsElementController(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenGeneralSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenGeneralSection.java deleted file mode 100644 index e20e81932..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/detailViews/specimen/SpecimenGeneralSection.java +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection; - -/** - * @author pplitzner - * @date 16.08.2013 - * - */ -public class SpecimenGeneralSection extends AbstractCdmDetailSection implements IDerivedUnitFacadeDetailSection{ - - public SpecimenGeneralSection(CdmFormFactory formFactory, ConversationHolder conversation, - ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - /** {@inheritDoc} */ - @Override - public String getHeading() { - return "Specimen"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createSpecimenGeneralElementController(parentElement); - } -} 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 4fdc1b90e..d014cff4f 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 @@ -95,23 +95,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.cdm.strategy.parser.ParserProblem; import eu.etaxonomy.taxeditor.model.AbstractUtility; -import eu.etaxonomy.taxeditor.ui.campanula.basicFields.NamedAreaFieldController; import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationDetailsElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationDetailsElementController; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationDetailsSection; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationGeneralElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationGeneralElementController; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationGeneralSection; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.GatheringEventDetailsElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.GatheringEventDetailsElementController; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.GatheringEventSection; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.DerivedUnitDetailsElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.DerivedUnitDetailsElementController; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.DerivedUnitDetailsSection; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.SpecimenDetailsElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.SpecimenDetailsElementController; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.SpecimenGeneralSection; import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection.UnitType; @@ -2497,13 +2481,6 @@ public class CdmFormFactory extends FormToolkit { return element; } - public void createNamedAreaFieldController(AbstractFormSection parentElement, NamedArea namedArea, SelectionListener removeListener){ -// Object entity = HibernateProxyHelper.deproxy(versionableEntity); TODO deproxy necessary?? - NamedAreaFieldController element = new NamedAreaFieldController(this, parentElement, namedArea, removeListener, SWT.NONE); - adapt(element); - parentElement.addElement(element); - } - /** *

* Creates a selection element for the given type T. @@ -2657,118 +2634,10 @@ public class CdmFormFactory extends FormToolkit { return text; } - - - /** - * @param conversationHolder - * @param parent - * @param detailsViewer - * @param i - * @return - */ - public FieldObservationGeneralSection createFieldObservationGeneralSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - FieldObservationGeneralSection section = new FieldObservationGeneralSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - /** - * @param conversationHolder - * @param parent - * @param detailsViewer - * @param i - * @return - */ - public GatheringEventSection createGatheringEventSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - GatheringEventSection section = new GatheringEventSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - /** - * @param conversationHolder - * @param parent - * @param detailsViewer - * @param i - * @return - */ - public FieldObservationDetailsSection createFieldObservationDetailsSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - FieldObservationDetailsSection section = new FieldObservationDetailsSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - - public SpecimenGeneralSection createSpecimenSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - SpecimenGeneralSection section = new SpecimenGeneralSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - public PreservedSpecimenDetailSection createPreservedSpecimenDetailsSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { PreservedSpecimenDetailSection section = new PreservedSpecimenDetailSection(this, conversation, parentElement, selectionProvider, style); addAndAdaptSection(parentElement, section); return section; } - public DerivedUnitDetailsSection createDerivedUnitDetailsSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) { - DerivedUnitDetailsSection section = new DerivedUnitDetailsSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - - public FieldObservationGeneralElementController createSpecimenGeneralElementController(ICdmFormElement parentElement){ - return createFieldObservationGeneralElementController_internal(parentElement, true, false); - } - - public SpecimenDetailsElementController createSpecimenDetailsElementController(ICdmFormElement parentElement){ - SpecimenDetailsElement element = new SpecimenDetailsElement(parentElement.getLayoutComposite(), SWT.NONE); - element.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1)); - SpecimenDetailsElementController controller = new SpecimenDetailsElementController(element, this, parentElement); - addAndAdaptElement(parentElement, controller); - return controller; - } - - public DerivedUnitDetailsElementController createDerivedUnitDetailsElementController(ICdmFormElement parentElement){ - DerivedUnitDetailsElement element = new DerivedUnitDetailsElement(parentElement.getLayoutComposite(), SWT.NONE); - element.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1)); - DerivedUnitDetailsElementController controller = new DerivedUnitDetailsElementController(element, this, parentElement); - addAndAdaptElement(parentElement, controller); - return controller; - } - - public FieldObservationGeneralElementController createSpecimenGeneralElementControllerWizard(ICdmFormElement parentElement){ - return createFieldObservationGeneralElementController_internal(parentElement, true, true); - } - - public FieldObservationGeneralElementController createFieldObservationGeneralElementControllerWizard(ICdmFormElement parentElement){ - return createFieldObservationGeneralElementController_internal(parentElement, false, true); - } - - public FieldObservationGeneralElementController createFieldObservationGeneralElementController(ICdmFormElement parentElement){ - return createFieldObservationGeneralElementController_internal(parentElement, false, false); - } - - private FieldObservationGeneralElementController createFieldObservationGeneralElementController_internal(ICdmFormElement parentElement, boolean isSpecimen, boolean isWizard){ - FieldObservationGeneralElement element = new FieldObservationGeneralElement(parentElement.getLayoutComposite(), SWT.NONE); - element.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1)); - FieldObservationGeneralElementController controller = new FieldObservationGeneralElementController(element, this, parentElement, isSpecimen, isWizard); - addAndAdaptElement(parentElement, controller); - return controller; - } - - public GatheringEventDetailsElementController createGatheringEventDetailsElementController(ICdmFormElement parentElement) { - GatheringEventDetailsElement element = new GatheringEventDetailsElement(parentElement.getLayoutComposite(), SWT.NONE); - element.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1)); - GatheringEventDetailsElementController controller = new GatheringEventDetailsElementController(element, this, parentElement); - adapt(controller); - parentElement.addElement(controller); - return controller; - } - - public FieldObservationDetailsElementController createFieldObservationDetailsElementController(ICdmFormElement parentElement) { - FieldObservationDetailsElement element = new FieldObservationDetailsElement(parentElement.getLayoutComposite(), SWT.NONE); - element.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2,1)); - FieldObservationDetailsElementController controller = new FieldObservationDetailsElementController(element, this, parentElement); - addAndAdaptElement(parentElement, controller); - return controller; - } - } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java index aa30aea54..969a01032 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java @@ -12,9 +12,6 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; import java.util.Collection; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Color; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.model.location.NamedArea; @@ -103,12 +100,4 @@ public class CollectingAreasDetailSection extends AbstractEntityCollectionSectio return "Add a collecting area"; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#createElementComposite(java.lang.Object, org.eclipse.swt.events.SelectionListener, org.eclipse.swt.graphics.Color) - */ - @Override - protected void createElementComposite(NamedArea element, SelectionListener removeListener, Color backgroundColor) { - formFactory.createNamedAreaFieldController(this, element, removeListener); - } - } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitDetailsWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitDetailsWizardPage.java deleted file mode 100644 index 40c3e3ea5..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitDetailsWizardPage.java +++ /dev/null @@ -1,63 +0,0 @@ -// $Id$ -/** - * Copyright (C) 2013 EDIT - * European Distributed Institute of Taxonomy - * http://www.e-taxonomy.eu - * - * The contents of this file are subject to the Mozilla Public License Version 1.1 - * See LICENSE.TXT at the top of this package for the full license terms. - */ -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.DerivedUnitDetailsElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 02.09.2013 - * - */ -public class DerivedUnitDetailsWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public DerivedUnitDetailsWizardPage(CdmFormFactory formFactory, ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Derived Unit Details"); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete - * () - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement - * (eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - DerivedUnitDetailsElementController detailElement = formFactory.createDerivedUnitDetailsElementController(rootElement); - detailElement.setEntity(getEntity()); - checkComplete(); - return detailElement; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailsWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailsWizardPage.java deleted file mode 100644 index b327ee373..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailsWizardPage.java +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ - -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationDetailsElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author n.hoffmann - * @created Dec 15, 2010 - * @version 1.0 - */ -public class FieldObservationDetailsWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public FieldObservationDetailsWizardPage(CdmFormFactory formFactory, - ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Field Observation Details"); - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete() - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - FieldObservationDetailsElementController detailElement = formFactory.createFieldObservationDetailsElementController(rootElement); - detailElement.setEntity(getEntity()); - return detailElement; - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationGeneralWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationGeneralWizardPage.java deleted file mode 100644 index 271c4fb63..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationGeneralWizardPage.java +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ - -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationGeneralElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author n.hoffmann - * @created Dec 17, 2010 - * @version 1.0 - */ -public class FieldObservationGeneralWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public FieldObservationGeneralWizardPage(CdmFormFactory formFactory, - ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Field Observation"); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete() - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - FieldObservationGeneralElementController detailElement = formFactory.createFieldObservationGeneralElementControllerWizard(rootElement); - detailElement.setEntity(getEntity()); - checkComplete(); - return detailElement; - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailsWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailsWizardPage.java deleted file mode 100644 index 536f82b3e..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailsWizardPage.java +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ - -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.GatheringEventDetailsElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author n.hoffmann - * @created Dec 15, 2010 - * @version 1.0 - */ -public class GatheringEventDetailsWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public GatheringEventDetailsWizardPage(CdmFormFactory formFactory, - ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Gathering Event Details"); - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete() - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - GatheringEventDetailsElementController detailElement = formFactory.createGatheringEventDetailsElementController(rootElement); - detailElement.setEntity(getEntity()); - return detailElement; - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenDetailsWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenDetailsWizardPage.java deleted file mode 100644 index 1dcd7c7cc..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenDetailsWizardPage.java +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.specimen.SpecimenDetailsElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 30.08.2013 - * - */ -public class SpecimenDetailsWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public SpecimenDetailsWizardPage(CdmFormFactory formFactory, - ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Specimen Details"); - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete() - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - SpecimenDetailsElementController detailElement = formFactory.createSpecimenDetailsElementController(rootElement); - detailElement.setEntity(getEntity()); - return detailElement; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenGeneralWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenGeneralWizardPage.java deleted file mode 100644 index c33b78420..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenGeneralWizardPage.java +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 EDIT -* European Distributed Institute of Taxonomy -* http://www.e-taxonomy.eu -* -* The contents of this file are subject to the Mozilla Public License Version 1.1 -* See LICENSE.TXT at the top of this package for the full license terms. -*/ -package eu.etaxonomy.taxeditor.ui.section.occurrence; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.campanula.detailViews.fieldObservation.FieldObservationGeneralElementController; -import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 02.09.2013 - * - */ -public class SpecimenGeneralWizardPage extends AbstractCdmEntityWizardPage { - - /** - * @param formFactory - * @param conversation - * @param entity - */ - public SpecimenGeneralWizardPage(CdmFormFactory formFactory, - ConversationHolder conversation, DerivedUnitFacade entity) { - super(formFactory, conversation, entity); - setTitle("Specimen"); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete() - */ - @Override - protected void checkComplete() { - setPageComplete(true); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement) - */ - @Override - public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) { - FieldObservationGeneralElementController detailElement = formFactory.createSpecimenGeneralElementControllerWizard(rootElement); - detailElement.setEntity(getEntity()); - checkComplete(); - return detailElement; - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java similarity index 97% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java index e9c8ad128..4f16e00c4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch; +package eu.etaxonomy.taxeditor.view.derivateSearch; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.graphics.Image; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java similarity index 97% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchComposite.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java index 090a1d089..d13693b78 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch; +package eu.etaxonomy.taxeditor.view.derivateSearch; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java similarity index 98% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java index 03c09b4f4..a928adeb0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchCompositeController.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch; +package eu.etaxonomy.taxeditor.view.derivateSearch; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java similarity index 96% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java index 0f637afa7..fb26f2d74 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.derivatesearch; +package eu.etaxonomy.taxeditor.view.derivateSearch; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.ViewPart; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java similarity index 98% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchComposite.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java index 0680214ca..2b8911c8f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.specimenSearch; +package eu.etaxonomy.taxeditor.view.specimenSearch; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java similarity index 77% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchController.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java index 295bc26a9..b7a44cfe4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/specimenSearch/SpecimenSearchController.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchController.java @@ -7,7 +7,7 @@ * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.ui.campanula.specimenSearch; +package eu.etaxonomy.taxeditor.view.specimenSearch; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -40,7 +40,7 @@ public class SpecimenSearchController { /** * Returns the taxon name entered in the search view * @return the taxon name as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getTextTaxonName() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextTaxonName() */ public String getTaxonName() { return specimenSearchComposite.getTextTaxonName().getText(); @@ -49,7 +49,7 @@ public class SpecimenSearchController { /** * Returns the collector entered in the search view * @return the collector as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getTextCollector() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextCollector() */ public String getCollector() { return specimenSearchComposite.getTextCollector().getText(); @@ -58,7 +58,7 @@ public class SpecimenSearchController { /** * Returns the collecting number entered in the search view * @return the collecting as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getTextCollectorNumber() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextCollectorNumber() */ public String getCollectorNumber() { return specimenSearchComposite.getTextCollectorNumber().getText(); @@ -67,7 +67,7 @@ public class SpecimenSearchController { /** * Returns the accession number entered in the search view * @return the accession number as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getTextAccessionNumber() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextAccessionNumber() */ public String getAccessionNumber() { return specimenSearchComposite.getTextAccessionNumber().getText(); @@ -76,7 +76,7 @@ public class SpecimenSearchController { /** * Returns the herbarium entered in the search view * @return the herbarium as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getComboHerbarium() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getComboHerbarium() */ public String getHerbarium() { return specimenSearchComposite.getTextHerbarium().getText(); @@ -86,7 +86,7 @@ public class SpecimenSearchController { /** * Returns the country entered in the search view * @return the country as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getComboCountry() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getComboCountry() */ public String getCountry() { return specimenSearchComposite.getTextCountry().getText(); @@ -96,7 +96,7 @@ public class SpecimenSearchController { /** * Returns the locality entered in the search view * @return the locality as a {@link String} - * @see eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchComposite#getTextLocality() + * @see eu.etaxonomy.taxeditor.view.specimenSearch.SpecimenSearchComposite#getTextLocality() */ public String getLocality() { return specimenSearchComposite.getTextLocality().getText();