diff --git a/cs623/proj1/RetirementCalculator.java b/cs623/proj1/RetirementCalculator.java index 0581fb3..2c9e704 100644 --- a/cs623/proj1/RetirementCalculator.java +++ b/cs623/proj1/RetirementCalculator.java @@ -119,9 +119,10 @@ class RetirementCalculatorPanel field = new JTextField(); field.addFocusListener(this); - myFields.put("age", field); - myToolTips.put(field, "Enter your current age."); - addRow(inner, new JLabel("What is your age?", SwingConstants.RIGHT), + myFields.put("birth_year", field); + myToolTips.put(field, "Enter the year you were born in."); + addRow(inner, new JLabel("What is your birth year?", + SwingConstants.RIGHT), field); addRow(inner, makeDivider()); @@ -310,7 +311,7 @@ class RetirementCalculatorPanel JTextField tf = (JTextField) comp; double val = myModel.getField(key); tf.setText(String.format( - key.equals("age") ? "%.0f" : "%.2f", val)); + key.equals("birth_year") ? "%.0f" : "%.2f", val)); } else if (comp.getClass() == JComboBox.class) { @@ -349,7 +350,7 @@ class RetirementCalculatorPanel String endl = "
"; String msg = ""; msg += "Name: " + myNameField.getText() + endl; - msg += "Age: " + fmt("%.0f", "age") + endl; + msg += "Birth Year: " + fmt("%.0f", "birth_year") + endl; msg += "Retirement age: " + fmt("%.0f", "retirement age") + endl; msg += "Current income: $" + fmt("%,.02f", "current income") + endl; msg += "Desired annual income: $" + diff --git a/cs623/proj1/RetirementCalculatorModel.java b/cs623/proj1/RetirementCalculatorModel.java index 3efba33..610b7ee 100644 --- a/cs623/proj1/RetirementCalculatorModel.java +++ b/cs623/proj1/RetirementCalculatorModel.java @@ -31,7 +31,7 @@ public class RetirementCalculatorModel setField("employer pension", 0); setField("part time income", 0); setField("other income", 0); - setField("age", 30); + setField("birth_year", 1980); setField("retirement age", 65); setField("savings", 0); setField("life expectancy", 82); @@ -130,7 +130,8 @@ public class RetirementCalculatorModel private int calculateFiveYearsToRetirement() { double retire_age = getField("retirement age"); - double current_age = getField("age"); + double current_age = Calendar.getInstance().get(Calendar.YEAR) - + getField("birth_year"); double years_to_retirement = retire_age - current_age; int five_years_to_retirement = (int) ((years_to_retirement + 2.5) / 5.0);