From: Patric Plitzner Date: Fri, 2 Aug 2013 07:43:11 +0000 (+0000) Subject: - changed layout so that two colums are used for label and text field X-Git-Tag: 3.6.0~841^2~148 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a223e56b6cc77e7418cad90411a3d7f178242778 - changed layout so that two colums are used for label and text field --- diff --git a/.gitattributes b/.gitattributes index 2855efc25..2ad3e435a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1261,8 +1261,11 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/Abs eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractEntityCollectionElementComposite.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmElementFactory.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmPropertyChangeEvent.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmTextField.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java -text @@ -1283,13 +1286,11 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/Lan eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LayoutConstants.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RootElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelComposite.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java -text diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmElementFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmElementFactory.java new file mode 100644 index 000000000..d30d716f5 --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmElementFactory.java @@ -0,0 +1,31 @@ +package eu.etaxonomy.taxeditor.ui.element; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.forms.widgets.FormToolkit; + +public final class CdmElementFactory { + /** + * @wbp.factory + * @wbp.factory.parameter.source formFactory formFactory + * @wbp.factory.parameter.source parentFormElement (eu.etaxonomy.taxeditor.ui.element.ICdmFormElement) null + * @wbp.factory.parameter.source initialInteger (java.lang.Integer) null + * @wbp.factory.parameter.source style 0 + */ + public static CdmNumberField createCdmNumberField(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, Integer initialInteger, int style) { + CdmNumberField cdmNumberField = new CdmNumberField(parent, formFactory, parentFormElement, initialInteger, style); + return cdmNumberField; + } + + /** + * @param gatheringEventDetailElementComposite + * @param formFactory + * @param gatheringEventDetailElementComposite2 + * @param string + * @param integer + * @param i + * @return + */ + public static CdmTextField createCdmTextField(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, String initialText, Integer textHeight, int style) { + CdmTextField cdmNumberField = new CdmTextField(parent, formFactory, parentFormElement, initialText, textHeight, style); + return cdmNumberField; + } +} \ No newline at end of file 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 62d0740e4..6f0e6262d 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 @@ -2285,41 +2285,4 @@ public class CdmFormFactory extends FormToolkit { return text; } - /** - * @param formFactory - * @param parentElement - * @param element - */ - private static void addAndAdapt(FormToolkit formFactory, ICdmFormElement parentElement, TextWithLabelComposite element) { - if(formFactory instanceof CdmFormFactory){ - ((CdmFormFactory) formFactory).adapt(element); - parentElement.addElement(element); - } - } - /** - * @wbp.factory - * @wbp.factory.parameter.source formFactory formFactory - * @wbp.factory.parameter.source parentFormElement parentFormElement - * @wbp.factory.parameter.source labelString "Elevation Minimum (m)" - * @wbp.factory.parameter.source initialText (java.lang.String) null - * @wbp.factory.parameter.source textHeight (java.lang.Integer) null - * @wbp.factory.parameter.source style 0 - */ - public static TextWithLabelComposite createTextWithLabelComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, String labelString, String initialText, Integer textHeight, int style) { - TextWithLabelComposite textWithLabelComposite = new TextWithLabelComposite(parent, formFactory, parentFormElement, labelString, initialText, textHeight, style); -// addAndAdapt(formFactory, parentFormElement, textWithLabelComposite); - return textWithLabelComposite; - } - /** - * @wbp.factory - * @wbp.factory.parameter.source formFactory getFormFactory() - * @wbp.factory.parameter.source parentElement parentFormElement - * @wbp.factory.parameter.source labelString "Elevation Minimum (m)" - * @wbp.factory.parameter.source initialFloat new java.lang.Float(0) - * @wbp.factory.parameter.source style org.eclipse.swt.SWT.NONE - */ - public static NumberWithLabelElementComposite createNumberWithLabelElementComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentElement, String labelString, Float initialFloat, int style) { - NumberWithLabelElementComposite numberWithLabelElementComposite = new NumberWithLabelElementComposite(parent, formFactory, parentElement, labelString, initialFloat, style); - return numberWithLabelElementComposite; - } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java similarity index 87% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java index a80e02be7..890ad088f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java @@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.common.CdmUtils; /** * @author pplitzner - * @date 31.07.2013 + * @date 01.08.2013 * */ -public class NumberWithLabelElementComposite extends TextWithLabelComposite{ +public class CdmNumberField extends CdmTextField { private Float start; private Float end; @@ -38,9 +38,8 @@ public class NumberWithLabelElementComposite extends TextWithLabelComposite{ * @param initialInteger a {@link java.lang.Integer} object. * @param style a int. */ - public NumberWithLabelElementComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, - String labelString, Integer initialInteger, int style){ - this(parent, formFactory, parentFormElement, labelString, new Float(initialInteger), style); + public CdmNumberField(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, Integer initialInteger, int style){ + this(parent, formFactory, parentFormElement, new Float(initialInteger==null?0:initialInteger), style); } /** @@ -53,10 +52,13 @@ public class NumberWithLabelElementComposite extends TextWithLabelComposite{ * @param style a int. * @wbp.parser.constructor */ - public NumberWithLabelElementComposite(Composite parent, FormToolkit formFactory, - ICdmFormElement parentElement, String labelString, - Float initialFloat, int style) { - super(parent, formFactory, parentElement, labelString, null, null, style); + public CdmNumberField(Composite parent, FormToolkit formFactory, + ICdmFormElement parentElement, Float initialFloat, int style) { + super(parent, formFactory, parentElement, null, null, style); + //WindowBuilder exception handling + if(initialFloat==null){ + initialFloat = 0f; + } setFloat(initialFloat); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmTextField.java similarity index 81% rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelComposite.java rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmTextField.java index e2a7ba50a..9573cb118 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmTextField.java @@ -17,7 +17,6 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -29,13 +28,12 @@ import eu.etaxonomy.taxeditor.preference.Resources; /** * @author pplitzner - * @date 23.07.2013 + * @date 01.08.2013 * */ -public class TextWithLabelComposite extends AbstractCdmFormElementComposite implements ModifyListener, IEnableableFormElement, ISelectable { +public class CdmTextField extends AbstractCdmFormElementComposite implements ModifyListener, IEnableableFormElement, ISelectable{ protected Text text; - private final Label label; /** Constant MAX_HEIGHT=0 */ public static final int MAX_HEIGHT = 0; @@ -43,11 +41,13 @@ public class TextWithLabelComposite extends AbstractCdmFormElementComposite impl public static final int SINGLE = -1; /** - * - * + * Create the composite. + * @param parent + * @param style + * @param initialText + * @param textHeight */ - public TextWithLabelComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, String labelString, - String initialText, Integer textHeight, int style) { + public CdmTextField(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, String initialText, Integer textHeight, int style) { super(parent, formFactory, parentFormElement, style); setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); @@ -65,17 +65,9 @@ public class TextWithLabelComposite extends AbstractCdmFormElementComposite impl } //^^^^^^^^^^^^^^ - label = new Label(this, SWT.NONE); - TableWrapData twd_lblNewLabel = new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP); - twd_lblNewLabel.grabHorizontal = true; - twd_lblNewLabel.align = TableWrapData.LEFT; - label.setLayoutData(twd_lblNewLabel); - label.setText(labelString); - text = new Text(this, SWT.NONE); - TableWrapData twd_text_1 = new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP); - twd_text_1.align = TableWrapData.RIGHT; - twd_text_1.grabHorizontal = false; + TableWrapData twd_text_1 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP); + twd_text_1.grabHorizontal = true; text.setText(initialText); text.setLayoutData(twd_text_1); @@ -93,7 +85,7 @@ public class TextWithLabelComposite extends AbstractCdmFormElementComposite impl // traverse is not working for wrapped text widgets so // we reintroduce it here e.doit = false; - TextWithLabelComposite.this.text.traverse(SWT.TRAVERSE_TAB_NEXT); + CdmTextField.this.text.traverse(SWT.TRAVERSE_TAB_NEXT); } } }); @@ -108,10 +100,14 @@ public class TextWithLabelComposite extends AbstractCdmFormElementComposite impl text.addModifyListener(this); - addControl(label); addControl(text); + } + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } /** * Get the text of this composites text composite @@ -172,15 +168,6 @@ public class TextWithLabelComposite extends AbstractCdmFormElementComposite impl text.setBackground(color); } - /** {@inheritDoc} */ - @Override - public void setBackground(Color color) { - super.setBackground(color); - if (label != null) { - label.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/section/AbstractCdmDetailElementComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElementComposite.java index de28154cf..cc73e6080 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElementComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElementComposite.java @@ -15,6 +15,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.wb.swt.SWTResourceManager; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; @@ -53,6 +54,7 @@ public abstract class AbstractCdmDetailElementComposite extends AbstractCdmFo */ public AbstractCdmDetailElementComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, int style) { super(parent, formFactory, parentFormElement, style); + setBackground(SWTResourceManager.getColor(SWT.COLOR_WHITE)); // register as property change listener if(formFactory instanceof CdmFormFactory){ ((CdmFormFactory) formFactory).addPropertyChangeListener(this); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElementComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElementComposite.java index d5c3262ac..44aff0cbd 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElementComposite.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElementComposite.java @@ -11,17 +11,17 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; +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 eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.preference.Resources; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; +import eu.etaxonomy.taxeditor.ui.element.CdmElementFactory; +import eu.etaxonomy.taxeditor.ui.element.CdmNumberField; +import eu.etaxonomy.taxeditor.ui.element.CdmTextField; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElementComposite; -import eu.etaxonomy.taxeditor.ui.element.TextWithLabelComposite; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElementComposite; /** @@ -33,14 +33,14 @@ public class GatheringEventDetailElementComposite extends AbstractCdmDetailEleme + private final CdmNumberField absoluteElevationError; + private final CdmNumberField number_absoluteElevationMinimum; + private final CdmNumberField number_absoluteElevationMaximum; + private final CdmTextField collectingMethod; + private final CdmNumberField number_distanceToGround; + private final CdmNumberField number_distanceToWaterSurface; + private final CdmTextField gatheringEventDescription; // private CollectingAreasDetailSection section_collectingAreas; - private final NumberWithLabelElementComposite absoluteElevationError; - private final NumberWithLabelElementComposite number_absoluteElevationMinimum; - private final NumberWithLabelElementComposite number_absoluteElevationMaximum; - private final TextWithLabelComposite collectingMethod; - private final NumberWithLabelElementComposite number_distanceToGround; - private final NumberWithLabelElementComposite number_distanceToWaterSurface; - private final TextWithLabelComposite gatheringEventDescription; /** *

@@ -56,48 +56,86 @@ public class GatheringEventDetailElementComposite extends AbstractCdmDetailEleme */ public GatheringEventDetailElementComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, int style) { super(parent, formFactory, parentFormElement, style); - TableWrapLayout tableWrapLayout = (TableWrapLayout) getLayout(); - tableWrapLayout.numColumns = 1; - - absoluteElevationError = CdmFormFactory.createNumberWithLabelElementComposite(this, getFormFactory(), this, "Elevation Error", new Float(0), SWT.NONE); - TableWrapData twd_absoluteElevationError = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_absoluteElevationError.grabHorizontal = true; - absoluteElevationError.setLayoutData(twd_absoluteElevationError); - getFormFactory().adapt(absoluteElevationError); - getFormFactory().paintBordersFor(absoluteElevationError); - - number_absoluteElevationMinimum = CdmFormFactory.createNumberWithLabelElementComposite(this, getFormFactory(), this, "Elevation Minimum (m)", new Float(0), SWT.NONE); - TableWrapData twd_number_absoluteElevationMinimum = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_number_absoluteElevationMinimum.grabHorizontal = true; - number_absoluteElevationMinimum.setLayoutData(twd_number_absoluteElevationMinimum); + + Label lblNewLabel_4 = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel_4, true, true); + lblNewLabel_4.setText("Elevation Error"); + + absoluteElevationError = CdmElementFactory.createCdmNumberField(this, formFactory, this, (Integer) null, 0); + ((TableWrapData) absoluteElevationError.getMainControl().getLayoutData()).grabVertical = false; + TableWrapData twd_cdmNumberField = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmNumberField.grabHorizontal = true; + absoluteElevationError.setLayoutData(twd_cdmNumberField); + formFactory.adapt(absoluteElevationError); + formFactory.paintBordersFor(absoluteElevationError); + + Label lblNewLabel_3 = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel_3, true, true); + lblNewLabel_3.setText("Elevation Error Minumum (m)"); + + number_absoluteElevationMinimum = CdmElementFactory.createCdmNumberField(this, formFactory, this, (Integer) null, 0); + TableWrapData tableWrapData = (TableWrapData) number_absoluteElevationMinimum.getMainControl().getLayoutData(); + tableWrapData.valign = TableWrapData.TOP; + tableWrapData.grabVertical = false; + TableWrapData twd_cdmNumberField_1 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmNumberField_1.grabHorizontal = true; + number_absoluteElevationMinimum.setLayoutData(twd_cdmNumberField_1); formFactory.paintBordersFor(number_absoluteElevationMinimum); - number_absoluteElevationMaximum = CdmFormFactory.createNumberWithLabelElementComposite(this, getFormFactory(), parentFormElement, "Elevation Maximum (m)", new Float(0), SWT.NONE); - TableWrapData twd_numberWithLabelElementComposite = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_numberWithLabelElementComposite.grabVertical = true; - twd_numberWithLabelElementComposite.grabHorizontal = true; - number_absoluteElevationMaximum.setLayoutData(twd_numberWithLabelElementComposite); - formFactory.paintBordersFor(number_absoluteElevationMaximum); + Label lblNewLabel_2 = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel_2, true, true); + lblNewLabel_2.setText("Elevation Maximum (m)"); - collectingMethod = CdmFormFactory.createTextWithLabelComposite(this, getFormFactory(), this, "Collecting Method", "", (Integer) null, SWT.NONE); - TableWrapData twd_collectingMethod = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_collectingMethod.grabHorizontal = true; - collectingMethod.setLayoutData(twd_collectingMethod); - getFormFactory().adapt(collectingMethod); - getFormFactory().paintBordersFor(collectingMethod); + number_absoluteElevationMaximum = CdmElementFactory.createCdmNumberField(this, formFactory, this, (Integer) null, 0); + TableWrapData twd_cdmNumberField_2 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmNumberField_2.grabHorizontal = true; + number_absoluteElevationMaximum.setLayoutData(twd_cdmNumberField_2); + formFactory.adapt(number_absoluteElevationMaximum); + formFactory.paintBordersFor(number_absoluteElevationMaximum); - number_distanceToGround = CdmFormFactory.createNumberWithLabelElementComposite(this, getFormFactory(), parentFormElement, "Distance To Ground (m)", new Float(0), SWT.NONE); + Label lblTestLabel = new Label(this, SWT.NONE); + formFactory.adapt(lblTestLabel, true, true); + lblTestLabel.setText("Collecting Method"); + + collectingMethod = CdmElementFactory.createCdmTextField(this, formFactory, this, (String) null, (Integer) null, 0); + TableWrapData twd_cdmTextField_1 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmTextField_1.grabHorizontal = true; + collectingMethod.setLayoutData(twd_cdmTextField_1); + formFactory.adapt(collectingMethod); + formFactory.paintBordersFor(collectingMethod); + + Label lblNewLabel_5 = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel_5, true, true); + lblNewLabel_5.setText("Distance To Ground (m)"); + + number_distanceToGround = CdmElementFactory.createCdmNumberField(this, formFactory, this, (Integer) null, 0); + TableWrapData twd_cdmNumberField_3 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmNumberField_3.grabHorizontal = true; + number_distanceToGround.setLayoutData(twd_cdmNumberField_3); + formFactory.adapt(number_distanceToGround); formFactory.paintBordersFor(number_distanceToGround); - number_distanceToWaterSurface = CdmFormFactory.createNumberWithLabelElementComposite(this, getFormFactory(), parentFormElement, "Distance To Water Surface (m)", new Float(0), SWT.NONE); + Label lblNewLabel_6 = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel_6, true, true); + lblNewLabel_6.setText("Distance To Water Surface"); + + number_distanceToWaterSurface = CdmElementFactory.createCdmNumberField(this, formFactory, this, (Integer) null, 0); + TableWrapData twd_cdmNumberField_4 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmNumberField_4.grabHorizontal = true; + number_distanceToWaterSurface.setLayoutData(twd_cdmNumberField_4); + formFactory.adapt(number_distanceToWaterSurface); formFactory.paintBordersFor(number_distanceToWaterSurface); - gatheringEventDescription = CdmFormFactory.createTextWithLabelComposite(this, getFormFactory(), this, "Gathering Event Description", "", (Integer) null, SWT.NONE); - TableWrapData twd_gatheringEventDescription = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); - twd_gatheringEventDescription.grabHorizontal = true; - gatheringEventDescription.setLayoutData(twd_gatheringEventDescription); - getFormFactory().adapt(gatheringEventDescription); - getFormFactory().paintBordersFor(gatheringEventDescription); + Label lblNewLabel = new Label(this, SWT.NONE); + formFactory.adapt(lblNewLabel, true, true); + lblNewLabel.setText("Gathering Event Description"); + + gatheringEventDescription = CdmElementFactory.createCdmTextField(this, formFactory, this, (String) null, (Integer) null, 0); + TableWrapData twd_cdmTextField_2 = new TableWrapData(TableWrapData.LEFT, TableWrapData.TOP, 1, 1); + twd_cdmTextField_2.grabHorizontal = true; + gatheringEventDescription.setLayoutData(twd_cdmTextField_2); + formFactory.adapt(gatheringEventDescription); + formFactory.paintBordersFor(gatheringEventDescription); } @@ -151,20 +189,14 @@ public class GatheringEventDetailElementComposite extends AbstractCdmDetailEleme number_absoluteElevationMaximum.setBackground(getColor(Resources.COLOR_PARSE_ERROR)); AbstractUtility.warn(getClass(), e.getLocalizedMessage()); } - } else if (eventSource == getCollectingMethod()) { - getEntity().setCollectingMethod(getCollectingMethod().getText()); + } else if (eventSource == collectingMethod) { + getEntity().setCollectingMethod(collectingMethod.getText()); } else if (eventSource == number_distanceToGround) { getEntity().setDistanceToGround(number_distanceToGround.getInteger()); } else if (eventSource == number_distanceToWaterSurface) { getEntity().setDistanceToWaterSurface(number_distanceToWaterSurface.getInteger()); - } else if (eventSource == getGatheringEventDescription()) { - getEntity().setGatheringEventDescription(getGatheringEventDescription().getText()); + } else if (eventSource == gatheringEventDescription) { + getEntity().setGatheringEventDescription(gatheringEventDescription.getText()); } } - public TextWithLabelComposite getGatheringEventDescription() { - return gatheringEventDescription; - } - public TextWithLabelComposite getCollectingMethod() { - return collectingMethod; - } }