diff --git a/cs623/proj1/RetirementCalculator.java b/cs623/proj1/RetirementCalculator.java index 8b600b8..c1dc94e 100644 --- a/cs623/proj1/RetirementCalculator.java +++ b/cs623/proj1/RetirementCalculator.java @@ -11,19 +11,21 @@ import java.util.*; */ class RetirementCalculatorPanel extends JPanel implements ActionListener { - private JButton b; + private RetirementCalculatorModel myModel; public RetirementCalculatorPanel() { - setLayout(new BorderLayout()); - b = new JButton("Hi There"); - b.addActionListener(this); - add("South", b); + JPanel inner = new JPanel(new GridLayout(3, 2)); + JButton b = new JButton("HI"); + inner.add(b); + JScrollPane scrollpane = new JScrollPane(inner, + ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + add(scrollpane); } public void actionPerformed(ActionEvent e) { - b.setEnabled(false); } } diff --git a/cs623/proj1/RetirementCalculatorModel.java b/cs623/proj1/RetirementCalculatorModel.java index e49ea56..468924a 100644 --- a/cs623/proj1/RetirementCalculatorModel.java +++ b/cs623/proj1/RetirementCalculatorModel.java @@ -37,13 +37,16 @@ public class RetirementCalculatorModel private double calculateRetirementFactor() { + return 0.0; } private double calculateSocialSecurity() { + return 0.0; } private double calculateSavingsFactor() { + return 0.0; } }