5393

pending completion

Build # 5393

Build Type

push

travis-ci

Committed by

djazayeri

Commit Message

Revert "Merge pull request #1908 from mjanuchowski/TRUNK-4925"

This reverts commit 189103f33, reversing
changes made to 30758af93.

Run Details

3 of 3 new or added lines in 1 file covered. (100.0%)

18530 of 32524 relevant lines covered (56.97%)

0.57 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

42.39

/api/src/main/java/org/openmrs/FormField.java

/**
 * This Source Code Form is subject to the terms of the Mozilla Public License,
 * v. 2.0. If a copy of the MPL was not distributed with this file, You can
 * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
 * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
 *
 * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
 * graphic logo is a trademark of OpenMRS Inc.
 */
package org.openmrs;

import java.util.Comparator;

import org.codehaus.jackson.annotate.JsonIgnore;

/**
 * The FormField object relates/orders the <code>fields</code> on a <code>form</code> A form can
 * have many 0 to n fields associated with it in a hierarchical manor. This FormField object governs
 * what/how that takes place
 *
 * @see org.openmrs.Form
 * @see org.openmrs.Field
 */
public class FormField extends BaseOpenmrsMetadata implements java.io.Serializable, Comparable<FormField> {
        
        public static final long serialVersionUID = 3456L;
        
        // Fields
        
        protected Integer formFieldId;
        
        protected FormField parent;
        
        protected Form form;
        
        protected Field field;
        
        protected Integer fieldNumber;
        
        protected String fieldPart;
        
        protected Integer pageNumber;
        
        protected Integer minOccurs;
        
        protected Integer maxOccurs;
        
        protected Boolean required = false;
        
        protected Float sortWeight;
        
        // Constructors
        
        /** default constructor */
        public FormField() {
        }
        
        /** constructor with id */
        public FormField(Integer formFieldId) {
                this.formFieldId = formFieldId;
        }
        
        // Property accessors
        
        /**
         * @return Returns the formFieldId.
         */
        public Integer getFormFieldId() {
                return formFieldId;
        }
        
        /**
         * @param formFieldId The formFieldId to set.
         */
        public void setFormFieldId(Integer formFieldId) {
                this.formFieldId = formFieldId;
        }
        
        /**
         * @return Returns the parent FormField.
         */
        public FormField getParent() {
                return parent;
        }
        
        /**
         * @param parent The formField to set as parent.
         */
        public void setParent(FormField parent) {
                this.parent = parent;
        }
        
        /**
         * @return Returns the form.
         */
        public Form getForm() {
                return form;
        }
        
        /**
         * @param form The form to set.
         */
        public void setForm(Form form) {
                this.form = form;
        }
        
        /**
         * @return Returns the field.
         */
        public Field getField() {
                return field;
        }
        
        /**
         * @param field The field to set.
         */
        public void setField(Field field) {
                this.field = field;
        }
        
        /**
         * @return Returns the fieldNumber.
         */
        public Integer getFieldNumber() {
                return fieldNumber;
        }
        
        /**
         * @param fieldNumber The fieldNumber to set.
         */
        public void setFieldNumber(Integer fieldNumber) {
                this.fieldNumber = fieldNumber;
        }
        
        /**
         * @return Returns the fieldPart.
         */
        public String getFieldPart() {
                return fieldPart;
        }
        
        /**
         * @param fieldPart The fieldPart to set.
         */
        public void setFieldPart(String fieldPart) {
                this.fieldPart = fieldPart;
        }
        
        /**
         * @return Returns the pageNumber.
         */
        public Integer getPageNumber() {
                return pageNumber;
        }
        
        /**
         * @param pageNumber The pageNumber to set.
         */
        public void setPageNumber(Integer pageNumber) {
                this.pageNumber = pageNumber;
        }
        
        /**
         * @return Returns the minOccurs.
         */
        public Integer getMinOccurs() {
                return minOccurs;
        }
        
        /**
         * @param minOccurs The minOccurs to set.
         */
        public void setMinOccurs(Integer minOccurs) {
                this.minOccurs = minOccurs;
        }
        
        /**
         * @return Returns the maxOccurs.
         */
        public Integer getMaxOccurs() {
                return maxOccurs;
        }
        
        /**
         * @param maxOccurs The maxOccurs to set.
         */
        public void setMaxOccurs(Integer maxOccurs) {
                this.maxOccurs = maxOccurs;
        }
        
