Simplify tab save/restore handling (hopefully should avoid losing tab…

…s), and apply Andreas Stempfhuber's tab ordering patch. It also removes tabs which aren't currently visible from the 'Send To' list. Let's see how users react to that...

[#781 status:resolved tagged:committed]

src/com/jbidwatcher/ui/FilterManager.java

@@ -49,14 +49,14 @@ public void loadFilters() {
     mDefaultSellingTab = mList.add(new AuctionListHolder("selling", false, false));
 
     String tabName;
-    int i = 2;
+    int i = 0;
 
     do {
       tabName = JConfig.queryDisplayProperty("tabs.name." + i++);
       if (tabName != null && mList.findCategory(tabName) == null) {
         mList.add(new AuctionListHolder(tabName));
       }
-    } while (tabName != null);
+    } while (i < 3 || tabName != null);  //  Do at least the first three, and then keep going until we miss an index.
   }
 
   /**

src/com/jbidwatcher/ui/JBidTableContext.java

@@ -89,7 +89,8 @@ public void actionPerformed(ActionEvent action) {
 
       JTabbedPane tabbedPane = JTabManager.getInstance().getTabs();
       String currentTitle = tabbedPane.getTitleAt(tabbedPane.getSelectedIndex());
-      List<String> tabs = Category.categories();
+      // shows the list of tabs in the same order as the tabs
+      List<String> tabs = ListManager.getInstance().allCategories();
       if (tabs == null) {
         tabMenu.setEnabled(false);
       } else {

src/com/jbidwatcher/ui/ListManager.java

@@ -22,7 +22,8 @@ public class ListManager {
   private static ListManager sInstance = null;
 
   private ListManager() {
-    mCategoryMap = Collections.synchronizedMap(new HashMap<String, AuctionListHolder>(3));
+    // the LinkedHashMap fixes the random order of tabs
+    mCategoryMap = Collections.synchronizedMap(new LinkedHashMap<String, AuctionListHolder>(3));
   }
 
   public boolean toggleField(String tabName, String field) {
@@ -103,9 +104,7 @@ public Properties extractProperties(Properties outProps) {
       step.getUI().getColumnWidthsToProperties(outProps);
 
       String tab = step.getList().getName();
-      if (i > 2) {
-        outProps.setProperty("tabs.name." + (i - 2), tab);
-      }
+      outProps.setProperty("tabs.name." + i, tab);
 
       String KEEP_ENDED = tab + ".end.keep";
       String DELETE_NOT_MY_BID = tab + ".end.delete.notmybid";