From a25fab8882a7162d6e2f26298ec887c0b6bb85d9 Mon Sep 17 00:00:00 2001 From: ricky barrette Date: Fri, 21 Jan 2011 17:18:30 +0000 Subject: [PATCH] created the static method MainWindow.loadDatabase() for easy database reloading --- Order Processor/.settings.propertys | 8 +-- .../java/OrderProcessor/UI/MainWindow.java | 52 +++++++++++-------- .../java/OrderProcessor/UI/SettingsPanel.java | 3 ++ Order Processor/version infomation/changelog | 13 +++-- Order Processor/version infomation/version | 2 +- 5 files changed, 46 insertions(+), 32 deletions(-) diff --git a/Order Processor/.settings.propertys b/Order Processor/.settings.propertys index 08497c5..e4e76ec 100644 --- a/Order Processor/.settings.propertys +++ b/Order Processor/.settings.propertys @@ -1,7 +1,7 @@ #---No Comment--- -#Wed Jan 19 13:29:12 EST 2011 -server_parrword= -server_location=tcdevsvn1 +#Thu Jan 20 12:15:15 EST 2011 +server_parrword=S35-2n6t use_remote_server=true +server_location=tcdevsvn1 server_port_number=3306 -server_user_name= +server_user_name=ricky.barrette diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java index 5f0274d..351e9b1 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java @@ -33,15 +33,15 @@ import com.TwentyCodes.java.OrderProcessor.DB.OrderDB; */ public class MainWindow extends JFrame implements ActionListener, ProgressListener{ - private JButton mLoadFileButton; + private static JButton mLoadFileButton; private JFileChooser fc; public static OrderDB db; private static final long serialVersionUID = 1841715561053331517L; private JProgressBar mProgressBar; private String mCurrentFile; private UncaughtExceptionHandler mExceptionReport = new UncaughtExceptionHandler(this.getClass()); - private JLabel orderCountLabel; - private JLabel mWarningLabel; + private static JLabel orderCountLabel; + private static JLabel mWarningLabel; /** * Creates a new MainWindow @@ -51,12 +51,6 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen Thread.setDefaultUncaughtExceptionHandler(mExceptionReport); this.setDefaultCloseOperation(EXIT_ON_CLOSE); - - try { - db = new OrderDB(); - } catch (Exception e) { - e.printStackTrace(); - } fc = new JFileChooser(); fc.setFileFilter(new FileFilter()); @@ -65,7 +59,7 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen tabbedPane.addTab("Main", initializeMainPanel()); tabbedPane.addTab("Search Orders", new SearchPanel(this)); - tabbedPane.addTab("Show All Orders", new ShowAllPanel(this)); +// tabbedPane.addTab("Show All Orders", new ShowAllPanel(this)); tabbedPane.addTab("Settings", new SettingsPanel()); @@ -95,12 +89,31 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen mWarningLabel = new JLabel(""); + orderCountLabel = new JLabel(""); + panel.add(new JLabel("Total Orders in the database:")); + panel.add(orderCountLabel); + + loadDatabase(); + + panel.add(mLoadFileButton); + + panel.add(mWarningLabel); + + //progress bar + mProgressBar = new JProgressBar(); + mProgressBar.setStringPainted(true); + mainPanel.add(mProgressBar, BorderLayout.SOUTH); + + return mainPanel; + } + + public static void loadDatabase() { //order count labels try { - panel.add(new JLabel("Total Orders in the database:")); - orderCountLabel = new JLabel(db.getCount()+""); - panel.add(orderCountLabel); + db = new OrderDB(); + orderCountLabel.setText(db.getCount()+""); + mWarningLabel.setText(""); } catch (SQLException e) { e.printStackTrace(); mWarningLabel.setText(e.getMessage()); @@ -111,19 +124,12 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen } catch (NullPointerException e){ mWarningLabel.setText("Database not avilable"); mWarningLabel.setVisible(true); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - panel.add(mLoadFileButton); - panel.add(mWarningLabel); - - - //progress bar - mProgressBar = new JProgressBar(); - mProgressBar.setStringPainted(true); - mainPanel.add(mProgressBar, BorderLayout.SOUTH); - - return mainPanel; } /** diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java index c866fd2..782139d 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java @@ -182,6 +182,7 @@ public class SettingsPanel extends JPanel implements ActionListener { // TODO Auto-gene1rated catch block e1.printStackTrace(); } + } if(e.getSource() == mUseRemoteDatabase){ @@ -212,5 +213,7 @@ public class SettingsPanel extends JPanel implements ActionListener { } } + MainWindow.loadDatabase(); + } } \ No newline at end of file diff --git a/Order Processor/version infomation/changelog b/Order Processor/version infomation/changelog index 8848248..84d9fcd 100644 --- a/Order Processor/version infomation/changelog +++ b/Order Processor/version infomation/changelog @@ -1,19 +1,24 @@ 1.0.0 b 28 - fixed the .CSV file parsing with an external lib. 1.0.1 b 29 - created a single window with a tabbed layout for a more fluid experience. added an overwrite file dialog. added the customer country to the order object. updated .CSV export 1.0.2 b 30 - i replaced the old sqlite driver (for local databases) with the mySQL driver to interface with TCDEVSVN1's order database 1.0.3 b 31 +i improved the speed of file parsing, be making less database hits +1.0.4 b 32 +fixed order processing to be more efficient, and i now use BigDecimal to cal money + +1.0.5 b 33 i created a settings panel that uses a .property file to save settings. -i modified OrderDB to use the .property file \ No newline at end of file +i modified OrderDB to use the .property file + +1.0.6 b 34 +created the static method MainWindow.loadDatabase() for easy database reloading \ No newline at end of file diff --git a/Order Processor/version infomation/version b/Order Processor/version infomation/version index 81a50b9..34d85be 100644 --- a/Order Processor/version infomation/version +++ b/Order Processor/version infomation/version @@ -1 +1 @@ -1.0.3 b 31 \ No newline at end of file +1.0.6 b 34 \ No newline at end of file