--- a/.hgignore	Fri Oct 26 13:13:42 2012 +0200
+++ b/.hgignore	Fri Oct 26 15:32:56 2012 +0200
@@ -10,3 +10,4 @@
 syntax: glob
 target/*
 bin/*
+*~

--- a/Makefile	Fri Oct 26 13:13:42 2012 +0200
+++ b/Makefile	Fri Oct 26 15:32:56 2012 +0200
@@ -1,7 +1,7 @@
-MAVEN           = mvn
-SKIP_TESTS      = false
-REPO_LOC        = $(HOME)/.thermostat/.build/mvn_repository
-MAVEN_FLAGS     = 
+MAVEN           ?= mvn
+SKIP_TESTS      ?= false
+REPO_LOC        ?= $(HOME)/.thermostat/.build/mvn_repository
+MAVEN_FLAGS     ?= 
 
 #
 # Do not change anything below
@@ -14,7 +14,10 @@
 	MAVEN_SKIP_TEST = -Dmaven.test.skip=true
 endif
 
-all: eclipse
+# Default to cleaning the local repo and building core + eclipse
+# Cleaning the repo prevents things like not seeing build failures
+# after bundles have been renamed.
+all: clean-repo eclipse
 
 core:
 	$(MAVEN) -f $(POM) $(MAVEN_FLAGS) $(MAVEN_SKIP_TEST) clean $(GOAL)
@@ -28,7 +31,13 @@
 eclipse-test-p2: eclipse-test-deps
 	$(MAVEN) -f eclipse/test-deps-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL)
 
-eclipse: eclipse-test-p2
+jfreechart-deps: core-install
+	$(MAVEN) -f eclipse/jfreechart-bundle-wrapping/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean install
+
+jfreechart-p2: jfreechart-deps
+	$(MAVEN) -f eclipse/jfreechart-p2-repository/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL)
+
+eclipse: eclipse-test-p2 jfreechart-p2
 	$(MAVEN) -f eclipse/pom.xml $(MAVEN_FLAGS) $(REPO_FLAG) $(MAVEN_SKIP_TEST) clean $(GOAL)
 
 create-repo-dir:

--- a/bundles/src/main/java/com/redhat/thermostat/bundles/OSGiRegistry.java	Fri Oct 26 13:13:42 2012 +0200
+++ b/bundles/src/main/java/com/redhat/thermostat/bundles/OSGiRegistry.java	Fri Oct 26 15:32:56 2012 +0200
@@ -44,6 +44,7 @@
 
 import com.redhat.thermostat.bundles.impl.BundleLoader;
 import com.redhat.thermostat.common.Configuration;
+import com.redhat.thermostat.common.cli.CommandInfoNotFoundException;
 import com.redhat.thermostat.common.cli.CommandInfoSource;
 
 
@@ -53,7 +54,7 @@
 
     public abstract void setCommandInfoSource(CommandInfoSource source);
 
-    public abstract void addBundlesFor(String commandName) throws BundleException, IOException;
+    public abstract void addBundlesFor(String commandName) throws BundleException, CommandInfoNotFoundException, IOException;
 
     public static void preLoadBundles(Framework framework, List<String> bundleLocations,
             boolean printOSGiInfo) throws BundleException {

--- a/bundles/src/main/java/com/redhat/thermostat/bundles/impl/OSGiRegistryImpl.java	Fri Oct 26 13:13:42 2012 +0200
+++ b/bundles/src/main/java/com/redhat/thermostat/bundles/impl/OSGiRegistryImpl.java	Fri Oct 26 15:32:56 2012 +0200
@@ -39,6 +39,7 @@
 import com.redhat.thermostat.bundles.OSGiRegistry;
 import com.redhat.thermostat.common.Configuration;
 import com.redhat.thermostat.common.ConfigurationException;
+import com.redhat.thermostat.common.cli.CommandInfoNotFoundException;
 import com.redhat.thermostat.common.cli.CommandInfoSource;
 
 import java.io.FileNotFoundException;
@@ -86,7 +87,7 @@
     }
 
     @Override
-    public void addBundlesFor(String commandName) throws BundleException, IOException {
+    public void addBundlesFor(String commandName) throws BundleException, IOException, CommandInfoNotFoundException {
         if (configuration.getPrintOSGiInfo()) {
             System.out.println("Loading additional bundles for: " + commandName);
         }

--- a/client/core/pom.xml	Fri Oct 26 13:13:42 2012 +0200
+++ b/client/core/pom.xml	Fri Oct 26 15:32:56 2012 +0200
@@ -51,13 +51,6 @@
   <name>Thermostat Client Core</name>
 
   <dependencies>
-  
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>thermostat-laf</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -69,16 +62,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-swing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.openjdk.cacio</groupId>
-      <artifactId>cacio-tta</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
       <scope>test</scope>
@@ -110,33 +93,10 @@
       <artifactId>org.osgi.compendium</artifactId>
       <scope>provided</scope>
     </dependency>
-
-    <dependency>
-    	<groupId>com.redhat.thermostat</groupId>
-    	<artifactId>thermostat-swing-components</artifactId>
-    	<version>${project.version}</version>
-    </dependency>
   </dependencies>
 
   <build>
 
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>**/*.png</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.png</include>
-        </includes>
-      </resource>
-    </resources>
-
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
@@ -145,26 +105,16 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-Activator>com.redhat.thermostat.client.internal.osgi.ThermostatActivator</Bundle-Activator>
             <Bundle-SymbolicName>com.redhat.thermostat.client.core</Bundle-SymbolicName>
             <Export-Package>
               com.redhat.thermostat.client.osgi.service,
               com.redhat.thermostat.client.ui,
               com.redhat.thermostat.client.locale,
-              <!-- Contains Swing view providers -->
-              com.redhat.thermostat.client.swing,
               <!-- Interfaces for views, controllers, etc. -->
               com.redhat.thermostat.client.core,
               com.redhat.thermostat.client.core.controllers,
-              com.redhat.thermostat.client.core.views,
+              com.redhat.thermostat.client.core.views
             </Export-Package>
-            <Private-Package>
-              com.redhat.thermostat.client.internal,
-              com.redhat.thermostat.client.internal.config,
-              com.redhat.thermostat.client.internal.osgi,
-              com.redhat.thermostat.client.internal.ui,
-              com.redhat.thermostat.client.internal.ui.swing
-            </Private-Package>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>
           </instructions>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/core/src/main/java/com/redhat/thermostat/client/core/views/SearchFieldView.java	Fri Oct 26 15:32:56 2012 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.client.core.views;
