src/com/jbidwatcher/app/JBidWatch.java src/com/jbidwatcher/auction/FilterManager.java src/com/jbidwatcher/auction/event/EventLogger.java src/com/jbidwatcher/auction/event/EventStatus.java src/com/jbidwatcher/util/DeletedManager.java @@ -1,3 +1,3 @@ Manifest-Version: 1.0 Created-By: 1.0 (Morgan Schweers, Cyberfox Software) -Main-Class: com.jbidwatcher.JBidWatch +Main-Class: com.jbidwatcher.app.JBidWatch META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ package com.jbidwatcher.auction; */ import com.jbidwatcher.util.Currency; -import com.jbidwatcher.FilterManager; +import com.jbidwatcher.auction.FilterManager; import com.jbidwatcher.auction.server.AuctionServer; import com.jbidwatcher.auction.server.AuctionServerInterface; src/com/jbidwatcher/auction/AuctionActionImpl.java @@ -86,9 +86,9 @@ public class AuctionEntry extends ActiveRecord implements Comparable { /** * A logging class for keeping track of events. * - * @see com.jbidwatcher.event.EventLogger + * @see com.jbidwatcher.auction.event.EventLogger */ - private com.jbidwatcher.event.EventLogger mEntryEvents = null; + private com.jbidwatcher.auction.event.EventLogger mEntryEvents = null; /** * Allow the user to add a personal comment about this auction. @@ -831,7 +831,7 @@ public class AuctionEntry extends ActiveRecord implements Comparable { * @param inStatus - A string that explains what the event is. */ public void setLastStatus(String inStatus) { - if(mEntryEvents == null) mEntryEvents = new com.jbidwatcher.event.EventLogger(getIdentifier(), getTitle()); + if(mEntryEvents == null) mEntryEvents = new com.jbidwatcher.auction.event.EventLogger(getIdentifier(), getTitle()); mEntryEvents.setLastStatus(inStatus); } @@ -908,7 +908,7 @@ public class AuctionEntry extends ActiveRecord implements Comparable { setComment(curElement.getContents()); break; case 6: - mEntryEvents = new com.jbidwatcher.event.EventLogger(getIdentifier(), getTitle()); + mEntryEvents = new com.jbidwatcher.auction.event.EventLogger(getIdentifier(), getTitle()); mEntryEvents.fromXML(curElement); break; case 7: @@ -1046,7 +1046,7 @@ public class AuctionEntry extends ActiveRecord implements Comparable { if(!isComplete()) setNeedsUpdate(); if(mEntryEvents == null) { - mEntryEvents = new com.jbidwatcher.event.EventLogger(getIdentifier(), getTitle()); + mEntryEvents = new com.jbidwatcher.auction.event.EventLogger(getIdentifier(), getTitle()); } checkHighBidder(false); checkSeller(); src/com/jbidwatcher/auction/AuctionEntry.java @@ -11,7 +11,7 @@ import com.jbidwatcher.ui.auctionTableModel; import com.jbidwatcher.ui.table.TableSorter; import com.jbidwatcher.util.queue.TimerHandler; import com.jbidwatcher.util.Comparison; -import com.jbidwatcher.FilterManager; +import com.jbidwatcher.auction.FilterManager; import com.jbidwatcher.auction.server.AuctionServerManager; import com.jbidwatcher.util.config.ErrorManagement; src/com/jbidwatcher/auction/Auctions.java @@ -30,7 +30,7 @@ import java.text.SimpleDateFormat; /** @noinspection Singleton*/ public class AuctionsManager implements com.jbidwatcher.util.queue.TimerHandler.WakeupProcess,EntryManager { private static AuctionsManager _instance = null; - private DeletedManager _deleted = null; + private com.jbidwatcher.util.DeletedManager _deleted = null; private int _auctionCount = 0; private FilterManager _filter; @@ -49,7 +49,7 @@ public class AuctionsManager implements com.jbidwatcher.util.queue.TimerHandler. // This should be loaded from the configuration settings. _checkpointFrequency = 10 * Constants.ONE_MINUTE; _lastCheckpointed = System.currentTimeMillis(); - _deleted = new DeletedManager(); + _deleted = new com.jbidwatcher.util.DeletedManager(); _filter = FilterManager.getInstance(); } src/com/jbidwatcher/auction/AuctionsManager.java @@ -30,6 +30,7 @@ import com.jbidwatcher.util.*; import com.jbidwatcher.util.Currency; import com.jbidwatcher.*; import com.jbidwatcher.auction.*; +import com.jbidwatcher.auction.FilterManager; import com.jbidwatcher.auction.server.AuctionServerManager; import com.jbidwatcher.auction.server.AuctionServer; import com.jbidwatcher.webserver.JBidProxy; @@ -1117,7 +1118,8 @@ public class JBidMouse extends JBidContext implements MessageQueue.Listener { multiAuctionIds.add(tempEntry.getIdentifier()); } - JBidProxy.setItems(multiAuctionIds); +// TODO -- Find another way to do this... +// JBidProxy.setItems(multiAuctionIds); ae = (AuctionEntry) getIndexedEntry(rowList[0]); } else { src/com/jbidwatcher/ui/JBidMouse.java @@ -9,7 +9,6 @@ import com.jbidwatcher.platform.Platform; import com.jbidwatcher.ui.config.JConfigFrame; import com.jbidwatcher.ui.util.OptionUI; import com.jbidwatcher.util.config.ErrorManagement; -import com.jbidwatcher.FilterManager; import java.awt.event.*; import java.awt.*; @@ -114,7 +113,7 @@ public class JTabPopupMenu extends JContext { } private void setColumnChecks(String tabName) { - List<String> columns = FilterManager.getInstance().getColumns(tabName); + List<String> columns = com.jbidwatcher.auction.FilterManager.getInstance().getColumns(tabName); for (String colName : columns) { JCheckBoxMenuItem jch = menuItemMap.get(colName); jch.setState(true); @@ -180,13 +179,13 @@ public class JTabPopupMenu extends JContext { result = result.trim(); if(result.length() == 0) return; - FilterManager.getInstance().addTab(result); + com.jbidwatcher.auction.FilterManager.getInstance().addTab(result); return; } String tabName = _myTabs.getTitleAt(tabIndex); if(actionString.charAt(0) == '~') { - boolean result = FilterManager.getInstance().toggleField(tabName, actionString.substring(1)); + boolean result = com.jbidwatcher.auction.FilterManager.getInstance().toggleField(tabName, actionString.substring(1)); if(tabToProperties != null) { JTabProperties properties = tabToProperties.get(tabName); if(properties != null) { @@ -208,7 +207,7 @@ public class JTabPopupMenu extends JContext { switch(result) { case JFileChooser.APPROVE_OPTION: String fname = jfc.getSelectedFile().getAbsolutePath(); - if(!FilterManager.getInstance().exportTab(tabName, fname)) { + if(!com.jbidwatcher.auction.FilterManager.getInstance().exportTab(tabName, fname)) { JOptionPane.showMessageDialog(null, "Could not export tab [" + tabName + "].", "Export error", JOptionPane.PLAIN_MESSAGE); } return; @@ -223,7 +222,7 @@ public class JTabPopupMenu extends JContext { if(tabIndex == -1) { com.jbidwatcher.util.config.ErrorManagement.logDebug("Can't print unknown tab, must prompt..."); } else { - if(!FilterManager.getInstance().printTab(tabName)) { + if(!com.jbidwatcher.auction.FilterManager.getInstance().printTab(tabName)) { JOptionPane.showMessageDialog(null, "Could not print tab [" + tabName + "].", "Print error", JOptionPane.PLAIN_MESSAGE); } } @@ -242,7 +241,7 @@ public class JTabPopupMenu extends JContext { com.jbidwatcher.util.config.ErrorManagement.logDebug("Prompting for Delete...\n"); } else { ErrorManagement.logDebug("Deleting tab [" + tabName + "]...\n"); - if(!FilterManager.getInstance().deleteTab(tabName, eraseEntries)) { + if(!com.jbidwatcher.auction.FilterManager.getInstance().deleteTab(tabName, eraseEntries)) { JOptionPane.showMessageDialog(null, "Could not delete tab [" + tabName + "].", "Tab deletion error", JOptionPane.PLAIN_MESSAGE); } } src/com/jbidwatcher/ui/JTabPopupMenu.java @@ -7,7 +7,6 @@ package com.jbidwatcher.ui; import com.jbidwatcher.util.config.JConfig; import com.jbidwatcher.ui.config.JConfigTab; -import com.jbidwatcher.FilterManager; import javax.swing.*; import java.awt.*; @@ -57,7 +56,7 @@ public class JTabProperties extends JConfigTab implements ActionListener { apply(); _frame.setVisible(false); } else { - FilterManager.getInstance().toggleField(_tab, cmd); + com.jbidwatcher.auction.FilterManager.getInstance().toggleField(_tab, cmd); } } @@ -97,7 +96,7 @@ public class JTabProperties extends JConfigTab implements ActionListener { private static void prepareComboBox(JComboBox target) { target.removeAllItems(); - List<String> tabs = FilterManager.getInstance().allCategories(); + List<String> tabs = com.jbidwatcher.auction.FilterManager.getInstance().allCategories(); target.setEditable(true); if(tabs != null) { @@ -117,7 +116,7 @@ public class JTabProperties extends JConfigTab implements ActionListener { JPanel internal = new JPanel(); internal.setLayout(new GridLayout(0, 4, 2*10, 0)); - List<String> columns = FilterManager.getInstance().getColumns(_tab); + List<String> columns = com.jbidwatcher.auction.FilterManager.getInstance().getColumns(_tab); Object[] names = com.jbidwatcher.ui.table.TableColumnController.getInstance().getColumnNames().toArray(); Arrays.sort(names); for (Object name1 : names) { src/com/jbidwatcher/ui/JTabProperties.java @@ -10,7 +10,6 @@ import com.jbidwatcher.ui.config.JConfigTab; import com.jbidwatcher.util.config.JConfig; import com.jbidwatcher.util.config.ErrorManagement; import com.jbidwatcher.util.browser.BrowserLauncher; -import com.jbidwatcher.FilterManager; import javax.swing.*; import java.awt.event.*; @@ -123,7 +122,7 @@ public class RSSDialog extends BasicDialog { private void buildTabList() { tabList.removeAllItems(); tabList.setEditable(true); - java.util.List<String> tabs = FilterManager.getInstance().allCategories(); + java.util.List<String> tabs = com.jbidwatcher.auction.FilterManager.getInstance().allCategories(); if(tabs != null) { tabs.remove("complete"); tabs.remove("selling"); src/com/jbidwatcher/ui/RSSDialog.java @@ -9,7 +9,6 @@ package com.jbidwatcher.ui; import com.jbidwatcher.util.config.JConfig; import com.jbidwatcher.search.Searcher; import com.jbidwatcher.search.SearchManager; -import com.jbidwatcher.FilterManager; import javax.swing.*; import java.awt.*; @@ -223,7 +222,7 @@ public class SearchInfoDialog extends BasicDialog { tabList.removeAllItems(); tabList.setEditable(true); - List<String> tabs = FilterManager.getInstance().allCategories(); + List<String> tabs = com.jbidwatcher.auction.FilterManager.getInstance().allCategories(); if(tabs != null) { tabs.remove("complete"); tabs.remove("selling"); src/com/jbidwatcher/ui/SearchInfoDialog.java @@ -1,6 +1,7 @@ package com.jbidwatcher.util; import com.jbidwatcher.util.config.ErrorManagement; +import com.jbidwatcher.util.config.JConfig; import com.jbidwatcher.platform.Platform; import java.io.*; @@ -18,7 +19,7 @@ public class StringTools { public static String decodeLatin(String latinString) { // Why? Because it seems to Just Work on Windows. Argh. - if (!Platform.isMac()) return latinString; + if (!JConfig.queryConfiguration("mac", "false").equals("true")) return latinString; try { return new String(latinString.getBytes(), "ISO-8859-1"); } catch (UnsupportedEncodingException ignore) { src/com/jbidwatcher/util/StringTools.java src/com/jbidwatcher/DeletedManager.java src/com/jbidwatcher/FilterManager.java src/com/jbidwatcher/JBidWatch.java src/com/jbidwatcher/event/EventLogger.java src/com/jbidwatcher/event/EventStatus.java 1a9c7e8ed52a5999fe1da6ab00bc86d04bfcf507 Morgan Schweers cyberfox@jbidwatcher.com http://github.com/cyberfox/jbidwatcher/commit/ab85f5ce221f73f87aca4264b7386d23bddafb92 ab85f5ce221f73f87aca4264b7386d23bddafb92 2008-03-05T23:31:04-08:00 2008-03-05T23:31:04-08:00 Poke at the top-level tangle, trying to reduce it and clean it up. git-svn-id: svn://svn.jbidwatcher.com/jbidwatcher/trunk@350 b1acfa68-eb39-11db-b167-a3a8cd6b847e 3f179026a3e954ada7ed319d649c4ea8bff7b8fa Morgan Schweers cyberfox@jbidwatcher.com