Merge pull request #101 from samuelowino/master

MUZIMA-860 Form Tags

Author: benamonya

api/src/main/java/org/openmrs/module/muzima/model/MuzimaForm.java

@@ -21,7 +21,6 @@ public class MuzimaForm extends BaseOpenmrsMetadata {
     private String form; ///uuid to form table
     private Set<MuzimaFormTag> tags = new HashSet<MuzimaFormTag>();
     private Form formDefinition;
-    private EncounterType encounterType;
 
     public MuzimaForm() {
     }    // used by hibernate
@@ -52,8 +51,6 @@ public void setId(Integer id) {
 
     public EncounterType getEncounterType() { return formDefinition.getEncounterType(); }
 
-    public void setEncounterType(EncounterType encounterType){  this.encounterType = formDefinition.getEncounterType(); }
-
     public String getName() {
         return formDefinition.getName() == null ? "" : formDefinition.getName();
     }
@@ -151,8 +148,8 @@ public int hashCode() {
         result = 31 * result + (getForm() != null ? getForm().hashCode() : 0);
         result = 31 * result + (getDiscriminator() != null ? getDiscriminator().hashCode() : 0);
         result = 31 * result + (getFormDefinition().getDescription() != null ? getFormDefinition().getDescription().hashCode() : 0);
-        result = 31 * result + (tags != null ? tags.hashCode() : 0);
         result = 31 * result + (getFormDefinition().getEncounterType() != null ? getFormDefinition().getEncounterType().hashCode() : 0);
+	result = 31 * result + (tags != null ? tags.hashCode() : 0);
         return result;
     }
 
@@ -164,11 +161,10 @@ public String toString() {
                 ", form='" + getForm() + '\'' +
                 ", discriminator='" + getDiscriminator() + '\'' +
                 ", tags=" + tags +
-                ", encounterType"+getFormDefinition().getEncounterType()+
                 '}';
     }
 
     public String getVersion() {
         return formDefinition.getVersion() == null ? "" : formDefinition.getVersion();
     }
-}
+}