+
+import com.redhat.thermostat.client.core.views.View;
+import com.redhat.thermostat.common.ActionListener;
+
+public interface SearchFieldView extends View {
+
+    /** For use by tests only */
+    public static final String VIEW_NAME = "searchField";
+
+    public enum SearchAction {
+        TEXT_CHANGED,
+        PERFORM_SEARCH,
+    }
+
+    public String getSearchText();
+
+    public void setSearchText(String text);
+
+    void setLabel(String label);
+
+    void setTooltip(String tooltip);
+
+    public void addActionListener(ActionListener<SearchAction> listener);
+    public void removeActionListener(ActionListener<SearchAction> listener);
+
+}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/ChangeableText.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class ChangeableText {
-
-    private final Set<TextListener> listeners = new HashSet<TextListener>();
-    private String text;
-
-    public static interface TextListener {
-        public void textChanged(ChangeableText text);
-    }
-
-    public ChangeableText(String text) {
-        this.text = text;
-    }
-
-    public synchronized void setText(String text) {
-        if (this.text.equals(text)) {
-            return;
-        }
-        this.text = text;
-        fireChanged();
-    }
-
-    public synchronized String getText() {
-        return text;
-    }
-
-    public synchronized void addListener(TextListener listener) {
-        this.listeners.add(listener);
-    }
-
-    public synchronized void removeListener(TextListener listener) {
-        this.listeners.remove(listener);
-    }
-
-    private void fireChanged() {
-        for (TextListener listener: listeners) {
-            listener.textChanged(this);
-        }
-    }
-
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/GUIClientCommand.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import org.osgi.framework.BundleContext;
-
-import com.redhat.thermostat.client.internal.osgi.ApplicationServiceProvider;
-import com.redhat.thermostat.client.internal.osgi.ContextActionServiceProvider;
-import com.redhat.thermostat.client.osgi.service.ApplicationService;
-import com.redhat.thermostat.client.osgi.service.ContextAction;
-import com.redhat.thermostat.common.cli.CommandContext;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.common.cli.OSGiContext;
-import com.redhat.thermostat.common.cli.SimpleCommand;
-
-public class GUIClientCommand extends SimpleCommand implements OSGiContext {
-
-    private BundleContext context;
-    private Main clientMain;
-
-    public GUIClientCommand(Main clientMain) {
-        this.clientMain = clientMain;
-    }
-
-    @Override
-    public void setBundleContext(BundleContext context) {
-        this.context = context;
-    }
-    
-    @Override
-    public void run(CommandContext ctx) throws CommandException {
-        ApplicationService service = new ApplicationServiceProvider();
-        
-        context.registerService(ApplicationService.class.getName(), service, null);
-        context.registerService(ContextAction.class.getName(), new ContextActionServiceProvider(), null);
-        
-        // this blocks, everything else needs to be done before
-        clientMain.run();
-
-        service.getApplicationExecutor().shutdown();
-    }
-
-    @Override
-    public String getName() {
-        return "gui";
-    }
-
-    @Override
-    public boolean isStorageRequired() {
-        return false;
-    }
-
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/HostFilterRegistry.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-
-import com.redhat.thermostat.client.core.HostFilter;
-import com.redhat.thermostat.common.ThermostatExtensionRegistry;
-
-class HostFilterRegistry extends ThermostatExtensionRegistry<HostFilter> {
-
-    private static final String FILTER = "(" + Constants.OBJECTCLASS + "=" + HostFilter.class.getName() + ")";
-
-    public HostFilterRegistry(BundleContext context) throws InvalidSyntaxException {
-        super(context, FILTER, HostFilter.class);
-    }
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/HostIconDecorator.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-import com.redhat.thermostat.client.core.HostFilter;
-import com.redhat.thermostat.client.osgi.service.HostDecorator;
-import com.redhat.thermostat.client.ui.Decorator;
-import com.redhat.thermostat.client.ui.IconDescriptor;
-import com.redhat.thermostat.client.ui.IconResource;
-import com.redhat.thermostat.common.dao.HostRef;
-import com.redhat.thermostat.common.utils.StreamUtils;
-
-public class HostIconDecorator implements HostDecorator {
-
-    private final HostFilter anyHost = new AnyHostMatcher();
-
-    @Override
-    public Decorator getDecorator() {
-        return new IconDecorator();
-    }
-
-    @Override
-    public HostFilter getFilter() {
-        return anyHost;
-    }
-
-    private static class IconDecorator implements Decorator {
-
-        private final IconDescriptor icon;
-
-        public IconDecorator() {
-            IconDescriptor icon = null;
-            try {
-                InputStream in = new FileInputStream(IconResource.HOST.getPath());
-                icon = new IconDescriptor(ByteBuffer.wrap(StreamUtils.readAll(in)));
-            } catch (IOException ioe) {
-                ioe.printStackTrace();
-            }
-            this.icon = icon;
-        }
-
-        @Override
-        public String getLabel(String originalLabel) {
-            return originalLabel;
-        }
-
-        @Override
-        public IconDescriptor getIconDescriptor() {
-            return icon;
-        }
-
-        @Override
-        public Quadrant getQuadrant() {
-            return Quadrant.MAIN;
-        }
-
-    }
-
-    private static class AnyHostMatcher implements HostFilter {
-        @Override
-        public boolean matches(HostRef toMatch) {
-            return true;
-        }
-    }
-
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/HostTreeDecoratorRegistry.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-
-import com.redhat.thermostat.client.osgi.service.HostDecorator;
-import com.redhat.thermostat.common.ThermostatExtensionRegistry;
-
-class HostTreeDecoratorRegistry extends ThermostatExtensionRegistry<HostDecorator> {
-
-    private static final String FILTER = "(" + Constants.OBJECTCLASS + "=" + HostDecorator.class.getName() + ")";
-
-    public HostTreeDecoratorRegistry(BundleContext context) throws InvalidSyntaxException {
-        super(context, FILTER, HostDecorator.class);
-    }
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/Main.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,329 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.awt.EventQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-import com.redhat.swing.laf.dolphin.DolphinLookAndFeel;
-import com.redhat.thermostat.client.core.views.ClientConfigurationView;
-import com.redhat.thermostat.client.internal.config.ConnectionConfiguration;
-import com.redhat.thermostat.client.locale.LocaleResources;
-import com.redhat.thermostat.client.osgi.service.ApplicationService;
-import com.redhat.thermostat.client.ui.ClientConfigurationController;
-import com.redhat.thermostat.client.ui.ClientConfigurationSwing;
-import com.redhat.thermostat.client.ui.MainWindowController;
-import com.redhat.thermostat.client.ui.UiFacadeFactory;
-import com.redhat.thermostat.common.ActionEvent;
-import com.redhat.thermostat.common.ActionListener;
-import com.redhat.thermostat.common.Constants;
-import com.redhat.thermostat.common.ThreadPoolTimerFactory;
-import com.redhat.thermostat.common.TimerFactory;
-import com.redhat.thermostat.common.appctx.ApplicationContext;
-import com.redhat.thermostat.common.config.ClientPreferences;
-import com.redhat.thermostat.common.config.StartupConfiguration;
-import com.redhat.thermostat.common.dao.DAOFactory;
-import com.redhat.thermostat.common.dao.MongoDAOFactory;
-import com.redhat.thermostat.common.locale.Translate;
-import com.redhat.thermostat.common.storage.Connection;
-import com.redhat.thermostat.common.storage.Connection.ConnectionListener;
-import com.redhat.thermostat.common.storage.Connection.ConnectionStatus;
-import com.redhat.thermostat.common.storage.Connection.ConnectionType;
-import com.redhat.thermostat.common.storage.MongoStorageProvider;
-import com.redhat.thermostat.common.storage.StorageProvider;
-import com.redhat.thermostat.common.utils.LoggingUtils;
-import com.redhat.thermostat.common.utils.OSGIUtils;
-import com.redhat.thermostat.utils.keyring.Keyring;
-
-public class Main {
-    
-    private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer();
-
-    private static final Logger logger = LoggingUtils.getLogger(Main.class);
-
-    private OSGIUtils serviceProvider;
-    private UiFacadeFactory uiFacadeFactory;
-    private DAOFactory daoFactory;
-    
-    public Main(Keyring keyring, UiFacadeFactory uiFacadeFactory, String[] args) {
-        ClientPreferences prefs = new ClientPreferences(keyring);
-        StartupConfiguration config = new ConnectionConfiguration(prefs);
-        StorageProvider connProv = new MongoStorageProvider(config);
-
-        DAOFactory daoFactory = new MongoDAOFactory(connProv);
-        TimerFactory timerFactory = new ThreadPoolTimerFactory(1);
-
-        init(OSGIUtils.getInstance(), uiFacadeFactory, daoFactory, timerFactory);
-    }
-
-    Main(OSGIUtils serviceProvider, UiFacadeFactory uiFacadeFactory, DAOFactory daoFactory, TimerFactory timerFactory) {
-        init(serviceProvider, uiFacadeFactory, daoFactory, timerFactory);
-    }
-
-    private void init(OSGIUtils serviceProvider, UiFacadeFactory uiFacadeFactory, DAOFactory daoFactory, TimerFactory timerFactory) {
-        this.serviceProvider = serviceProvider;
-        this.uiFacadeFactory = uiFacadeFactory;
-        this.daoFactory = daoFactory;
-        ApplicationContext.getInstance().setTimerFactory(timerFactory);
-    }
-
-    public void run() {
-        EventQueue.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-
-                // check if the user has other preferences...
-                // not that there is any reason!
-                String laf = System.getProperty("swing.defaultlaf");
-                if (laf == null) {
-                    try {
-                        UIManager.setLookAndFeel(new DolphinLookAndFeel());
-                    } catch (UnsupportedLookAndFeelException e) {
-                        logger.log(Level.WARNING, "cannot use DolphinLookAndFeel");
-                    }
-                }
-
-                // TODO: move them in an appropriate place
-                JPopupMenu.setDefaultLightWeightPopupEnabled(false);
-                UIManager.getDefaults().put("OptionPane.buttonOrientation", SwingConstants.RIGHT);
-                UIManager.getDefaults().put("OptionPane.isYesLast", true);
-                UIManager.getDefaults().put("OptionPane.sameSizeButtons", true);
-                
-                showGui();
-            }
-
-        });
-
-        try {
-            uiFacadeFactory.awaitShutdown();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
-    }
-
-    private void showGui() {
-        ApplicationService appSrv = serviceProvider.getService(ApplicationService.class);
-        final ExecutorService service = appSrv.getApplicationExecutor();
-        service.execute(new ConnectorSetup(service));
-    }
-    
-    private class ConnectorSetup implements Runnable {
-        
-        private ExecutorService service;
-        public ConnectorSetup(ExecutorService service) {
-            this.service = service;
-        }
-        
-        @Override
-        public void run() {
-            
-            Connection connection = daoFactory.getConnection();
-            connection.setType(ConnectionType.LOCAL);
-            ConnectionListener connectionListener = new ConnectionHandler(connection, service);
-            connection.addListener(connectionListener);
-            try {
-                connection.connect();
-            } catch (Throwable t) {
-                logger.log(Level.WARNING, "connection attempt failed: ", t);
-            }
-        }
-    }
-    
-    private class Connector implements Runnable {
-        private Connection connection;
-        Connector(Connection connection) {
-            this.connection = connection;
-        }
-        
-        @Override
-        public void run() {
-            try {
-                connection.connect();
-            } catch (Throwable t) {
-                logger.log(Level.WARNING, "connection attempt failed: ", t);
-            }
-        }
-    }
-    
-    private class ConnectionAttemp implements Runnable {
-        private Connection connection;
-        private ExecutorService service;
-        public ConnectionAttemp(Connection connection, ExecutorService service) {
-            this.connection = connection;
-            this.service = service;
-        }
-        
-        @Override
-        public void run() {
-            Object[] options = {
-                    translator.localize(LocaleResources.CONNECTION_WIZARD),
-                    translator.localize(LocaleResources.CONNECTION_QUIT),
-            };
-            int n = JOptionPane
-                    .showOptionDialog(
-                            null,
-                            translator.localize(LocaleResources.CONNECTION_FAILED_TO_CONNECT_DESCRIPTION),
-                            translator.localize(LocaleResources.CONNECTION_FAILED_TO_CONNECT_TITLE),
-                            JOptionPane.OK_CANCEL_OPTION,
-                            JOptionPane.ERROR_MESSAGE, null, options,
-                            options[0]);
-
-            switch (n) {
-
-            case JOptionPane.CANCEL_OPTION:
-            case JOptionPane.CLOSED_OPTION:
-            case JOptionPane.NO_OPTION:
-                uiFacadeFactory
-                        .shutdown(Constants.EXIT_UNABLE_TO_CONNECT_TO_DATABASE);
-                break;
-
-            case JOptionPane.YES_OPTION:
-            default:
-                createPreferencesDialog(connection, service);
-                break;
-            }
-        }
-    }
-    
-    private void connect(Connection connection, ExecutorService service) {
-        service.execute(new Connector(connection));
-    }
-    
-    private class ConfigDialogListener implements ActionListener<ClientConfigurationView.Action> {
-        private Connection connection;
-        private ExecutorService service;
-        public ConfigDialogListener(Connection connection, ExecutorService service) {
-            this.connection = connection;
-            this.service = service;
-        }
-        
-        @Override
-        public void actionPerformed(ActionEvent<ClientConfigurationView.Action> actionEvent) {
-            switch (actionEvent.getActionId()) {
-            case CLOSE_CANCEL:
-                uiFacadeFactory.shutdown(Constants.EXIT_UNABLE_TO_CONNECT_TO_DATABASE);
-                break;
-            
-            case CLOSE_ACCEPT:
-            default:
-                connect(connection, service);
-                break;
-            }
-        }
-    }
-    
-    private void createPreferencesDialog(final Connection connection, final ExecutorService service) {
-
-        ClientPreferences prefs = new ClientPreferences(OSGIUtils.getInstance().getService(Keyring.class));
-        ClientConfigurationView configDialog = new ClientConfigurationSwing();
-        ClientConfigurationController controller =
-                new ClientConfigurationController(prefs, configDialog);
-        
-        configDialog.addListener(new ConfigDialogListener(connection, service));
-        controller.showDialog();
-    }
-    
-    private class ConnectionHandler implements ConnectionListener {
-        private boolean retry;
-        private Connection connection;
-        private ExecutorService service;
-        public ConnectionHandler(Connection connection, ExecutorService service) {
-            this.connection = connection;
-            this.retry = true;
-            this.service = service;
-        }
-        
-        private void showConnectionAttemptWarning() {
-            SwingUtilities.invokeLater(new ConnectionAttemp(connection, service));
-        }
-        
-        @Override
-        public void changed(ConnectionStatus newStatus) {
-            if (newStatus == ConnectionStatus.CONNECTED) {
-                
-                // register the storage, so other services can request it
-                daoFactory.registerDAOsAndStorageAsOSGiServices();
-                uiFacadeFactory.setHostInfoDao(daoFactory.getHostInfoDAO());
-                uiFacadeFactory.setCpuStatDao(daoFactory.getCpuStatDAO());
-                uiFacadeFactory.setMemoryStatDao(daoFactory.getMemoryStatDAO());
-                uiFacadeFactory.setNetworkInfoDao(daoFactory.getNetworkInterfaceInfoDAO());
-
-                uiFacadeFactory.setVmInfoDao(daoFactory.getVmInfoDAO());
-                uiFacadeFactory.setVmCpuStatDao(daoFactory.getVmCpuStatDAO());
-                uiFacadeFactory.setVmMemoryStatDao(daoFactory.getVmMemoryStatDAO());
-                uiFacadeFactory.setVmGcStatDao(daoFactory.getVmGcStatDAO());
-
-                showMainWindow();
-            } else if (newStatus == ConnectionStatus.FAILED_TO_CONNECT) {
-                if (retry) {
-                    retry = false;
-                    showConnectionAttemptWarning();
-                } else {
-                    JOptionPane.showMessageDialog(
-                            null,
-                            translator.localize(LocaleResources.CONNECTION_FAILED_TO_CONNECT_DESCRIPTION),
-                            translator.localize(LocaleResources.CONNECTION_FAILED_TO_CONNECT_TITLE),
-                            JOptionPane.ERROR_MESSAGE);
-                    uiFacadeFactory.shutdown(Constants.EXIT_UNABLE_TO_CONNECT_TO_DATABASE);
-                }
-            }
-        }
-    }
-
-
-    private void showMainWindow() {
-        SwingUtilities.invokeLater(new ShowMainWindow());
-    }
-    
-    private class ShowMainWindow implements Runnable {
-        @Override
-        public void run() {
-            MainWindowController mainController = uiFacadeFactory.getMainWindow();
-            mainController.showMainMainWindow();                        
-        }
-    }
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/MainView.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.awt.event.MouseEvent;
-import java.util.List;
-
-import com.redhat.thermostat.client.core.HostFilter;
-import com.redhat.thermostat.client.core.VmFilter;
-import com.redhat.thermostat.client.core.views.BasicView;
-import com.redhat.thermostat.client.osgi.service.HostDecorator;
-import com.redhat.thermostat.client.osgi.service.MenuAction;
-import com.redhat.thermostat.client.osgi.service.VmDecorator;
-import com.redhat.thermostat.client.osgi.service.VMContextAction;
-import com.redhat.thermostat.common.ActionListener;
-import com.redhat.thermostat.common.HostsVMsLoader;
-import com.redhat.thermostat.common.dao.Ref;
-
-public interface MainView {
-
-    enum Action {
-        VISIBLE,
-        HIDDEN,
-        HOST_VM_TREE_FILTER,
-        HOST_VM_SELECTION_CHANGED,
-        SHOW_AGENT_CONFIG,
-        SHOW_CLIENT_CONFIG,
-        SWITCH_HISTORY_MODE,
-        SHOW_ABOUT_DIALOG,
-        SHUTDOWN,
-        SHOW_VM_CONTEXT_MENU,
-        VM_CONTEXT_ACTION,
-    }
-
-    void addActionListener(ActionListener<Action> capture);
-
-    void updateTree(List<HostFilter> hostFilters, List<VmFilter> vmFilters,
-            List<HostDecorator> hostDecorators, List<VmDecorator> vmDecorators,
-            HostsVMsLoader any);
-
-    String getHostVmTreeFilterText();
-    
-    void setWindowTitle(String title);
-
-    void showMainWindow();
-
-    void hideMainWindow();
-
-    Ref getSelectedHostOrVm();
-
-    void setSubView(BasicView view);
-
-    void setStatusBarPrimaryStatus(String primaryStatus);
-    
-    /**
-     * Adds a menu item to the window. Assumes the menu path is valid (has a
-     * non-zero length) and doesn't collide with existing menus.
-     */
-    void addMenu(MenuAction action);
-
-    /**
-     * Removes a menu item to the window. Assumes the menu path is valid (has a
-     * non-zero length) and doesn't collide with existing menus.
-     */
-    void removeMenu(MenuAction action);
-
-    void showVMContextActions(List<VMContextAction> actions, MouseEvent e);
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/MainWindowControllerImpl.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,512 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osgi.framework.InvalidSyntaxException;
-
-import com.redhat.thermostat.client.core.HostFilter;
-import com.redhat.thermostat.client.core.VmFilter;
-import com.redhat.thermostat.client.core.views.AgentInformationDisplayView;
-import com.redhat.thermostat.client.core.views.AgentInformationViewProvider;
-import com.redhat.thermostat.client.core.views.ClientConfigViewProvider;
-import com.redhat.thermostat.client.core.views.ClientConfigurationView;
-import com.redhat.thermostat.client.internal.MainView.Action;
-import com.redhat.thermostat.client.internal.ui.swing.AboutDialog;
-import com.redhat.thermostat.client.osgi.service.HostDecorator;
-import com.redhat.thermostat.client.osgi.service.MenuAction;
-import com.redhat.thermostat.client.osgi.service.VMContextAction;
-import com.redhat.thermostat.client.osgi.service.VmDecorator;
-import com.redhat.thermostat.client.ui.AgentInformationDisplayController;
-import com.redhat.thermostat.client.ui.AgentInformationDisplayModel;
-import com.redhat.thermostat.client.ui.ClientConfigurationController;
-import com.redhat.thermostat.client.ui.HostInformationController;
-import com.redhat.thermostat.client.ui.HostVmFilter;
-import com.redhat.thermostat.client.ui.MainWindowController;
-import com.redhat.thermostat.client.ui.SummaryController;
-import com.redhat.thermostat.client.ui.UiFacadeFactory;
-import com.redhat.thermostat.client.ui.VmInformationController;
-import com.redhat.thermostat.common.ActionEvent;
-import com.redhat.thermostat.common.ActionListener;
-import com.redhat.thermostat.common.ApplicationInfo;
-import com.redhat.thermostat.common.DefaultHostsVMsLoader;
-import com.redhat.thermostat.common.HostsVMsLoader;
-import com.redhat.thermostat.common.ThermostatExtensionRegistry;
-import com.redhat.thermostat.common.Timer;
-import com.redhat.thermostat.common.Timer.SchedulingType;
-import com.redhat.thermostat.common.appctx.ApplicationContext;
-import com.redhat.thermostat.common.config.ClientPreferences;
-import com.redhat.thermostat.common.dao.HostInfoDAO;
-import com.redhat.thermostat.common.dao.HostRef;
-import com.redhat.thermostat.common.dao.Ref;
-import com.redhat.thermostat.common.dao.VmInfoDAO;
-import com.redhat.thermostat.common.dao.VmRef;
-import com.redhat.thermostat.common.utils.LoggingUtils;
-import com.redhat.thermostat.common.utils.OSGIUtils;
-import com.redhat.thermostat.utils.keyring.Keyring;
-
-public class MainWindowControllerImpl implements MainWindowController {
-
-    private static final Logger logger = LoggingUtils.getLogger(MainWindowControllerImpl.class);
-
-    private final CopyOnWriteArrayList<HostFilter> hostFilters = new CopyOnWriteArrayList<>();
-    private final CopyOnWriteArrayList<VmFilter> vmFilters = new CopyOnWriteArrayList<>();
-
-    private final CopyOnWriteArrayList<HostDecorator> hostTreeDecorators = new CopyOnWriteArrayList<>();
-    private final CopyOnWriteArrayList<VmDecorator> vmTreeDecorators = new CopyOnWriteArrayList<>();
-
-    private Timer backgroundUpdater;
-
-    private MainView view;
-
-    private final HostInfoDAO hostsDAO;
-    private final VmInfoDAO vmsDAO;
-
-    private ApplicationInfo appInfo;
-
-    private UiFacadeFactory facadeFactory;
-
-    private MenuRegistry menuRegistry;
-    private ActionListener<ThermostatExtensionRegistry.Action> menuListener =
-            new ActionListener<ThermostatExtensionRegistry.Action>()
-    {
-        @Override
-        public void actionPerformed(
-            ActionEvent<ThermostatExtensionRegistry.Action> actionEvent) {
-            MenuAction action = (MenuAction) actionEvent.getPayload();
-
-            switch (actionEvent.getActionId()) {
-            case SERVICE_ADDED:
-                view.addMenu(action);
-                break;
-
-            case SERVICE_REMOVED:
-                view.removeMenu(action);
-                break;
-
-            default:
-                logger.log(Level.WARNING, "received unknown event from MenuRegistry: " +
-                                           actionEvent.getActionId());
-                break;
-            }
-        }
-    };
-
-    private HostVmFilter searchFilter;
-    private VmFilterRegistry vmFilterRegistry;
-    private HostFilterRegistry hostFilterRegistry;
-
-    private ActionListener<ThermostatExtensionRegistry.Action> hostFilterListener = new UpdateListAndTree<>(HostFilter.class, hostFilters);
-    private ActionListener<ThermostatExtensionRegistry.Action> vmFilterListener = new UpdateListAndTree<>(VmFilter.class, vmFilters);
-
-    private HostTreeDecoratorRegistry hostDecoratorRegistry;
-    private VMTreeDecoratorRegistry vmDecoratorRegistry;
-
-    private ActionListener<ThermostatExtensionRegistry.Action> hostDecoratorListener = new UpdateListAndTree<>(HostDecorator.class, hostTreeDecorators);
-    private ActionListener<ThermostatExtensionRegistry.Action> vmDecoratorListener = new UpdateListAndTree<>(VmDecorator.class, vmTreeDecorators);
-
-    private VMInformationRegistry vmInfoRegistry;
-    private ActionListener<ThermostatExtensionRegistry.Action> vmInfoRegistryListener =
-            new ActionListener<ThermostatExtensionRegistry.Action> ()
-    {
-        public void actionPerformed(com.redhat.thermostat.common.ActionEvent<ThermostatExtensionRegistry.Action>
-                                    actionEvent)
-        {
-            updateView();
-        };
-    };
-            
-    private boolean showHistory;
-
-    private VmInformationControllerProvider vmInfoControllerProvider;
-
-    public MainWindowControllerImpl(UiFacadeFactory facadeFactory, MainView view, RegistryFactory registryFactory, HostInfoDAO hostsDao, VmInfoDAO vmsDAO)
-    {
-        try {
-            vmFilterRegistry = registryFactory.createVmFilterRegistry();
-            hostFilterRegistry = registryFactory.createHostFilterRegistry();
-            hostDecoratorRegistry = registryFactory.createHostTreeDecoratorRegistry();
-            vmDecoratorRegistry = registryFactory.createVMTreeDecoratorRegistry();
-            menuRegistry = registryFactory.createMenuRegistry();
-            vmInfoRegistry = registryFactory.createVMInformationRegistry();
-            
-        } catch (InvalidSyntaxException e) {
-            throw new RuntimeException(e);
-        }
-
-        searchFilter = new HostVmFilter();
-        hostFilters.add(searchFilter);
-        vmFilters.add(searchFilter);
-        
-        this.facadeFactory = facadeFactory;
-
-        this.hostsDAO = hostsDao;
-        this.vmsDAO = vmsDAO;
-
-        initView(view);
-
-        vmInfoControllerProvider = new VmInformationControllerProvider();
-
-        appInfo = new ApplicationInfo();
-        view.setWindowTitle(appInfo.getName());
-        initializeTimer();
-
-        updateView();
-
-        installListenersAndStartRegistries();
-    }
-
-    /**
-     * This method is for testing purposes only
-     */
-    HostVmFilter getSearchFilter() {
-        return searchFilter;
-    }
-    
-    /**
-     * This method is for testing purposes only
-     */ 
-    List<VmDecorator> getVmTreeDecorators() {
-        return vmTreeDecorators;
-    }
-    
-    /**
-     * This method is for testing purposes only
-     */
-    ActionListener<ThermostatExtensionRegistry.Action> getMenuListener() {
-        return menuListener;
-    }
-    
-    private void initializeTimer() {
-        ApplicationContext ctx = ApplicationContext.getInstance();
-        backgroundUpdater = ctx.getTimerFactory().createTimer();
-        backgroundUpdater.setAction(new Runnable() {
-            @Override
-            public void run() {
-                doUpdateTreeAsync();
-            }
-        });
-        backgroundUpdater.setInitialDelay(0);
-        backgroundUpdater.setDelay(3);
-        backgroundUpdater.setTimeUnit(TimeUnit.SECONDS);
-        backgroundUpdater.setSchedulingType(SchedulingType.FIXED_RATE);
-    }
-
-    private void startBackgroundUpdates() {
-        backgroundUpdater.start();
-    }
-
-    public void stopBackgroundUpdates() {
-        backgroundUpdater.stop();
-    }
-
-    @Override
-    public void setHostVmTreeFilter(String filter) {
-        this.searchFilter.setFilter(filter);
-        doUpdateTreeAsync();
-    }
-
-    public void doUpdateTreeAsync() {
-        HostsVMsLoader loader = new DefaultHostsVMsLoader(hostsDAO, vmsDAO, !showHistory);
-        view.updateTree(hostFilters, vmFilters, hostTreeDecorators, vmTreeDecorators, loader);
-    }
-
-    private void initView(MainView mainView) {
-        this.view = mainView;
-        mainView.addActionListener(new ActionListener<MainView.Action>() {
-
-            @Override
-            public void actionPerformed(ActionEvent<MainView.Action> evt) {
-                MainView.Action action = evt.getActionId();
-                switch (action) {
-                case VISIBLE:
-                    startBackgroundUpdates();
-                    break;
-                case HIDDEN:
-                    stopBackgroundUpdates();
-                    break;
-                case HOST_VM_SELECTION_CHANGED:
-                    updateView();
-                    break;
-                case HOST_VM_TREE_FILTER:
-                    String filter = view.getHostVmTreeFilterText();
-                    setHostVmTreeFilter(filter);
-                    break;
-                case SHOW_AGENT_CONFIG:
-                    showAgentConfiguration();
-                    break;
-                case SHOW_CLIENT_CONFIG:
-                    showConfigureClientPreferences();
-                    break;
-                case SWITCH_HISTORY_MODE:
-                    switchHistoryMode();
-                    break;
-                case SHOW_ABOUT_DIALOG:
-                    showAboutDialog();
-                    break;
-                case SHOW_VM_CONTEXT_MENU:
-                    showContextMenu(evt);
-                    break;
-                case VM_CONTEXT_ACTION:
-                    handleVMHooks(evt);
-                    break;
-                case SHUTDOWN:
-                    shutdownApplication();
-                    break;
-                default:
-                    throw new IllegalStateException("unhandled action");
-                }
-            }
-
-        });
-    }
-
-    private void shutdownApplication() {
-        uninstallListenersAndStopRegistries();
-
-        view.hideMainWindow();
-        ApplicationContext.getInstance().getTimerFactory().shutdown();
-        shutdownOSGiFramework();
-    }
-
-    private void installListenersAndStartRegistries() {
-        menuRegistry.addActionListener(menuListener);
-        menuRegistry.start();
-
-        hostFilterRegistry.addActionListener(hostFilterListener);
-        hostFilterRegistry.start();
-
-        vmFilterRegistry.addActionListener(vmFilterListener);
-        vmFilterRegistry.start();
-
-        hostDecoratorRegistry.addActionListener(hostDecoratorListener);
-        hostDecoratorRegistry.start();
-
-        vmDecoratorRegistry.addActionListener(vmDecoratorListener);
-        vmDecoratorRegistry.start();
-
-        vmInfoRegistry.addActionListener(vmInfoRegistryListener);
-        vmInfoRegistry.start();
-    }
-
-    private void uninstallListenersAndStopRegistries() {
-        menuRegistry.removeActionListener(menuListener);
-        menuListener = null;
-        menuRegistry.stop();
-
-        hostFilterRegistry.removeActionListener(hostFilterListener);
-        hostFilterListener = null;
-        hostFilterRegistry.stop();
-
-        vmFilterRegistry.removeActionListener(vmFilterListener);
-        vmFilterListener = null;
-        vmFilterRegistry.stop();
-
-        hostDecoratorRegistry.removeActionListener(hostDecoratorListener);
-        hostDecoratorListener = null;
-        hostDecoratorRegistry.stop();
-
-        vmDecoratorRegistry.removeActionListener(vmDecoratorListener);
-        vmDecoratorListener = null;
-        vmDecoratorRegistry.stop();
-
-        vmInfoRegistry.removeActionListener(vmInfoRegistryListener);
-        vmInfoRegistryListener = null;
-        vmInfoRegistry.stop();
-    }
-
-    private void shutdownOSGiFramework() {
-        facadeFactory.shutdown();
-    }
-
-    private void showContextMenu(ActionEvent<Action> evt) {
-        List<VMContextAction> toShow = new ArrayList<>();
-        VmRef vm = (VmRef) view.getSelectedHostOrVm();
-
-        logger.log(Level.INFO, "registering applicable VMContextActions actions to show");
-
-        for (VMContextAction action : facadeFactory.getVMContextActions()) {
-            if (action.getFilter().matches(vm)) {
-                toShow.add(action);
-            }
-        }
-
-        view.showVMContextActions(toShow, (MouseEvent)evt.getPayload());
-    }
-
-    private void handleVMHooks(ActionEvent<MainView.Action> event) {
-        Object payload = event.getPayload();
-        if (payload instanceof VMContextAction) { 
-            try {
-                VMContextAction action = (VMContextAction) payload;
-                action.execute((VmRef) view.getSelectedHostOrVm());
-            } catch (Throwable error) {
-                logger.log(Level.SEVERE, "");
-            }
-        }
-    }
-    
-    @Override
-    public void showMainMainWindow() {
-        view.showMainWindow();
-    }
-
-    private void showAboutDialog() {
-        AboutDialog aboutDialog = new AboutDialog(appInfo);
-        aboutDialog.setModal(true);
-        aboutDialog.pack();
-        aboutDialog.setVisible(true);
-    }
-
-    private void showAgentConfiguration() {
-        AgentInformationDisplayModel model = new AgentInformationDisplayModel();
-        AgentInformationViewProvider viewProvider = OSGIUtils.getInstance().getService(AgentInformationViewProvider.class);
-        AgentInformationDisplayView view = viewProvider.createView();
-        AgentInformationDisplayController controller = new AgentInformationDisplayController(model, view);
-        controller.showView();
-    }
-
-    private void showConfigureClientPreferences() {
-        ClientPreferences prefs = new ClientPreferences(OSGIUtils.getInstance().getService(Keyring.class));
-        ClientConfigViewProvider viewProvider = OSGIUtils.getInstance().getService(ClientConfigViewProvider.class);
-        ClientConfigurationView view = viewProvider.createView();
-        ClientConfigurationController controller = new ClientConfigurationController(prefs, view);
-        controller.showDialog();
-    }
-
-    private void switchHistoryMode() {
-        showHistory = !showHistory;
-        doUpdateTreeAsync();
-    }
-
-    private void updateView() {
-        // this is quite an ugly method. there must be a cleaner way to do this
-        Ref ref = view.getSelectedHostOrVm();
-
-        if (ref == null) {
-            SummaryController controller = facadeFactory.getSummary();
-            view.setSubView(controller.getView());
-        } else if (ref instanceof HostRef) {
-            HostRef hostRef = (HostRef) ref;
-            HostInformationController hostController = facadeFactory.getHostController(hostRef);
-            view.setSubView(hostController.getView());
-            view.setStatusBarPrimaryStatus("host: " + hostRef.getHostName() + ", id: " + hostRef.getAgentId());
-        } else if (ref instanceof VmRef) {
-            VmRef vmRef = (VmRef) ref;
-            VmInformationController vmInformation =
-                    vmInfoControllerProvider.getVmInfoController(vmRef);
-            view.setSubView(vmInformation.getView());
-            view.setStatusBarPrimaryStatus("vm: " + vmRef.getName() + ", pid: " + vmRef.getStringID() +
-                                           ", host: " + vmRef.getAgent().getHostName());
-        } else {
-            throw new IllegalArgumentException("unknown type of ref");
-        }
-    }
-
-    private class UpdateListAndTree<T> implements ActionListener<ThermostatExtensionRegistry.Action> {
-
-        private final Class<T> extensionClass;
-        private final CopyOnWriteArrayList<T> extensionList;
-
-        public UpdateListAndTree(Class<T> extensionClass, CopyOnWriteArrayList<T> addRemoveExtensionsFrom) {
-            this.extensionClass = extensionClass;
-            this.extensionList = addRemoveExtensionsFrom;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public void actionPerformed(ActionEvent<com.redhat.thermostat.common.ThermostatExtensionRegistry.Action> actionEvent) {
-
-            Object payload = actionEvent.getPayload();
-            if (!extensionClass.isInstance(payload)) {
-                throw new IllegalArgumentException("unexpected payload type. expected a " + extensionClass.getName() + " but got " + payload.getClass().getName());
-            }
-
-            T filter = (T) payload;
-
-            switch (actionEvent.getActionId()) {
-            case SERVICE_ADDED:
-                extensionList.add(filter);
-                doUpdateTreeAsync();
-                break;
-
-            case SERVICE_REMOVED:
-                extensionList.remove(filter);
-                doUpdateTreeAsync();
-                break;
-
-            default:
-                logger.log(Level.WARNING, "received unknown event from ExtensionRegistry: " +
-                                           actionEvent.getActionId());
-                break;
-            }
-        }
-    }
-
-    private class VmInformationControllerProvider {
-        private VmInformationController lastSelectedVM;
-        private Map<VmRef, Integer> selectedForVM = new ConcurrentHashMap<>();
-        
-        VmInformationController getVmInfoController(VmRef vmRef) {
-            int id = 0;
-            if (lastSelectedVM != null) {
-                id = lastSelectedVM.getSelectedChildID();
-            }
-            
-            lastSelectedVM = facadeFactory.getVmController(vmRef);
-            if (!lastSelectedVM.selectChildID(id)) {
-                Integer _id = selectedForVM.get(vmRef);
-                id = _id != null? _id : 0;
-                lastSelectedVM.selectChildID(id);
-            }
-
-            selectedForVM.put(vmRef, id);
-            
-            return lastSelectedVM;
-        }
-    }
-
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/MenuRegistry.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-package com.redhat.thermostat.client.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-
-import com.redhat.thermostat.client.osgi.service.MenuAction;
-import com.redhat.thermostat.common.ThermostatExtensionRegistry;
-
-public class MenuRegistry extends ThermostatExtensionRegistry<MenuAction> {
-
-    private static final String FILTER = "(" + Constants.OBJECTCLASS + "=" + MenuAction.class.getName() + ")";
-
-    public MenuRegistry(BundleContext context) throws InvalidSyntaxException {
-    	super(context, FILTER, MenuAction.class);
-    }
-
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/RegistryFactory.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-
-class RegistryFactory {
-
-    private BundleContext context;
-    RegistryFactory(BundleContext context) {
-        this.context = context;
-    }
-
-    HostTreeDecoratorRegistry createHostTreeDecoratorRegistry() throws InvalidSyntaxException {
-        return new HostTreeDecoratorRegistry(context);
-    }
-    
-    VMTreeDecoratorRegistry createVMTreeDecoratorRegistry() throws InvalidSyntaxException {
-        return new VMTreeDecoratorRegistry(context);
-    }
-    
-    HostFilterRegistry createHostFilterRegistry() throws InvalidSyntaxException {
-        return new HostFilterRegistry(context);
-    }
-
-    VmFilterRegistry createVmFilterRegistry() throws InvalidSyntaxException {
-        return new VmFilterRegistry(context);
-    }
-    
-    MenuRegistry createMenuRegistry() throws InvalidSyntaxException {
-        return new MenuRegistry(context);
-    }
-    
-    VMInformationRegistry createVMInformationRegistry() throws InvalidSyntaxException {
-        return new VMInformationRegistry(context);
-    }
-}

--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/UiFacadeFactoryImpl.java	Fri Oct 26 13:13:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.client.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-
-import org.osgi.framework.BundleContext;
-
-import com.redhat.thermostat.client.core.VmInformationService;
-import com.redhat.thermostat.client.core.views.HostInformationViewProvider;
-import com.redhat.thermostat.client.core.views.SummaryViewProvider;
-import com.redhat.thermostat.client.core.views.VmInformationViewProvider;
-import com.redhat.thermostat.client.osgi.service.VMContextAction;
-import com.redhat.thermostat.client.ui.HostInformationController;
-import com.redhat.thermostat.client.ui.MainWindow;
-import com.redhat.thermostat.client.ui.MainWindowController;
-import com.redhat.thermostat.client.ui.SummaryController;
-import com.redhat.thermostat.client.ui.UiFacadeFactory;
-import com.redhat.thermostat.client.ui.VmInformationController;
-import com.redhat.thermostat.common.dao.CpuStatDAO;
-import com.redhat.thermostat.common.dao.HostInfoDAO;
-import com.redhat.thermostat.common.dao.HostRef;
-import com.redhat.thermostat.common.dao.MemoryStatDAO;
-import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO;
-import com.redhat.thermostat.common.dao.VmCpuStatDAO;
-import com.redhat.thermostat.common.dao.VmGcStatDAO;
-import com.redhat.thermostat.common.dao.VmInfoDAO;
-import com.redhat.thermostat.common.dao.VmMemoryStatDAO;
-import com.redhat.thermostat.common.dao.VmRef;
-import com.redhat.thermostat.common.utils.OSGIUtils;
-
-public class UiFacadeFactoryImpl implements UiFacadeFactory {
-
-    private CountDownLatch shutdown = new CountDownLatch(1);
-
-    private Collection<VmInformationService> vmInformationServices = new ArrayList<>();
-    private Collection<VMContextAction> contextAction = new ArrayList<>();
-
-    private BundleContext context;
-
-    private HostInfoDAO hostInfoDao;
-    private CpuStatDAO cpuStatDao;
-    private MemoryStatDAO memoryStatDao;
-    private NetworkInterfaceInfoDAO networkInfoDao;
-
-    private VmInfoDAO vmInfoDao;
-    private VmCpuStatDAO vmCpuStatDao;
-    private VmMemoryStatDAO vmMemoryStatDao;
-    private VmGcStatDAO vmGcStatDao;
-
-    private OSGIUtils serviceProvider;
-    
-    UiFacadeFactoryImpl(OSGIUtils serviceProvider, BundleContext context) {
-        this.context = context;
-        this.serviceProvider = serviceProvider;
-    }
-    
-    public UiFacadeFactoryImpl(BundleContext context) {
-        this(OSGIUtils.getInstance(), context);
-    }
-
-    @Override
-    public void setHostInfoDao(HostInfoDAO hostInfoDao) {
-        this.hostInfoDao = hostInfoDao;
-    }
-
-    public void setCpuStatDao(CpuStatDAO cpuStatDao) {
-        this.cpuStatDao = cpuStatDao;
-    }
-
-    public void setMemoryStatDao(MemoryStatDAO memoryStatDao) {
-        this.memoryStatDao = memoryStatDao;
-    }
-
-    public void setNetworkInfoDao(NetworkInterfaceInfoDAO networkInfoDao) {
-        this.networkInfoDao = networkInfoDao;
-    }
-
-    public void setVmInfoDao(VmInfoDAO vmInfoDao) {
-        this.vmInfoDao = vmInfoDao;
-    }
-
-    public void setVmCpuStatDao(VmCpuStatDAO vmCpuStatDao) {
-        this.vmCpuStatDao = vmCpuStatDao;
-    }
-
-    @Override
-    public void setVmMemoryStatDao(VmMemoryStatDAO vmMemoryStatDao) {
-        this.vmMemoryStatDao = vmMemoryStatDao;
-    }
-
-    @Override
-    public void setVmGcStatDao(VmGcStatDAO vmGcStatDao) {
-        this.vmGcStatDao = vmGcStatDao;
-    }
-
-    @Override
-    public MainWindowController getMainWindow() {
-        MainView mainView = new MainWindow();
-        RegistryFactory registryFactory = new RegistryFactory(context);
-        return new MainWindowControllerImpl(this, mainView, registryFactory, hostInfoDao, vmInfoDao);
-    }
-
-    @Override
-    public SummaryController getSummary() {
-        SummaryViewProvider viewProvider = serviceProvider.getService(SummaryViewProvider.class);
-        return new SummaryController(hostInfoDao, vmInfoDao, viewProvider);
-    }
-
-    @Override
-    public HostInformationController getHostController(HostRef ref) {
-        HostInformationViewProvider viewProvider = serviceProvider.getService(HostInformationViewProvider.class);
-        return new HostInformationController(hostInfoDao, networkInfoDao, cpuStatDao, memoryStatDao, ref, viewProvider);
-    }
-
-    @Override
-    public VmInformationController getVmController(VmRef ref) {
-        VmInformationViewProvider viewProvider = serviceProvider.getService(VmInformationViewProvider.class);
-        return new VmInformationController(this, vmInfoDao, vmCpuStatDao, vmMemoryStatDao, vmGcStatDao, ref, viewProvider);
-    }
-
-    @Override
-    public Collection<VmInformationService> getVmInformationServices() {
-        return vmInformationServices;
-    }
-
-    @Override
-    public void addVmInformationService(VmInformationService vmInfoService) {
-        vmInformationServices.add(vmInfoService);
-    }
-
-    @Override
-    public void removeVmInformationService(VmInformationService vmInfoService) {
-        vmInformationServices.remove(vmInfoService);
-    }
-
-    @Override
-    public Collection<VMContextAction> getVMContextActions() {
-        return contextAction;
-    }
-
-    @Override
-    public void addVMContextAction(VMContextAction service) {
-        contextAction.add(service);
-    }
-
-    @Override
-    public void shutdown() {
-        shutdown.countDown();
-    }
-
-    @Override
-    public void shutdown(int exitCode) {
-        // TODO implement returning exit codes
-        shutdown();
-    }
-
-    @Override
-    public void awaitShutdown() throws InterruptedException {
-        shutdown.await();
-    }
-
-}