Project

General

Profile

« Previous | Next » 

Revision d2d8e95d

Added by Cherian Mathew almost 11 years ago

refactored NumberWithLabelElement to a single constructor with java.lang.Number as argument

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
642 642
	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement}
643 643
	 *         object.
644 644
	 */
645
	public NumberWithLabelElement createIntegerTextWithLabelElement(
645
	public NumberWithLabelElement createNumberTextWithLabelElement(
646 646
			ICdmFormElement parentElement, String labelString,
647
			Integer initialInteger, int style) {
647
			Number initialNumber, int style) {
648 648
		NumberWithLabelElement element = new NumberWithLabelElement(this,
649
				parentElement, labelString, initialInteger, style);
649
				parentElement, labelString, initialNumber, style);
650 650
		adapt(element);
651 651
		parentElement.addElement(element);
652 652
		return element;
653 653
	}
654 654

  
655
	/**
656
	 * <p>
657
	 * createFloatTextWithLabelElement
658
	 * </p>
659
	 * 
660
	 * @param parentElement
661
	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
662
	 *            object.
663
	 * @param labelString
664
	 *            a {@link java.lang.String} object.
665
	 * @param initialFloat
666
	 *            a float.
667
	 * @param style
668
	 *            a int.
669
	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement}
670
	 *         object.
671
	 */
672
	public NumberWithLabelElement createFloatTextWithLabelElement(
673
			ICdmFormElement parentElement, String labelString,
674
			float initialFloat, int style) {
675
		NumberWithLabelElement element = new NumberWithLabelElement(this,
676
				parentElement, labelString, initialFloat, style);
677
		adapt(element);
678
		parentElement.addElement(element);
679
		return element;
680
	}
681 655

  
682 656
	/**
683 657
	 * <p>
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
37 37
	 * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
38 38
	 * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
39 39
	 * @param labelString a {@link java.lang.String} object.
40
	 * @param initialInteger a {@link java.lang.Integer} object.
40
	 * @param initialNumber a {@link java.lang.Number} object.
41 41
	 * @param style a int.
42 42
	 */
43 43
	public NumberWithLabelElement(CdmFormFactory toolkit,
44 44
			ICdmFormElement parentElement, String labelString,
45
			Integer initialInteger, int style) {
45
			Number initialNumber, int style) {
46 46
		super(toolkit, parentElement, labelString, null, null, style);
47
		setInteger(initialInteger);
47
		setNumber(initialNumber);
48 48
	}
49 49
	
50
	/**
51
	 * <p>Constructor for NumberWithLabelElement.</p>
52
	 *
53
	 * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
54
	 * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
55
	 * @param labelString a {@link java.lang.String} object.
56
	 * @param initialFloat a {@link java.lang.Float} object.
57
	 * @param style a int.
58
	 */
59
	public NumberWithLabelElement(CdmFormFactory toolkit,
60
			ICdmFormElement parentElement, String labelString,
61
			Float initialFloat, int style) {
62
		super(toolkit, parentElement, labelString, null, null, style);
63
		setFloat(initialFloat);
64
	}
65
	
66
	/**
67
	 * <p>setInteger</p>
68
	 *
69
	 * @param number a {@link java.lang.Integer} object.
70
	 */
71
	public void setInteger(Integer number) {
72
		super.setText(getStringRepresentation(number));
73
	}
74 50
	
75 51
	/**
76
	 * <p>setFloat</p>
52
	 * <p>setNumber</p>
77 53
	 *
78
	 * @param number a {@link java.lang.Float} object.
54
	 * @param number a {@link java.lang.Number} object.
79 55
	 */
80
	public void setFloat(Float number) {
56
	public void setNumber(Number number) {
81 57
		super.setText(getStringRepresentation(number));
82 58
	}
83 59
	
......
101 77
		return new Float(text);
102 78
	}
103 79
	
80
	/**
81
	 * <p>getDouble</p>
82
	 *
83
	 * @return a {@link java.lang.Float} object.
84
	 */
85
	public Float getDouble(){
86
		String text = super.getText();
87
		return new Float(text);
88
	}
89
	
104 90
	private String getStringRepresentation(Object number){
105 91
		if(number != null){
106 92
			return number.toString();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
49 49
		label = formFactory.createLabel(getLayoutComposite(), labelString);
50 50
		addControl(label);
51 51
		
52
		number_year = formFactory.createIntegerTextWithLabelElement(this, "Year", null, style);
52
		number_year = formFactory.createNumberTextWithLabelElement(this, "Year", null, style);
53 53
		number_year.setLimits(4, -9999, 9999);
54 54
		
55
		number_month = formFactory.createIntegerTextWithLabelElement(this, "Month", null, style);		
55
		number_month = formFactory.createNumberTextWithLabelElement(this, "Month", null, style);		
56 56
		number_month.setLimits(2, 1, 12);
57 57
		
58
		number_day = formFactory.createIntegerTextWithLabelElement(this, "Day", null, style);
58
		number_day = formFactory.createNumberTextWithLabelElement(this, "Day", null, style);
59 59
		number_day.setLimits(2, 1, 31);
60 60
		
61 61
		
......
71 71
		this.partial = partial;
72 72
		
73 73
		if(partial != null){
74
			number_day.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.DAY_TYPE));
75
			number_month.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.MONTH_TYPE));
