From c11c661054407ac3e0a35477de0304589c84eeec Mon Sep 17 00:00:00 2001
From: josh <josh@45c1a28c-8058-47b2-ae61-ca45b979098e>
Date: Mon, 5 Oct 2009 03:39:20 +0000
Subject: [PATCH] added age field, resetting result box upon "Reset" click

git-svn-id: svn://anubis/gvsu@448 45c1a28c-8058-47b2-ae61-ca45b979098e
---
 cs623/proj1/RetirementCalculator.java | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/cs623/proj1/RetirementCalculator.java b/cs623/proj1/RetirementCalculator.java
index 734a729..5092c8d 100644
--- a/cs623/proj1/RetirementCalculator.java
+++ b/cs623/proj1/RetirementCalculator.java
@@ -76,6 +76,21 @@ class RetirementCalculatorPanel extends JPanel implements ActionListener
         c.gridx--;
         c.gridy++;
 
+        c.weightx = 0.0;
+        inner.add(new JLabel("What is your age?", SwingConstants.RIGHT), c);
+        c.gridx++;
+        c.weightx = 1.0;
+        field = new JTextField();
+        myFields.put("age", field);
+        inner.add(field, c);
+        c.gridx--;
+        c.gridy++;
+
+        c.gridwidth = 2;
+        inner.add(makeDivider(), c);
+        c.gridwidth = 1;
+        c.gridy++;
+
         c.weightx = 0.0;
         inner.add(new JLabel("How much annual income will you want in retirement?", SwingConstants.RIGHT), c);
         c.gridx++;
@@ -186,11 +201,11 @@ class RetirementCalculatorPanel extends JPanel implements ActionListener
         myCalculateButton = new JButton("Calculate");
         myCalculateButton.addActionListener(this);
         buttons.add(myCalculateButton);
-        buttons.add(Box.createRigidArea(new Dimension(5, 0)));
+        buttons.add(Box.createRigidArea(new Dimension(10, 0)));
         myPrintButton = new JButton("Print");
         myPrintButton.addActionListener(this);
         buttons.add(myPrintButton);
-        buttons.add(Box.createRigidArea(new Dimension(5, 0)));
+        buttons.add(Box.createRigidArea(new Dimension(10, 0)));
         myResetButton = new JButton("Reset");
         myResetButton.addActionListener(this);
         buttons.add(myResetButton);
@@ -293,6 +308,7 @@ class RetirementCalculatorPanel extends JPanel implements ActionListener
             }
         }
         myNameField.setText("");
+        myResultBox.setText(" ");
     }
 
     private void print()