Navigation

ConceptName.java

Timestamp:

07/17/08 15:20:10 (6 months ago)

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

openmrs/branches/data_synchronization_bidirectional
- Property svn:ignore changed from build* dist* ${env.CATALINA_HOME} docs .metadata setup.inf setup.rpt to build* dist* ${env.CATALINA_HOME} docs .metadata setup.inf setup.rpt *.iws *.ipr *.iml

r4295	r4969
28	28
29	29	// Fields
	30
30	31	private Integer conceptNameId;
31	32	private Concept concept;
…	…
61	62	}
62	63
	64	/**
	65	* Convenience constructor to create a ConceptName object by primary key
	66	*
	67	* @param conceptNameId
	68	*/
	69	public ConceptName(Integer conceptNameId) {
	70	this.conceptNameId = conceptNameId;
	71	}
	72
	73	/**
	74	* Convenience constructor taking in the required properties
	75	*
	76	* @param name
	77	* @param shortName
	78	* @param description
	79	* @param locale
	80	*/
63	81	public ConceptName(String name, String shortName, String description, Locale locale) {
64	82	setName(name);
…	…
68	86	}
69	87
	88	/**
	89	* @see java.lang.Object#equals(java.lang.Object)
	90	*/
70	91	public boolean equals(Object obj) {
71	92	if (obj instanceof ConceptName) {
…	…
78	99	}
79	100
	101	/**
	102	* @see java.lang.Object#hashCode()
	103	*/
80	104	public int hashCode() {
81	105	if (this.getConcept() == null \|\| this.getName() == null
…	…
89	113	}
90	114
	115	/**
	116	* Auto generated method comment
	117	*
	118	* @return
	119	*/
91	120	public String getShortestName() {
92	121	String ret = getShortName();
…	…
98	127	}
99	128
100		// Property accessors
101
102		/**
103		* @return Returns the conceptId.
104		*/
105		public Integer getConceptNameId() {
106		return conceptNameId;
107		}
	129	/**
	130	* @return the conceptNameId
	131	*/
	132	public Integer getConceptNameId() {
	133	return conceptNameId;
	134	}
108	135
109	136	/**
…	…
206	233	}
207	234
	235	/**
	236	* @see java.lang.Object#toString()
	237	*/
208	238	public String toString() {
209	239	return this.name;