Merge branch 'smells' into 'master'

Remove unnecessary imports, standardize others

See merge request !16

iTrust/src/edu/ncsu/csc/itrust/beans/forms/VisitReminderReturnForm.java

 package edu.ncsu.csc.itrust.beans.forms;
 
+import edu.ncsu.csc.itrust.beans.VisitFlag;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import edu.ncsu.csc.itrust.beans.VisitFlag;
 
 /**
  * A form to contain data coming from reminding a user about an upcoming office visit.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/AllergyBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.AllergyBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.AllergyBean;
 
 /**
  * A loader for AllergyBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/ApptBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.ApptBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.ApptBean;
 
 public class ApptBeanLoader implements BeanLoader<ApptBean> {
 

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/ApptRequestBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.ApptBean;
+import edu.ncsu.csc.itrust.beans.ApptRequestBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.ApptBean;
-import edu.ncsu.csc.itrust.beans.ApptRequestBean;
 
 /**
  * 

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/ApptTypeBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.ApptTypeBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.ApptTypeBean;
 
 public class ApptTypeBeanLoader implements BeanLoader<ApptTypeBean> {
 

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/BillingBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.BillingBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.BillingBean;
-
 public class BillingBeanLoader implements BeanLoader<BillingBean> {
 
 	@Override

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/CDCStatsBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.CDCStatsBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.CDCStatsBean;
 
 public class CDCStatsBeanLoader implements BeanLoader<CDCStatsBean> {
 	public PreparedStatement loadParameters(PreparedStatement ps, CDCStatsBean bean) throws SQLException {

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/DiagnosisBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.DiagnosisBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.DiagnosisBean;
 
 /**
  * A loader for DiagnosisBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/EmailBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.Email;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.Email;
 
 /**
  * A loader for Fake Emails.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/ExerciseEntryLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.ExerciseEntryBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,8 +9,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.ExerciseEntryBean;
-
 /**
  * ExerciseEntryLoader.java
  * Version 1

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/FamilyBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.FamilyMemberBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.FamilyMemberBean;
 
 /**
  * A loader for FamilyMemberBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/FlagsLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.FlagsBean;
+import edu.ncsu.csc.itrust.enums.FlagValue;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.FlagsBean;
-import edu.ncsu.csc.itrust.enums.FlagValue;
-
 /**
  * A loader for ObstetricsRecordBeans.
  * 

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/FoodEntryLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.FoodEntryBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,8 +9,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.FoodEntryBean;
-
 /**
  * FoodEntryLoader.java
  * Version 1

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/HospitalBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.HospitalBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.HospitalBean;
 
 /**
  * A loader for HospitalBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/LOINCBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.LOINCbean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.LOINCbean;
 
 /**
  * A loader for LOINCBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/LabelLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.LabelBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.LabelBean;
-
 public class LabelLoader implements BeanLoader<LabelBean> {
 	
 	/**

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/MacronutrientsLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.MacronutrientsBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.MacronutrientsBean;
-
 /**
  * MacronutrientsLoader.java
  * Version 1

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/MedicationBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.MedicationBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.MedicationBean;
 
 /**
  * A loader for MedicationBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/MessageBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.MessageBean;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import edu.ncsu.csc.itrust.beans.MessageBean;
 
 /**
  * A loader for MessageBeans.

iTrust/src/edu/ncsu/csc/itrust/beans/loaders/NormalBeanLoader.java

 package edu.ncsu.csc.itrust.beans.loaders;
 
+import edu.ncsu.csc.itrust.beans.NormalBean;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.ncsu.csc.itrust.beans.NormalBean;
-
 public class NormalBeanLoader {
 
 	public List<NormalBean> loadList(ResultSet rs) throws SQLException {