returning PatientBean.java to original form with no code smells and pushing...

returning PatientBean.java to original form with no code smells and pushing code refactoring to a seperate branch

iTrust/src/edu/ncsu/csc/itrust/beans/PatientBean.java

@@ -46,8 +46,7 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 	private String creditCardType = "";
 	private String creditCardNumber = "";
 	// Topical Health Information
-	private String dateFormat = "MM/dd/yyyy";
-	private String dateOfBirthStr = new SimpleDateFormat(dateFormat).format(new Date());
+	private String dateOfBirthStr = new SimpleDateFormat("MM/dd/yyyy").format(new Date());
 	private String dateOfDeathStr = "";
 	private String causeOfDeath = "";
 	private String motherMID = "0";
@@ -62,12 +61,6 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 	private String spiritualPractices = "";
 	private String alternateName = "";
 	private String dateOfDeactivationStr = "";
-	// Age calculations
-	private long milliseconds = 1000;
-	private long seconds = 60;
-	private long minutes = 60;
-	private long hours = 24;
-	private long days = 365;
 
 
 	public BloodType getBloodType() {
@@ -104,7 +97,7 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 
 	public Date getDateOfBirth() {
 		try {
-			return new SimpleDateFormat(dateFormat).parse(dateOfBirthStr);
+			return new SimpleDateFormat("MM/dd/yyyy").parse(dateOfBirthStr);
 		} catch (ParseException e) {
 			
 			return null;
@@ -113,7 +106,7 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 
 	public Date getDateOfDeath() {
 		try {
-			return new SimpleDateFormat(dateFormat).parse(dateOfDeathStr);
+			return new SimpleDateFormat("MM/dd/yyyy").parse(dateOfDeathStr);
 		} catch (ParseException e) {
 			
 			return null;
@@ -126,10 +119,9 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 
 	public int getAge() {
 		try {
-			long currentTime = System.currentTimeMillis();
-			long birthTime = new SimpleDateFormat(dateFormat).parse(dateOfBirthStr).getTime();
-			long ageInMs = currentTime - birthTime;
-			long age = ageInMs / (milliseconds * seconds * minutes * hours * days);
+			long ageInMs = System.currentTimeMillis()
+					- new SimpleDateFormat("MM/dd/yyyy").parse(dateOfBirthStr).getTime();
+			long age = ageInMs / (1000L * 60L * 60L * 24L * 365L);
 			return (int) age;
 		} catch (ParseException e) {
 			
@@ -143,10 +135,9 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 		long ageInMs;
 
 		try {
-			long currentTime = System.currentTimeMillis();
-			long birthTime = new SimpleDateFormat(dateFormat).parse(dateOfBirthStr).getTime();
-			ageInMs = currentTime - birthTime;
-			age = ageInMs / (milliseconds * seconds * minutes * hours * days);
+			ageInMs = System.currentTimeMillis()
+					- new SimpleDateFormat("MM/dd/yyyy").parse(dateOfBirthStr).getTime();
+			age = ageInMs / (1000L * 60L * 60L * 24L);
 	
 		}
 		catch (ParseException e) {
@@ -163,10 +154,9 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 		long ageInMs;
 
 		try {
-			long currentTime = System.currentTimeMillis();
-			long birthTime = new SimpleDateFormat(dateFormat).parse(dateOfBirthStr).getTime();
-			ageInMs = currentTime - birthTime;
-			age = ageInMs / (milliseconds * seconds * minutes * hours * days);
+			ageInMs = System.currentTimeMillis()
+					- new SimpleDateFormat("MM/dd/yyyy").parse(dateOfBirthStr).getTime();
+			age = ageInMs / (1000L * 60L * 60L * 24L * 7L);
 	
 		}
 		catch (ParseException e) {
@@ -509,4 +499,4 @@ public class PatientBean implements Serializable, Comparable<PatientBean> {
 		return 42; // any arbitrary constant will do
 	}
 	
-}
+}
\ No newline at end of file