76
			number_year.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.YEAR_TYPE));
74
			number_day.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.DAY_TYPE));
75
			number_month.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.MONTH_TYPE));
76
			number_year.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.YEAR_TYPE));
77 77
		}
78 78
	}
79 79

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
74 74
		text_longitudeParsed = formFactory.createTextWithLabelElement(
75 75
				formElement, "", null, style);
76 76
		text_longitudeParsed.setEnabled(false);
77
		number_errorRadius = formFactory.createIntegerTextWithLabelElement(
77
		number_errorRadius = formFactory.createNumberTextWithLabelElement(
78 78
				formElement, "Error Radius (m)", null, style);
79 79
		combo_referenceSystem = formFactory
80 80
				.createTermComboElement(ReferenceSystem.class,
......
179 179
			text_latitudeParsed.setText(latitude);
180 180
			text_longitude.setText(longitude);
181 181
			text_longitudeParsed.setText(longitude);
182
			number_errorRadius.setInteger(point.getErrorRadius());
182
			number_errorRadius.setNumber(point.getErrorRadius());
183 183
			combo_referenceSystem.setSelection(point.getReferenceSystem());
184 184
		}
185 185
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
57 57
	@Override
58 58
	public void setEntity(StatisticalMeasurementValue entity) {
59 59
		this.entity = entity;
60
		number_value.setFloat(entity.getValue());
60
		number_value.setNumber(entity.getValue());
61 61
		combo_type.setSelection(entity.getType());
62 62
		section_modifiers.setEntity(entity);
63 63
	}
......
65 65
	/** {@inheritDoc} */
66 66
	@Override
67 67
	public void createControls(ICdmFormElement element, int style) {
68
		number_value = formFactory.createFloatTextWithLabelElement(element, "Value", 0, style);
68
		number_value = formFactory.createNumberTextWithLabelElement(element, "Value", 0, style);
69 69
		combo_type = formFactory.createTermComboElement(StatisticalMeasure.class, element, "Statistical Measure", null, style);
70 70
		section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE);
71 71
		section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
43 43
			PolytomousKeyNode entity, int style) {
44 44
		if (!entity.isLeaf()) {
45 45
			NumberWithLabelElement number_nodeNumber = formFactory
46
					.createIntegerTextWithLabelElement(formElement,
46
					.createNumberTextWithLabelElement(formElement,
47 47
							"Node Number", entity.getNodeNumber(), style);
48 48
			number_nodeNumber.setEnabled(false);
49 49
		}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
72 72
	public void createControls(ICdmFormElement formElement, int style) {
73 73
		super.createControls(formElement, style);
74 74
		
75
		text_height = formFactory.createIntegerTextWithLabelElement(formElement, "Height", null, style);
75
		text_height = formFactory.createNumberTextWithLabelElement(formElement, "Height", null, style);
76 76
		text_height.setEnabled(false);
77
		text_width = formFactory.createIntegerTextWithLabelElement(formElement, "Width", null, style);
77
		text_width = formFactory.createNumberTextWithLabelElement(formElement, "Width", null, style);
78 78
		text_width.setEnabled(false);
79 79
		element_image = formFactory.createImageElement(formElement, null, style);
80 80
		element_keyValue = formFactory.createKeyValueViewerElement(formElement, "Key", "Value", null);
......
84 84
	@Override
85 85
	public void setEntity(ImageFile entity) {
86 86
		super.setEntity(entity);
87
		text_height.setInteger(entity.getHeight());
88
		text_width.setInteger(entity.getWidth());
87
		text_height.setNumber(entity.getHeight());
88
		text_width.setNumber(entity.getWidth());
89 89
		try {
90 90
			loadImage(entity.getUri(), false);		
91 91
		} catch (Exception e) {
......
113 113
			// But then, I don't think we will handle such large files in the near future
114 114
			getEntity().setSize((int) imageInfo.getLength());
115 115
			
116
			text_height.setInteger(imageInfo.getHeight());
116
			text_height.setNumber(imageInfo.getHeight());
117 117
			getEntity().setHeight(imageInfo.getHeight());
118 118
				
119
			text_width.setInteger(imageInfo.getWidth());
119
			text_width.setNumber(imageInfo.getWidth());
120 120
			getEntity().setWidth(imageInfo.getWidth());
121 121
		}
122 122
		
......
152 152
	protected void handleException(Exception e) {
153 153
		super.handleException(e);
154 154
		element_image.unloadImage(postRunnable);
155
		text_height.setInteger(0);
156
		text_width.setInteger(0);
155
		text_height.setNumber(0);
156
		text_width.setNumber(0);
157 157
		
158 158
		element_image.loadImage(new Runnable(){
159 159
			public void run() {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java
61 61
	@Override
62 62
	public void createControls(ICdmFormElement element, int style) {
63 63
		text_uri = formFactory.createTextWithLabelElement(element, "URI", null, style);
64
		text_size = formFactory.createIntegerTextWithLabelElement(element, "Size", null, style);
64
		text_size = formFactory.createNumberTextWithLabelElement(element, "Size", null, style);
65 65
		text_size.setEnabled(false);
66 66
		
67 67
		element_messages = formFactory.createLabel(element, "");
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
141 141
	private void createZoologicalNameParts(ICdmFormElement formElement, NonViralName nonViralName, int style){
142 142
		ZoologicalName zoologicalName = (ZoologicalName) nonViralName;
143 143
		text_breed = formFactory.createTextWithLabelElement(formElement, "Breed", zoologicalName.getBreed(), style);
144
		text_publicationYear = formFactory.createIntegerTextWithLabelElement(formElement, "Publication Year", zoologicalName.getPublicationYear(), style);
145
		text_originalPublicationYear = formFactory.createIntegerTextWithLabelElement(formElement, "Orig. Publication Year", zoologicalName.getOriginalPublicationYear(), style);
144
		text_publicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Publication Year", zoologicalName.getPublicationYear(), style);
145
		text_originalPublicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Orig. Publication Year", zoologicalName.getOriginalPublicationYear(), style);
146 146
	}
147 147
	
148 148
	private void createGenusOrUninomialControls(ICdmFormElement element, NonViralName nonViralName, int style){		
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
64 64
//		text_fieldObjectDefinition = formFactory.createTextWithLabelElement(formElement, "Field Object Definition", entity.getFieldObjectDefinition(CdmStore.getDefaultLanguage()), style);
65 65
		text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
66 66
		
67
		number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
67
		number_individualCount = formFactory.createNumberTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
68 68
		//FIXME:3.3MC
69 69
		combo_lifeStage = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Life Stage", entity.getLifeStage(), style);
70 70
		combo_sex = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Sex", entity.getSex(), style);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
74 74
			DerivedUnitFacade entity, int style) {
75 75
		// collectingArea
76 76
		number_absoluteElevationError = formFactory
77
				.createIntegerTextWithLabelElement(formElement,
77
				.createNumberTextWithLabelElement(formElement,
78 78
						"Elevation Error", entity.getAbsoluteElevationError(),
79 79
						style);
80 80
		number_absoluteElevationMinimum = formFactory
81
				.createIntegerTextWithLabelElement(formElement,
81
				.createNumberTextWithLabelElement(formElement,
82 82
						"Elevation Minimum (m)",
83 83
						entity.getAbsoluteElevationMinimum(), style);
84 84
		number_absoluteElevationMaximum = formFactory
85
				.createIntegerTextWithLabelElement(formElement,
85
				.createNumberTextWithLabelElement(formElement,
86 86
						"Elevation Maximum (m)",
87 87
						entity.getAbsoluteElevationMaximum(), style);
88 88

  
......
91 91
				style);
92 92
		//FIXME:3.3MC
93 93
		number_distanceToGround = formFactory
94
				.createIntegerTextWithLabelElement(formElement,
94
				.createNumberTextWithLabelElement(formElement,
95 95
						"Distance To Ground (m)", entity.getDistanceToGround(),
96 96
						style);
97 97
		number_distanceToWaterSurface = formFactory
98
				.createIntegerTextWithLabelElement(formElement,
98
				.createNumberTextWithLabelElement(formElement,
99 99
						"Distance To Water Surface (m)",
100 100
						entity.getDistanceToWaterSurface(), style);
101 101
		// exactLocation
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
77 77
						entity.getLocality(), style);		
78 78
		element_point = formFactory.createPointElement(formElement,
79 79
				entity.getExactLocation(), style);
80
		number_elevation = formFactory.createIntegerTextWithLabelElement(
80
		number_elevation = formFactory.createNumberTextWithLabelElement(
81 81
				formElement, "Absolute Elevation (m)",
82 82
				entity.getAbsoluteElevation(), style);
83 83
		element_date = formFactory.createTimePeriodElement(formElement, "Date",

Also available in: Unified diff