Subversion Repositories SmartDukaan

Rev

Rev 1061 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1061 Rev 3314
Line 153... Line 153...
153
	 * 
153
	 * 
154
	 * @return String Display-able text
154
	 * @return String Display-able text
155
	 */
155
	 */
156
	public String displayText() {
156
	public String displayText() {
157
		String displayText = "";
157
		String displayText = "";
-
 
158
		boolean contentAvailable = true;
158
		
159
		
159
		// Enumerated
160
		// Enumerated
160
		if(this.isEnumerated()) {
161
		if(this.isEnumerated()) {
161
			displayText = 
162
			displayText = 
162
				this.getExpandedEnumDataObject().getEnumValue().getValue();
163
				this.getExpandedEnumDataObject().getEnumValue().getValue();
Line 176... Line 177...
176
			for(int i=0;i<primitivedataobjects.size();i++) {
177
			for(int i=0;i<primitivedataobjects.size();i++) {
177
				PrimitiveDataObject primitivedataobject = 
178
				PrimitiveDataObject primitivedataobject = 
178
					primitivedataobjects.get(i);
179
					primitivedataobjects.get(i);
179
				
180
				
180
				displayText += primitivedataobject.getValue();
181
				displayText += primitivedataobject.getValue();
-
 
182
 
-
 
183
				if(primitivedataobject.getValue().trim().equals("-1")){
-
 
184
					contentAvailable = contentAvailable && false;	
-
 
185
				}
181
				
186
				
182
				if(i != (primitivedataobjects.size() - 1)) {
187
				if(i != (primitivedataobjects.size() - 1)) {
183
					displayText += separator;
188
					displayText += separator;
184
				}
189
				}
185
			}
190
			}
Line 191... Line 196...
191
		
196
		
192
		// Primitive
197
		// Primitive
193
		else {
198
		else {
194
			displayText += ((PrimitiveDataObject)this.getDataObject()
199
			displayText += ((PrimitiveDataObject)this.getDataObject()
195
					).getValue();
200
					).getValue();
-
 
201
 
-
 
202
			if(((PrimitiveDataObject)this.getDataObject()).getValue().trim().equals("-1")){
-
 
203
				contentAvailable = contentAvailable && false;	
196
			
204
			}
-
 
205
 
197
            if (this.getUnit() != null) {
206
            if (this.getUnit() != null) {
198
				displayText += " " + this.getUnit().getShortForm();
207
				displayText += " " + this.getUnit().getShortForm();
199
            }
208
            }
200
		}
209
		}
-
 
210
 
-
 
211
		if(!contentAvailable){
-
 
212
			displayText = "Not available";
201
		
213
		}
-
 
214
 
202
		return displayText;
215
		return displayText;
203
	}
216
	}
204
 
217
 
205
 
218
 
206
	/**
219
	/**