From 4db518413cbb0b004c4d290d16d0cf403976f3c7 Mon Sep 17 00:00:00 2001 From: josh Date: Sat, 5 Dec 2009 15:32:48 +0000 Subject: [PATCH] commented java files a little more, added initial UI redesign report git-svn-id: svn://anubis/gvsu@467 45c1a28c-8058-47b2-ae61-ca45b979098e --- cs623/proj1/RetirementCalculator.java | 7 +++++++ cs623/proj1/RetirementCalculatorModel.java | 9 ++++++++- cs623/proj1/UI redesign report.odt | Bin 0 -> 12287 bytes 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 cs623/proj1/UI redesign report.odt diff --git a/cs623/proj1/RetirementCalculator.java b/cs623/proj1/RetirementCalculator.java index 2c9e704..9f6a4d1 100644 --- a/cs623/proj1/RetirementCalculator.java +++ b/cs623/proj1/RetirementCalculator.java @@ -55,6 +55,10 @@ class RetirementCalculatorPanel new ComboChoice(97, "97 (Female; 90th percentile)") }; + /* + * These helper functions facilitate adding rows of user interface + * elements to the JPanel. + */ private static int row = 0; private void addRow(JPanel panel, JComponent c1, JComponent c2) { @@ -254,11 +258,13 @@ class RetirementCalculatorPanel { if (e.getComponent().getClass() == JTextField.class) { + /* select all text of a text box */ ((JTextField) e.getComponent()).selectAll(); } String tooltip = myToolTips.get(e.getComponent()); if (tooltip != null) { + /* update the tooltip for the newly selected field */ if (tooltip.indexOf("   "; @@ -269,6 +275,7 @@ class RetirementCalculatorPanel public void focusLost(FocusEvent e) { + /* we are not interested in this event */ } private void calculate() diff --git a/cs623/proj1/RetirementCalculatorModel.java b/cs623/proj1/RetirementCalculatorModel.java index 610b7ee..262af30 100644 --- a/cs623/proj1/RetirementCalculatorModel.java +++ b/cs623/proj1/RetirementCalculatorModel.java @@ -1,9 +1,16 @@ import java.util.*; +/* + * This class implements the model portion of the Retirement Calculator + * project. + * Its methods could be invoked by different view or controller classes. + */ public class RetirementCalculatorModel { - /* input fields */ + /* Hold fields in a hash instead of declaring each in a separate + * variable -- this is more scalable. + * (Interface documentation which fields need to be set) */ private HashMap myFields; public RetirementCalculatorModel() diff --git a/cs623/proj1/UI redesign report.odt b/cs623/proj1/UI redesign report.odt new file mode 100644 index 0000000000000000000000000000000000000000..c08f0865b1ae5af0ffcd728dfc831394adb4dfd2 GIT binary patch literal 12287 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 literal 0 HcmV?d00001