Changeset 4358 for openmrs/trunk/src/api/org/openmrs/ConceptName.java
- Timestamp:
- 05/24/08 14:37:02 (8 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openmrs/trunk/src/api/org/openmrs/ConceptName.java
r4230 r4358 27 27 // Fields 28 28 29 private Integer conceptNameId; 29 30 private Concept concept; 30 31 private String name; … … 41 42 } 42 43 44 /** 45 * Convenience constructor to create a ConceptName object by primary key 46 * 47 * @param conceptNameId 48 */ 49 public ConceptName(Integer conceptNameId) { 50 this.conceptNameId = conceptNameId; 51 } 52 53 /** 54 * Convenience constructor taking in the required properties 55 * 56 * @param name 57 * @param shortName 58 * @param description 59 * @param locale 60 */ 43 61 public ConceptName(String name, String shortName, String description, Locale locale) { 44 62 setName(name); … … 48 66 } 49 67 68 /** 69 * @see java.lang.Object#equals(java.lang.Object) 70 */ 50 71 public boolean equals(Object obj) { 51 72 if (obj instanceof ConceptName) { … … 58 79 } 59 80 81 /** 82 * @see java.lang.Object#hashCode() 83 */ 60 84 public int hashCode() { 61 85 if (this.getConcept() == null || this.getName() == null … … 69 93 } 70 94 95 /** 96 * Auto generated method comment 97 * 98 * @return 99 */ 71 100 public String getShortestName() { 72 101 String ret = getShortName(); … … 78 107 } 79 108 80 // Property accessors 81 109 /** 110 * @return the conceptNameId 111 */ 112 public Integer getConceptNameId() { 113 return conceptNameId; 114 } 115 116 /** 117 * @param conceptNameId the conceptNameId to set 118 */ 119 public void setConceptNameId(Integer conceptNameId) { 120 this.conceptNameId = conceptNameId; 121 } 122 82 123 /** 83 124 * … … 172 213 } 173 214 215 /** 216 * @see java.lang.Object#toString() 217 */ 174 218 public String toString() { 175 219 return this.name;