OpenMRS

Timestamp:

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

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

• openmrs/branches/data_synchronization_bidirectional (modified) (1 prop)
• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/ConceptStateConversion.java (modified) (3 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/ConceptStateConversion.java

@@ -18 +18 @@
-import org.openmrs.synchronization.Synchronizable;
-
+/**
+ * ConceptStateConversion
+ */
-public class ConceptStateConversion implements Synchronizable {
-        
-
+
+
+
+
+
+
-        
-        private Integer conceptStateConversionId;
@@ -44 +52 @@
-      this.guid = guid;
-  }
+                // ******************
+        // Constructors
+        // ******************
-        
+        /** Default Constructor */
-        public ConceptStateConversion() { }
+        
+        /** Constructor with id */
+        public ConceptStateConversion(Integer conceptStateConversionId) {
+                setConceptStateConversionId(conceptStateConversionId);
+        }
+        
+        // ******************
+        // Instance methods
+        // ******************
+        
+        /** @see Object#equals(Object) */
+        public boolean equals(Object obj) {
+                if (obj != null && obj instanceof ConceptStateConversion) {
+                        ConceptStateConversion p = (ConceptStateConversion)obj;
+                        if (this.getConceptStateConversionId() == null) {
+                                return p.getConceptStateConversionId() == null;
+                        }
+                        return (this.getConceptStateConversionId().equals(p.getConceptStateConversionId()));
+                }
+                return false;
+        }
-
+        /** @see Object#toString() */
-        public String toString() {
-                return("ConceptStateConversion: Concept[" + concept + "] results in State [" + programWorkflowState + "] for workflow [" + programWorkflow + "]");
-        }
-        
-
-
-
-
-
-
-
-
+
+
+
+
-        /**
-         * @return Returns the concept.
@@ -114 +144 @@
-                this.programWorkflowState = programWorkflowState;
-        }
-        
-}