OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (4 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/util/OpenmrsConstants.java

@@ -314 +314 @@
-         * @deprecated replacing with ADD/EDIT/DELETE privileges
-         */
+        public static final String PRIV_BACKUP_ENTIRE_DATABASE = "Backup Entire Database";
+         
-        public static final String PRIV_MANAGE_RELATIONSHIPS = "Manage Relationships";
-    
-    public static final String PRIV_BACKUP_ENTIRE_DATABASE = "Backup Entire Database";
-        
-        public static final String PRIV_VIEW_RELATIONSHIPS = "View Relationships";
@@ -325 +325 @@
-        
-        public static final String PRIV_VIEW_DATAENTRY_STATS = "View Data Entry Statistics";
+        
-        /**
-         * Cached list of core privileges 
@@ -546 +547 @@
-        public static final String GLOBAL_PROPERTY_MEDICAL_RECORD_OBSERVATIONS = "concept.medicalRecordObservations";
-        public static final String GLOBAL_PROPERTY_REPORT_XML_MACROS           = "report.xmlMacros";
- 
+
-        public static final String GLOBAL_PROPERTY_DEFAULT_PATIENT_IDENTIFIER_VALIDATOR = "patient.defaultPatientIdentifierValidator";  
-        public static final String GLOBAL_PROPERTY_PATIENT_IDENTIFIER_IMPORTANT_TYPES = "patient_identifier.importantTypes";
@@ -864 +865 @@
-        // Used for differences between windows/linux upload capabilities)
-        // Used for determining where to find runtime properties
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    // Shortcut booleans used to make some OS specific checks
-    // more generic; note the un*x flavored check is missing
-    // some less obvious choices
-
+final 
-        (OPERATING_SYSTEM.indexOf(OPERATING_SYSTEM_LINUX) > -1 ||
+         OPERATING_SYSTEM.indexOf(OPERATING_SYSTEM_SUNOS) > -1 ||
-         OPERATING_SYSTEM.indexOf(OPERATING_SYSTEM_FREEBSD) > -1 ||
-MAC_
-
-
+
+final 
+final 
-                OPERATING_SYSTEM.equals(OPERATING_SYSTEM_WINDOWS_VISTA);
-