EDT violations--

src/uk/co/md87/evetool/ui/pages/ListablePage.java

@@ -24,11 +24,15 @@ package uk.co.md87.evetool.ui.pages;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import java.util.concurrent.ExecutionException;
+import javax.swing.JLabel;
 import javax.swing.JSeparator;
 
+import javax.swing.SwingWorker;
 import net.miginfocom.swing.MigLayout;
 
 import uk.co.md87.evetool.AccountManager;
@@ -94,47 +98,94 @@ public abstract class ListablePage<T extends Listable> extends Page implements A
     protected void updatePage() {
         removeAll();
 
-        final List<T> list = getListables();
-        final ListableParser parser = new ListableParser(list.get(0).getClass());
+        add(new JLabel("Loading..."));
 
-        if (config.sortOrder != null) {
-            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
+        new UpdateWorker().execute();
+    }
+
+    protected abstract List<T> getListables();
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        new ListableConfigDialog(window, this, config, getListables().get(0)).setVisible(true);
+    }
+    
+    protected class UpdateResult {
+        
+        private final List<T> list;
+        private final ListableParser parser;
+
+        public UpdateResult(List<T> list, ListableParser parser) {
+            this.list = list;
+            this.parser = parser;
         }
 
-        String lastGroup = null;
-        boolean first = true;
+        public List<T> getList() {
+            return list;
+        }
 
-        for (T listable : list) {
-            if (config.group != null &&
-                    (!(config.group instanceof CompoundConfigElement)
-                    || ((CompoundConfigElement) config.group).getElements().length > 0)) {
-                final String thisGroup = config.group.getValue(listable, parser);
+        public ListableParser getParser() {
+            return parser;
+        }
+    }
 
-                if (lastGroup == null || !thisGroup.equals(lastGroup)) {
-                    first = true;
-                    lastGroup = thisGroup;
-                    add(new HeaderPanel(lastGroup), "growx, pushx");
-                }
-            }
+    protected class UpdateWorker extends SwingWorker<UpdateResult, Void> {
+
+        @Override
+        protected UpdateResult doInBackground() throws Exception {
+            final List<T> list = new ArrayList<T>(getListables());
+            final ListableParser parser = new ListableParser(list.get(0).getClass());
 
-            if (first) {
-                first = false;
-            } else {
-                add(new JSeparator(), "growx, pushx");
+            if (config.sortOrder != null) {
+                Collections.sort(list, new ListableComparator(config.sortOrder, parser));
             }
 
-            add(new ListablePanel(listable, parser, config), "growx, pushx");
+            return new UpdateResult(list, parser);
         }
 
-        revalidate();
-    }
+        @Override
+        protected void done() {
+            try {
+                final UpdateResult res = get();
+
+                removeAll();
+
+                String lastGroup = null;
+                boolean first = true;
+
+                for (T listable : res.getList()) {
+                    if (config.group != null &&
+                            (!(config.group instanceof CompoundConfigElement)
+                            || ((CompoundConfigElement) config.group)
+                            .getElements().length > 0)) {
+                        final String thisGroup = config.group.getValue(listable,
+                                res.getParser());
+
+                        if (lastGroup == null || !thisGroup.equals(lastGroup)) {
+                            first = true;
+                            lastGroup = thisGroup;
+                            add(new HeaderPanel(lastGroup), "growx, pushx");
+                        }
+                    }
+
+                    if (first) {
+                        first = false;
+                    } else {
+                        add(new JSeparator(), "growx, pushx");
+                    }
+
+                    add(new ListablePanel(listable, res.getParser(), config), "growx, pushx");
+                }
 
-    protected abstract List<T> getListables();
+                revalidate();
+            } catch (ExecutionException ex) {
+
+            } catch (InterruptedException ex) {
+
+            }
+        }
 
-    /** {@inheritDoc} */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        new ListableConfigDialog(window, this, config, getListables().get(0)).setVisible(true);
     }
 
 }