josh/gvsu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

filling out more Model functions

Browse Source 
git-svn-id: svn://anubis/gvsu@434 45c1a28c-8058-47b2-ae61-ca45b979098e
This commit is contained in:
josh 2009-10-03 18:24:47 +00:00
parent d0d259ca43
commit dd5b4a7bf1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cs623/proj1/RetirementCalculator.java
View File

@ -16,8 +16,8 @@ class RetirementCalculatorPanel extends JPanel implements ActionListener
public RetirementCalculatorPanel() public RetirementCalculatorPanel()
{ {
JPanel inner = new JPanel(new GridLayout(3, 2)); JPanel inner = new JPanel(new GridLayout(3, 2));
JButton b = new JButton("HI"); inner.add(new JLabel("How much annual income will you want in retirement?"));
inner.add(b); inner.add(new JTextField());
JScrollPane scrollpane = new JScrollPane(inner, JScrollPane scrollpane = new JScrollPane(inner,
ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);

14
cs623/proj1/RetirementCalculatorModel.java
View File

@ -34,12 +34,7 @@ public class RetirementCalculatorModel
public void calculate() public void calculate()
{ {
if (myCurrentIncome < 25000.0) mySocialSecurity = calculateSocialSecurity();
mySocialSecurity = 8000.0;
else if (myCurrentIncome <= 40000.0)
mySocialSecurity = 12000.0;
else
mySocialSecurity = 14500.0;
} }
private double calculateRetirementFactor() private double calculateRetirementFactor()
@ -49,7 +44,12 @@ public class RetirementCalculatorModel
private double calculateSocialSecurity() private double calculateSocialSecurity()
{ {
return 0.0; if (myCurrentIncome < 25000.0)
return 8000.0;
else if (myCurrentIncome <= 40000.0)
return 12000.0;
else
return 14500.0;
} }
private double calculateSavingsFactor() private double calculateSavingsFactor()