Applying auto format changes

openmrs · Jun 11, 2013 · c2a2419 · c2a2419
1 parent 23b96b2
commit c2a2419
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/api/src/main/java/org/openmrs/api/OrderService.java b/api/src/main/java/org/openmrs/api/OrderService.java
@@ -91,7 +91,7 @@ public interface OrderService extends OpenmrsService {
 	 * @param order The Order to remove from the system
 	 * @param cascade
 	 * @throws APIException
-     * @since 1.9.4
+	 * @since 1.9.4
 	 * @should delete order
 	 * @should delete order when cascade is false
 	 * @should delete order when cascade is true and also delete any Obs that references it

diff --git a/api/src/main/java/org/openmrs/api/context/Context.java b/api/src/main/java/org/openmrs/api/context/Context.java
@@ -199,8 +199,8 @@ public static Class<?> loadClass(String className) throws ClassNotFoundException
 	/**
 	 * Sets the user context on the thread local so that the service layer can perform
 	 * authentication/authorization checks.<br/>
-     * <br />
-     * This is thread safe since it stores the given user context in ThreadLocal.
+	 * <br />
+	 * This is thread safe since it stores the given user context in ThreadLocal.
 	 * 
 	 * @param ctx UserContext to set
 	 */

diff --git a/api/src/main/java/org/openmrs/api/db/OrderDAO.java b/api/src/main/java/org/openmrs/api/db/OrderDAO.java
@@ -97,10 +97,10 @@ public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<P
 	 * @see org.openmrs.api.OrderService#getOrderHistoryByOrderNumber(java.lang.String)
 	 */
 	public List<Order> getOrderHistoryByOrderNumber(String orderNumber);
-
-	 /**
-	  * Delete Obs that references an order
-	  */
+	
+	/**
+	 * Delete Obs that references an order
+	 */
 	public void deleteObsThatReference(Order order);
 
 }
diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
@@ -208,17 +208,17 @@ public List<DrugOrder> getDrugOrdersByPatientAndIngredient(Patient patient, Conc
 
 		return (List<DrugOrder>) searchDrugOrderCriteria.list();
 	}
-
-    /**
-     *  Delete Obs that references (deleted) Order
-     */
-    public void deleteObsThatReference(Order order) {
-        if (order != null) {
-            sessionFactory.getCurrentSession().createQuery("delete Obs where order = :order").setParameter("order", order)
-                    .executeUpdate();
-
-        }
-    }
+	
+	/**
+	 *  Delete Obs that references (deleted) Order
+	 */
+	public void deleteObsThatReference(Order order) {
+		if (order != null) {
+			sessionFactory.getCurrentSession().createQuery("delete Obs where order = :order").setParameter("order", order)
+			        .executeUpdate();
+			
+		}
+	}
 
 	/* (non-Javadoc)
 	 * @see org.openmrs.api.db.OrderDAO#getOrderHistoryByOrderNumber(java.lang.String)

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -583,7 +583,7 @@ public void saveOrder_shouldAssignOrderNumberForNewOrder() throws Exception {
 		Assert.assertNotNull(order.getOrderId());
 		Assert.assertNotNull(order.getOrderNumber());
 	}
-
+	
 	/**
 	 * @throws Exception 
 	 * @see OrderService#getOrderHistoryByOrderNumber(String)
@@ -611,7 +611,7 @@ public void getOrderHistoryByOrderNumber_shouldReturnTheListOfOrdersInAHistory()
 		Assert.assertEquals(expectedHistory, history);
 
 	}
-
+	
 	@Test
 	public void purgeOrder_shouldDeleteObsThatReference() throws Exception {
 		executeDataSet(OBS_THAT_REFERENCE_DATASET_XML);
@@ -642,5 +642,5 @@ public void purgeOrder_shouldDeleteObsThatReference() throws Exception {
 		Assert.assertNull(os.getObsByUuid(obsUuid));
 
 	}
-
+	
 }
diff --git a/web/src/main/java/org/openmrs/web/WebDaemon.java b/web/src/main/java/org/openmrs/web/WebDaemon.java
@@ -33,7 +33,8 @@ public class WebDaemon extends Daemon {
 	 * 
 	 * @param servletContext the servlet context.
 	 */
-	public static void startOpenmrs(final ServletContext servletContext) throws DatabaseUpdateException, InputRequiredException {
+	public static void startOpenmrs(final ServletContext servletContext) throws DatabaseUpdateException,
+	        InputRequiredException {
 
 		// create a new thread and start openmrs in it.
 		DaemonThread startOpenmrsThread = new DaemonThread() {