        /**
         * @return Returns the required status.
         * 
         * @deprecated as of 2.0, use {@link #getRequired()}
         */
        @Deprecated
        @JsonIgnore
        public Boolean isRequired() {
                return getRequired();
        }
        
        /**
         * @return same as isRequired()
         */
        public Boolean getRequired() {
                return required == null ? false : required;
        }
        
        /**
         * @param required The required status to set.
         */
        public void setRequired(Boolean required) {
                this.required = required;
        }
        
        /**
         * @return Returns the sortWeight.
         */
        public Float getSortWeight() {
                return sortWeight;
        }
        
        /**
         * @param sortWeight The weight to order the formFields on.
         */
        public void setSortWeight(Float sortWeight) {
                this.sortWeight = sortWeight;
        }
        
        /**
         * @see java.lang.Object#toString()
         */
        @Override
        public String toString() {
                if (formFieldId == null) {
                        return "null";
                }
                
                return this.formFieldId.toString();
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#getId()
         */
        @Override
        public Integer getId() {
                return getFormFieldId();
        }
        
        /**
         * @since 1.5
         * @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
         */
        @Override
        public void setId(Integer id) {
                setFormFieldId(id);
                
        }
        
        @Override
        public int compareTo(FormField other) {
                DefaultComparator pnDefaultComparator = new DefaultComparator();
                return pnDefaultComparator.compare(this, other);
        }
        
        /**
         Provides a default comparator.
         @since 1.12
         **/
        public static class DefaultComparator implements Comparator<FormField> {
                
                @Override
                public int compare(FormField ff1, FormField ff2) {
                        if (ff1.getSortWeight() != null || ff2.getSortWeight() != null) {
                                if (ff1.getSortWeight() == null) {
                                        return -1;
                                }
                                if (ff2.getSortWeight() == null) {
                                        return 1;
                                }
                                int c = ff1.getSortWeight().compareTo(ff2.getSortWeight());
                                if (c != 0) {
                                        return c;
                                }
                        }
                        if (ff1.getPageNumber() != null || ff2.getPageNumber() != null) {
                                if (ff1.getPageNumber() == null) {
                                        return -1;
                                }
                                if (ff2.getPageNumber() == null) {
                                        return 1;
                                }
                                int c = ff1.getPageNumber().compareTo(ff2.getPageNumber());
                                if (c != 0) {
                                        return c;
                                }
                        }
                        if (ff1.getFieldNumber() != null || ff2.getFieldNumber() != null) {
                                if (ff1.getFieldNumber() == null) {
                                        return -1;
                                }
                                if (ff2.getFieldNumber() == null) {
                                        return 1;
                                }
                                int c = ff1.getFieldNumber().compareTo(ff2.getFieldNumber());
                                if (c != 0) {
                                        return c;
                                }
                        }
                        if (ff1.getFieldPart() != null || ff2.getFieldPart() != null) {
                                if (ff1.getFieldPart() == null) {
                                        return -1;
                                }
                                if (ff2.getFieldPart() == null) {
                                        return 1;
                                }
                                int c = ff1.getFieldPart().compareTo(ff2.getFieldPart());
                                if (c != 0) {
                                        return c;
                                }
                        }
                        if (ff1.getField() != null && ff2.getField() != null) {
                                int c = ff1.getField().getName().compareTo(ff2.getField().getName());
                                if (c != 0) {
                                        return c;
                                }
                        }
                        if (ff1.getFormFieldId() == null && ff2.getFormFieldId() != null) {
                                return -1;
                        }
                        if (ff1.getFormFieldId() != null && ff2.getFormFieldId() == null) {
                                return 1;
                        }
                        if (ff1.getFormFieldId() == null && ff2.getFormFieldId() == null) {
                                return 1;
                        }
                        
                        return ff1.getFormFieldId().compareTo(ff2.getFormFieldId());
                }
        }
}

1	/**
2	* This Source Code Form is subject to the terms of the Mozilla Public License,
3	* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4	* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5	* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6	*
7	* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8	* graphic logo is a trademark of OpenMRS Inc.
9	*/
10	package org.openmrs;
11
12	import java.util.Comparator;
13
14	import org.codehaus.jackson.annotate.JsonIgnore;
15
16	/**
17	* The FormField object relates/orders the <code>fields</code> on a <code>form</code> A form can
18	* have many 0 to n fields associated with it in a hierarchical manor. This FormField object governs
19	* what/how that takes place
20	*
21	* @see org.openmrs.Form
22	* @see org.openmrs.Field
23	*/
24	public class FormField extends BaseOpenmrsMetadata implements java.io.Serializable, Comparable<FormField> {
25
26	public static final long serialVersionUID = 3456L;
27
28	// Fields
29
30	protected Integer formFieldId;
31
32	protected FormField parent;
33
34	protected Form form;
35
36	protected Field field;
37
38	protected Integer fieldNumber;
39
40	protected String fieldPart;
41
42	protected Integer pageNumber;
43
44	protected Integer minOccurs;
45
46	protected Integer maxOccurs;
47
48	protected Boolean required = false;	1✔
49
50	protected Float sortWeight;
51
52	// Constructors
53
54	/** default constructor */
55	public FormField() {	1✔
56	}	1✔
57
58	/** constructor with id */
59	public FormField(Integer formFieldId) {	1✔
60	this.formFieldId = formFieldId;	1✔
61	}	1✔
62
63	// Property accessors
64
65	/**
66	* @return Returns the formFieldId.
67	*/
68	public Integer getFormFieldId() {
69	return formFieldId;	1✔
70	}
71
72	/**
73	* @param formFieldId The formFieldId to set.
74	*/
75	public void setFormFieldId(Integer formFieldId) {
76	this.formFieldId = formFieldId;	1✔
77	}	1✔
78
79	/**
80	* @return Returns the parent FormField.
81	*/
82	public FormField getParent() {
83	return parent;	1✔
84	}
85
86	/**
87	* @param parent The formField to set as parent.
88	*/
89	public void setParent(FormField parent) {
90	this.parent = parent;	1✔
91	}	1✔
92
93	/**
94	* @return Returns the form.
95	*/
96	public Form getForm() {
97	return form;	1✔
98	}
99
100	/**
101	* @param form The form to set.
102	*/
103	public void setForm(Form form) {
104	this.form = form;	1✔
105	}	1✔
106
107	/**
108	* @return Returns the field.
109	*/
110	public Field getField() {
111	return field;	1✔
112	}
113
114	/**
115	* @param field The field to set.
116	*/
117	public void setField(Field field) {
118	this.field = field;	1✔
119	}	1✔
120
121	/**
122	* @return Returns the fieldNumber.
123	*/
124	public Integer getFieldNumber() {
125	return fieldNumber;	1✔
126	}
127
128	/**
129	* @param fieldNumber The fieldNumber to set.
130	*/
131	public void setFieldNumber(Integer fieldNumber) {
132	this.fieldNumber = fieldNumber;	1✔
133	}	1✔
134
135	/**
136	* @return Returns the fieldPart.
137	*/
138	public String getFieldPart() {
139	return fieldPart;	1✔
140	}
141
142	/**
143	* @param fieldPart The fieldPart to set.
144	*/
145	public void setFieldPart(String fieldPart) {
146	this.fieldPart = fieldPart;	1✔
147	}	1✔
148
149	/**
150	* @return Returns the pageNumber.
151	*/
152	public Integer getPageNumber() {
153	return pageNumber;	1✔
154	}
155
156	/**
157	* @param pageNumber The pageNumber to set.
158	*/
159	public void setPageNumber(Integer pageNumber) {
160	this.pageNumber = pageNumber;	1✔
161	}	1✔
162
163	/**
164	* @return Returns the minOccurs.
165	*/
166	public Integer getMinOccurs() {
167	return minOccurs;	1✔
168	}
169
170	/**
171	* @param minOccurs The minOccurs to set.
172	*/
173	public void setMinOccurs(Integer minOccurs) {
174	this.minOccurs = minOccurs;	1✔
175	}	1✔
176
177	/**
178	* @return Returns the maxOccurs.
179	*/
180	public Integer getMaxOccurs() {
181	return maxOccurs;	1✔
182	}
183
184	/**
185	* @param maxOccurs The maxOccurs to set.
186	*/
187	public void setMaxOccurs(Integer maxOccurs) {
188	this.maxOccurs = maxOccurs;	1✔
189	}	1✔
190
191	/**
192	* @return Returns the required status.
193	*
194	* @deprecated as of 2.0, use {@link #getRequired()}
195	*/
196	@Deprecated
197	@JsonIgnore
198	public Boolean isRequired() {
199	return getRequired();	×
200	}
201
202	/**
203	* @return same as isRequired()
204	*/
205	public Boolean getRequired() {
206	return required == null ? false : required;	1✔
207	}
208
209	/**
210	* @param required The required status to set.
211	*/
212	public void setRequired(Boolean required) {
213	this.required = required;	1✔
214	}	1✔
215
216	/**
217	* @return Returns the sortWeight.
218	*/
219	public Float getSortWeight() {
220	return sortWeight;	1✔
221	}
222
223	/**
224	* @param sortWeight The weight to order the formFields on.
225	*/
226	public void setSortWeight(Float sortWeight) {
227	this.sortWeight = sortWeight;	1✔
228	}	1✔
229
230	/**
231	* @see java.lang.Object#toString()
232	*/
233	@Override
234	public String toString() {
235	if (formFieldId == null) {	×
236	return "null";	×
237	}
238
239	return this.formFieldId.toString();	×
240	}
241
242	/**
243	* @since 1.5
244	* @see org.openmrs.OpenmrsObject#getId()
245	*/
246	@Override
247	public Integer getId() {
248	return getFormFieldId();	×
249	}
250
251	/**
252	* @since 1.5
253	* @see org.openmrs.OpenmrsObject#setId(java.lang.Integer)
254	*/
255	@Override
256	public void setId(Integer id) {
257	setFormFieldId(id);	×
258
259	}	×
260
261	@Override
262	public int compareTo(FormField other) {
263	DefaultComparator pnDefaultComparator = new DefaultComparator();	×
264	return pnDefaultComparator.compare(this, other);	×
265	}
266
267	/**
268	Provides a default comparator.
269	@since 1.12
270	**/
271	public static class DefaultComparator implements Comparator<FormField> {	×
272
273	@Override
274	public int compare(FormField ff1, FormField ff2) {
275	if (ff1.getSortWeight() != null \|\| ff2.getSortWeight() != null) {	×
276	if (ff1.getSortWeight() == null) {	×
277	return -1;	×
278	}
279	if (ff2.getSortWeight() == null) {	×
280	return 1;	×
281	}
282	int c = ff1.getSortWeight().compareTo(ff2.getSortWeight());	×
283	if (c != 0) {	×
284	return c;	×
285	}
286	}
287	if (ff1.getPageNumber() != null \|\| ff2.getPageNumber() != null) {	×
288	if (ff1.getPageNumber() == null) {	×
289	return -1;	×
290	}
291	if (ff2.getPageNumber() == null) {	×
292	return 1;	×
293	}
294	int c = ff1.getPageNumber().compareTo(ff2.getPageNumber());	×
295	if (c != 0) {	×
296	return c;	×
297	}
298	}
299	if (ff1.getFieldNumber() != null \|\| ff2.getFieldNumber() != null) {	×
300	if (ff1.getFieldNumber() == null) {	×
301	return -1;	×
302	}
303	if (ff2.getFieldNumber() == null) {	×
304	return 1;	×
305	}
306	int c = ff1.getFieldNumber().compareTo(ff2.getFieldNumber());	×
307	if (c != 0) {	×
308	return c;	×
309	}
310	}
311	if (ff1.getFieldPart() != null \|\| ff2.getFieldPart() != null) {	×
312	if (ff1.getFieldPart() == null) {	×
313	return -1;	×
314	}
315	if (ff2.getFieldPart() == null) {	×
316	return 1;	×
317	}
318	int c = ff1.getFieldPart().compareTo(ff2.getFieldPart());	×
319	if (c != 0) {	×
320	return c;	×
321	}
322	}
323	if (ff1.getField() != null && ff2.getField() != null) {	×
324	int c = ff1.getField().getName().compareTo(ff2.getField().getName());	×
325	if (c != 0) {	×
326	return c;	×
327	}
328	}
329	if (ff1.getFormFieldId() == null && ff2.getFormFieldId() != null) {	×
330	return -1;	×
331	}
332	if (ff1.getFormFieldId() != null && ff2.getFormFieldId() == null) {	×
333	return 1;	×
334	}
335	if (ff1.getFormFieldId() == null && ff2.getFormFieldId() == null) {	×
336	return 1;	×
337	}
338
339	return ff1.getFormFieldId().compareTo(ff2.getFormFieldId());	×
340	}
341	}
342	}

openmrs / openmrs-core / 5393

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous