Mercurial > hg > release > thermostat-0.5
changeset 799:15afbd5a66c4
Move Host Overview to own bundle
In order to better modularize Thermostat clients and better use our
plugin API, I will be posting a series of commites to move views and
controllers from the client-core and -swing bundles into their own
bundles. This commit takes the first step in this direction by moving the
Host Overview code into its own core and swing bundles. Additionally,
this commit adds functionality to add dynamic host-related controllers
using the HostInformationService interface.
Reviewed-by: vanaltj, jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004152.html
line wrap: on
line diff
--- a/client/core/src/main/java/com/redhat/thermostat/client/core/HostInformationService.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/core/HostInformationService.java Tue Nov 27 14:45:51 2012 -0500 @@ -42,7 +42,7 @@ public interface HostInformationService extends InformationService { @Override - HostFilter getFilter(); + public HostFilter getFilter(); - HostInformationServiceController getInformationServiceController(HostRef ref); + public HostInformationServiceController getInformationServiceController(HostRef ref); }
--- a/client/core/src/main/java/com/redhat/thermostat/client/core/views/HostInformationView.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/core/views/HostInformationView.java Tue Nov 27 14:45:51 2012 -0500 @@ -39,7 +39,7 @@ public abstract class HostInformationView extends BasicView implements UIComponent { - public abstract void addChildView(String title, BasicView view); + public abstract void addChildView(String title, UIComponent view); public abstract void removeChildView(String title);
--- a/client/core/src/main/java/com/redhat/thermostat/client/core/views/HostOverviewView.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +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.core.views; - - -public abstract class HostOverviewView extends BasicView implements UIComponent { - - public abstract void setHostName(String newHostName); - - public abstract void setCpuModel(String newCpuModel); - - public abstract void setCpuCount(String newCpuCount); - - public abstract void setTotalMemory(String newTotalMemory); - - public abstract void setOsName(String newOsName); - - public abstract void setOsKernel(String newOsKernel); - - public abstract void setNetworkTableColumns(Object[] columns); - - public abstract void setInitialNetworkTableData(Object[][] table); - - public abstract void updateNetworkTableData(int row, int column, String data); -}
--- a/client/core/src/main/java/com/redhat/thermostat/client/core/views/HostOverviewViewProvider.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +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.core.views; - -public interface HostOverviewViewProvider extends ViewProvider { - - @Override - public HostOverviewView createView(); -}
--- a/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/locale/LocaleResources.java Tue Nov 27 14:45:51 2012 -0500 @@ -108,28 +108,10 @@ HOME_PANEL_SECTION_ISSUES, HOME_PANEL_NO_ISSUES, - HOST_INFO_TAB_OVERVIEW, HOST_INFO_TAB_MEMORY, HOST_INFO_TAB_CPU, HOST_INFO_TAB_IO, - HOST_OVERVIEW_SECTION_BASICS, - HOST_OVERVIEW_SECTION_HARDWARE, - HOST_OVERVIEW_SECTION_SOFTWARE, - - HOST_INFO_HOSTNAME, - HOST_INFO_CPU_COUNT, - HOST_INFO_CPU_MODEL, - HOST_INFO_OS_NAME, - HOST_INFO_OS_KERNEL, - - HOST_INFO_MEMORY_TOTAL, - HOST_INFO_NETWORK, - - NETWORK_INTERFACE_COLUMN, - NETWORK_IPV4_COLUMN, - NETWORK_IPV6_COLUMN, - HOST_CPU_SECTION_OVERVIEW, HOST_CPU_ID, HOST_CPU_USAGE_CHART_TIME_LABEL,
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostCpuController.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostCpuController.java Tue Nov 27 14:45:51 2012 -0500 @@ -44,6 +44,7 @@ import com.redhat.thermostat.client.core.views.HostCpuView; import com.redhat.thermostat.client.core.views.HostCpuViewProvider; import com.redhat.thermostat.client.core.views.BasicView.Action; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.locale.LocaleResources; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; @@ -153,7 +154,7 @@ } } - public BasicView getView() { + public UIComponent getView() { return view; }
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostInformationController.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostInformationController.java Tue Nov 27 14:45:51 2012 -0500 @@ -36,18 +36,20 @@ package com.redhat.thermostat.client.ui; +import java.util.Collection; + +import com.redhat.thermostat.client.core.HostInformationService; +import com.redhat.thermostat.client.core.controllers.HostInformationServiceController; import com.redhat.thermostat.client.core.views.BasicView; import com.redhat.thermostat.client.core.views.HostCpuViewProvider; import com.redhat.thermostat.client.core.views.HostInformationView; import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.HostMemoryViewProvider; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; import com.redhat.thermostat.client.locale.LocaleResources; 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.locale.Translate; import com.redhat.thermostat.common.utils.OSGIUtils; @@ -55,31 +57,31 @@ private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer(); - private final HostOverviewController overviewController; private final HostCpuController cpuController; private final HostMemoryController memoryController; private final HostInformationView view; - public HostInformationController(HostInfoDAO hostInfoDao, NetworkInterfaceInfoDAO networkInfoDao, CpuStatDAO cpuStatDao, MemoryStatDAO memoryStatDao, HostRef ref, HostInformationViewProvider provider) { + public HostInformationController(UiFacadeFactory uiFacadeFactory, HostInfoDAO hostInfoDao, CpuStatDAO cpuStatDao, MemoryStatDAO memoryStatDao, HostRef ref, HostInformationViewProvider provider) { OSGIUtils utils = OSGIUtils.getInstance(); HostCpuViewProvider hostCpuProvider = utils.getService(HostCpuViewProvider.class); - HostOverviewViewProvider hostOverviewProvider = utils.getService(HostOverviewViewProvider.class); HostMemoryViewProvider hostMemoryProvider = utils.getService(HostMemoryViewProvider.class); - overviewController = new HostOverviewController(hostInfoDao, networkInfoDao, ref, hostOverviewProvider); cpuController = new HostCpuController(hostInfoDao, cpuStatDao, ref, hostCpuProvider); memoryController = new HostMemoryController(hostInfoDao, memoryStatDao, ref, hostMemoryProvider); view = provider.createView(); - view.addChildView(translator.localize(LocaleResources.HOST_INFO_TAB_OVERVIEW), getOverviewController().getView()); view.addChildView(translator.localize(LocaleResources.HOST_INFO_TAB_CPU), getCpuController().getView()); view.addChildView(translator.localize(LocaleResources.HOST_INFO_TAB_MEMORY), getMemoryController().getView()); - - } - - public HostOverviewController getOverviewController() { - return overviewController; + + Collection<HostInformationService> hostInfoServices = uiFacadeFactory.getHostInformationServices(); + for (HostInformationService hostInfoService : hostInfoServices) { + if (hostInfoService.getFilter().matches(ref)) { + HostInformationServiceController ctrl = hostInfoService.getInformationServiceController(ref); + String name = ctrl.getLocalizedName(); + view.addChildView(name, ctrl.getView()); + } + } } public HostCpuController getCpuController() {
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostMemoryController.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostMemoryController.java Tue Nov 27 14:45:51 2012 -0500 @@ -45,6 +45,7 @@ import com.redhat.thermostat.client.core.views.HostMemoryViewProvider; import com.redhat.thermostat.client.core.views.BasicView.Action; import com.redhat.thermostat.client.core.views.HostMemoryView.GraphVisibilityChangeListener; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.locale.LocaleResources; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; @@ -138,7 +139,7 @@ } } - public BasicView getView() { + public UIComponent getView() { return view; }
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/HostOverviewController.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +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.ui; - -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; -import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; - -import com.redhat.thermostat.client.core.views.BasicView; -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; -import com.redhat.thermostat.client.core.views.BasicView.Action; -import com.redhat.thermostat.client.locale.LocaleResources; -import com.redhat.thermostat.common.ActionEvent; -import com.redhat.thermostat.common.ActionListener; -import com.redhat.thermostat.common.NotImplementedException; -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.dao.HostInfoDAO; -import com.redhat.thermostat.common.dao.HostRef; -import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; -import com.redhat.thermostat.common.locale.Translate; -import com.redhat.thermostat.common.utils.DisplayableValues; -import com.redhat.thermostat.common.utils.LoggingUtils; -import com.redhat.thermostat.storage.model.HostInfo; -import com.redhat.thermostat.storage.model.NetworkInterfaceInfo; - -public class HostOverviewController { - - private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer(); - - private static final Logger logger = LoggingUtils.getLogger(HostOverviewController.class); - - private final HostRef ref; - private final HostInfoDAO hostInfoDAO; - private final NetworkInterfaceInfoDAO networkInfoDAO; - - private final Timer backgroundUpdateTimer; - private final List<String> knownNetworkIfaces = new ArrayList<>(); - - private final HostOverviewView view; - - public HostOverviewController(HostInfoDAO hostInfoDAO, NetworkInterfaceInfoDAO networkInfoDAO, final HostRef ref, HostOverviewViewProvider provider) { - this.ref = ref; - this.hostInfoDAO = hostInfoDAO; - this.networkInfoDAO = networkInfoDAO; - - final Vector<String> networkTableColumnVector; - networkTableColumnVector = new Vector<String>(); - networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_INTERFACE_COLUMN)); - networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_IPV4_COLUMN)); - networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_IPV6_COLUMN)); - - backgroundUpdateTimer = ApplicationContext.getInstance().getTimerFactory().createTimer(); - backgroundUpdateTimer.setAction(new Runnable() { - @Override - public void run() { - HostInfo hostInfo = HostOverviewController.this.hostInfoDAO.getHostInfo(ref); - view.setHostName(hostInfo.getHostname()); - view.setOsName(hostInfo.getOsName()); - view.setOsKernel(hostInfo.getOsKernel()); - view.setCpuModel(hostInfo.getCpuModel()); - view.setCpuCount(String.valueOf(hostInfo.getCpuCount())); - - String[] parts = DisplayableValues.bytes(hostInfo.getTotalMemory()); - String readableTotalMemory = translator.localize(LocaleResources.NUMBER_AND_UNIT, parts[0], parts[1]); - view.setTotalMemory(readableTotalMemory); - - List<NetworkInterfaceInfo> networkInfo = - HostOverviewController.this.networkInfoDAO.getNetworkInterfaces(ref); - - boolean firstRun = knownNetworkIfaces.isEmpty(); - if (firstRun) { - List<Object[]> data = new ArrayList<Object[]>(); - for (NetworkInterfaceInfo info: networkInfo) { - String ifaceName = info.getInterfaceName(); - String ipv4 = info.getIp4Addr(); - String ipv6 = info.getIp6Addr(); - data.add(new String[] { ifaceName, ipv4, ipv6 }); - knownNetworkIfaces.add(ifaceName); - } - view.setInitialNetworkTableData(data.toArray(new Object[0][0])); - } else { - for (NetworkInterfaceInfo info: networkInfo) { - String ifaceName = info.getInterfaceName(); - String ipv4 = info.getIp4Addr(); - String ipv6 = info.getIp6Addr(); - int index = knownNetworkIfaces.indexOf(ifaceName); - int row = index; - view.updateNetworkTableData(index, 0, ifaceName); - view.updateNetworkTableData(row, 1, ipv4); - view.updateNetworkTableData(row, 2, ipv6); - } - } - } - }); - backgroundUpdateTimer.setSchedulingType(SchedulingType.FIXED_RATE); - backgroundUpdateTimer.setTimeUnit(TimeUnit.SECONDS); - backgroundUpdateTimer.setInitialDelay(0); - backgroundUpdateTimer.setDelay(5); - - view = provider.createView(); - - view.setNetworkTableColumns(networkTableColumnVector.toArray()); - - view.addActionListener(new ActionListener<Action>() { - @Override - public void actionPerformed(ActionEvent<Action> actionEvent) { - switch (actionEvent.getActionId()) { - case HIDDEN: - stop(); - break; - case VISIBLE: - start(); - break; - default: - throw new NotImplementedException("unhandled: " + actionEvent.getActionId()); - } - } - }); - } - - private void start() { - backgroundUpdateTimer.start(); - } - - private void stop() { - backgroundUpdateTimer.stop(); - } - - public BasicView getView() { - return view; - } -}
--- a/client/core/src/main/java/com/redhat/thermostat/client/ui/UiFacadeFactory.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/UiFacadeFactory.java Tue Nov 27 14:45:51 2012 -0500 @@ -38,13 +38,13 @@ import java.util.Collection; +import com.redhat.thermostat.client.core.HostInformationService; import com.redhat.thermostat.client.core.VmInformationService; import com.redhat.thermostat.client.osgi.service.VMContextAction; 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; @@ -56,7 +56,6 @@ void setHostInfoDao(HostInfoDAO hostInfoDao); void setCpuStatDao(CpuStatDAO cpuStatDAO); void setMemoryStatDao(MemoryStatDAO memoryStatDAO); - void setNetworkInfoDao(NetworkInterfaceInfoDAO networkInterfaceInfoDAO); void setVmInfoDao(VmInfoDAO vmInfoDAO); void setVmCpuStatDao(VmCpuStatDAO vmCpuStatDAO); @@ -68,6 +67,12 @@ public SummaryController getSummary(); public HostInformationController getHostController(HostRef ref); + + Collection<HostInformationService> getHostInformationServices(); + + void addHostInformationService(HostInformationService hostInfoService); + + void removeHostInformationService(HostInformationService hostInfoService); public VmInformationController getVmController(VmRef ref);
--- a/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Mon Nov 26 10:31:29 2012 -0500 +++ b/client/core/src/main/resources/com/redhat/thermostat/client/locale/strings.properties Tue Nov 27 14:45:51 2012 -0500 @@ -66,27 +66,10 @@ HOME_PANEL_SECTION_ISSUES = Issues HOME_PANEL_NO_ISSUES = No Issues -HOST_INFO_TAB_OVERVIEW = Overview HOST_INFO_TAB_CPU = Processor HOST_INFO_TAB_MEMORY = Memory HOST_INFO_TAB_IO = IO -HOST_OVERVIEW_SECTION_BASICS = Basics -HOST_OVERVIEW_SECTION_HARDWARE = Hardware -HOST_OVERVIEW_SECTION_SOFTWARE = Software - -HOST_INFO_HOSTNAME = Host -HOST_INFO_CPU_COUNT = Processor Count -HOST_INFO_CPU_MODEL = Processor Model -HOST_INFO_OS_NAME = OS Name -HOST_INFO_OS_KERNEL = OS Kernel -HOST_INFO_MEMORY_TOTAL = Total Memory -HOST_INFO_NETWORK = Network - -NETWORK_INTERFACE_COLUMN = Interface -NETWORK_IPV4_COLUMN = IPv4 Address -NETWORK_IPV6_COLUMN = IPv6 Address - HOST_CPU_SECTION_OVERVIEW = Processor HOST_CPU_ID = Cpu {0} HOST_CPU_USAGE_CHART_TIME_LABEL = Time
--- a/client/core/src/test/java/com/redhat/thermostat/client/ui/HostOverviewControllerTest.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +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.ui; - -import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNotNull; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.ArgumentCaptor; - -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; -import com.redhat.thermostat.client.core.views.BasicView.Action; -import com.redhat.thermostat.common.ActionEvent; -import com.redhat.thermostat.common.ActionListener; -import com.redhat.thermostat.common.Timer; -import com.redhat.thermostat.common.Timer.SchedulingType; -import com.redhat.thermostat.common.TimerFactory; -import com.redhat.thermostat.common.appctx.ApplicationContext; -import com.redhat.thermostat.common.appctx.ApplicationContextUtil; -import com.redhat.thermostat.common.dao.HostInfoDAO; -import com.redhat.thermostat.common.dao.HostRef; -import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; -import com.redhat.thermostat.storage.model.HostInfo; -import com.redhat.thermostat.storage.model.NetworkInterfaceInfo; - -public class HostOverviewControllerTest { - - private static final String HOST_NAME = "host-name"; - private static final String OS_NAME = "some os"; - private static final String KERNEL_NAME = "korn"; - private static final int CPU_COUNT = 99; - private static final String CPU_MODEL = "cpu-model"; - private static final long TOTAL_MEMORY = 99+99; - private static final String NETWORK_INTERFACE = "iface0"; - private static final String IPV4_ADDR = "0xcafef00d"; - private static final String IPV6_ADDR = "HOME_SWEET_HOME"; - - private Timer timer; - private Runnable timerAction; - private HostOverviewView view; - private ActionListener<HostOverviewView.Action> listener; - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Before - public void setUp() { - ApplicationContextUtil.resetApplicationContext(); - - // Setup timer - timer = mock(Timer.class); - ArgumentCaptor<Runnable> timerActionCaptor = ArgumentCaptor.forClass(Runnable.class); - doNothing().when(timer).setAction(timerActionCaptor.capture()); - - TimerFactory timerFactory = mock(TimerFactory.class); - when(timerFactory.createTimer()).thenReturn(timer); - ApplicationContext.getInstance().setTimerFactory(timerFactory); - - // Setup DAOs - HostInfo hostInfo = new HostInfo(HOST_NAME, OS_NAME, KERNEL_NAME, CPU_MODEL, CPU_COUNT, TOTAL_MEMORY); - - List<NetworkInterfaceInfo> networkInfo = new ArrayList<NetworkInterfaceInfo>(); - NetworkInterfaceInfo ifaceInfo = new NetworkInterfaceInfo(NETWORK_INTERFACE); - ifaceInfo.setIp4Addr(IPV4_ADDR); - ifaceInfo.setIp6Addr(IPV6_ADDR); - networkInfo.add(ifaceInfo); - - HostRef ref = mock(HostRef.class); - - HostInfoDAO hostInfoDao = mock(HostInfoDAO.class); - when(hostInfoDao.getHostInfo(any(HostRef.class))).thenReturn(hostInfo); - - NetworkInterfaceInfoDAO networkInfoDao = mock(NetworkInterfaceInfoDAO.class); - when(networkInfoDao.getNetworkInterfaces(any(HostRef.class))).thenReturn(networkInfo); - - // Setup View - ArgumentCaptor<ActionListener> listenerCaptor = ArgumentCaptor.forClass(ActionListener.class); - view = mock(HostOverviewView.class); - doNothing().when(view).addActionListener(listenerCaptor.capture()); - HostOverviewViewProvider viewProvider = mock(HostOverviewViewProvider.class); - when(viewProvider.createView()).thenReturn(view); - - @SuppressWarnings("unused") - HostOverviewController controller = new HostOverviewController(hostInfoDao, networkInfoDao, ref, viewProvider); - - listener = listenerCaptor.getValue(); - timerAction = timerActionCaptor.getValue(); - } - - @After - public void tearDown() { - ApplicationContextUtil.resetApplicationContext(); - } - - @Test - public void verifyViewIsUpdatedWithData() { - timerAction.run(); - - verify(view).setCpuCount(eq(String.valueOf(CPU_COUNT))); - verify(view).setCpuModel(eq(CPU_MODEL)); - verify(view).setHostName(eq(HOST_NAME)); - - verify(view).setNetworkTableColumns(any(String[][].class)); - verify(view).setInitialNetworkTableData(eq(new String[][] { new String[] { NETWORK_INTERFACE, IPV4_ADDR, IPV6_ADDR }, })); - - verify(view).setOsKernel(eq(KERNEL_NAME)); - verify(view).setOsName(eq(OS_NAME)); - - final String UNITS = " B"; - verify(view).setTotalMemory(eq(String.valueOf(TOTAL_MEMORY + UNITS))); - } - - @Test - public void verifyTimerIsSetUpCorrectly() { - assertNotNull(timer); - - verify(timer).setAction(isNotNull(Runnable.class)); - verify(timer).setDelay(5); - verify(timer).setTimeUnit(TimeUnit.SECONDS); - verify(timer).setInitialDelay(0); - verify(timer).setSchedulingType(SchedulingType.FIXED_RATE); - } - - @Test - public void verifyTimerRunsWhenNeeded() { - listener.actionPerformed(new ActionEvent<>(view, Action.VISIBLE)); - - verify(timer).start(); - - listener.actionPerformed(new ActionEvent<>(view, Action.HIDDEN)); - - verify(timer).stop(); - } - -}
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/Main.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/Main.java Tue Nov 27 14:45:51 2012 -0500 @@ -284,7 +284,6 @@ uiFacadeFactory.setHostInfoDao(daoFactory.getHostInfoDAO()); uiFacadeFactory.setCpuStatDao(daoFactory.getCpuStatDAO()); uiFacadeFactory.setMemoryStatDao(daoFactory.getMemoryStatDAO()); - uiFacadeFactory.setNetworkInfoDao(daoFactory.getNetworkInterfaceInfoDAO()); uiFacadeFactory.setVmInfoDao(daoFactory.getVmInfoDAO()); uiFacadeFactory.setVmCpuStatDao(daoFactory.getVmCpuStatDAO());
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/UiFacadeFactoryImpl.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/UiFacadeFactoryImpl.java Tue Nov 27 14:45:51 2012 -0500 @@ -42,6 +42,7 @@ import org.osgi.framework.BundleContext; +import com.redhat.thermostat.client.core.HostInformationService; import com.redhat.thermostat.client.core.VmInformationService; import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; @@ -57,7 +58,6 @@ 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; @@ -69,6 +69,7 @@ private CountDownLatch shutdown = new CountDownLatch(1); + private Collection<HostInformationService> hostInformationServices = new ArrayList<>(); private Collection<VmInformationService> vmInformationServices = new ArrayList<>(); private Collection<VMContextAction> contextAction = new ArrayList<>(); @@ -77,7 +78,6 @@ private HostInfoDAO hostInfoDao; private CpuStatDAO cpuStatDao; private MemoryStatDAO memoryStatDao; - private NetworkInterfaceInfoDAO networkInfoDao; private VmInfoDAO vmInfoDao; private VmCpuStatDAO vmCpuStatDao; @@ -108,10 +108,6 @@ this.memoryStatDao = memoryStatDao; } - public void setNetworkInfoDao(NetworkInterfaceInfoDAO networkInfoDao) { - this.networkInfoDao = networkInfoDao; - } - public void setVmInfoDao(VmInfoDAO vmInfoDao) { this.vmInfoDao = vmInfoDao; } @@ -146,7 +142,7 @@ @Override public HostInformationController getHostController(HostRef ref) { HostInformationViewProvider viewProvider = serviceProvider.getService(HostInformationViewProvider.class); - return new HostInformationController(hostInfoDao, networkInfoDao, cpuStatDao, memoryStatDao, ref, viewProvider); + return new HostInformationController(this, hostInfoDao, cpuStatDao, memoryStatDao, ref, viewProvider); } @Override @@ -196,4 +192,19 @@ shutdown.await(); } + @Override + public Collection<HostInformationService> getHostInformationServices() { + return hostInformationServices; + } + + @Override + public void addHostInformationService(HostInformationService hostInfoService) { + hostInformationServices.add(hostInfoService); + } + + @Override + public void removeHostInformationService(HostInformationService hostInfoService) { + hostInformationServices.remove(hostInfoService); + } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/HostInformationServiceTracker.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,70 @@ +/* + * 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.swing.internal.osgi; + +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +import com.redhat.thermostat.client.core.HostInformationService; +import com.redhat.thermostat.client.ui.UiFacadeFactory; + +class HostInformationServiceTracker extends ServiceTracker { + + private UiFacadeFactory uiFacadeFactory; + + private BundleContext context; + + HostInformationServiceTracker(BundleContext context, UiFacadeFactory uiFacadeFactory) { + super(context, HostInformationService.class.getName(), null); + this.context = context; + this.uiFacadeFactory = uiFacadeFactory; + } + + @Override + public Object addingService(ServiceReference reference) { + HostInformationService service = (HostInformationService) super.addingService(reference); + uiFacadeFactory.addHostInformationService(service); + return service; + } + + @Override + public void removedService(ServiceReference reference, Object service) { + uiFacadeFactory.removeHostInformationService((HostInformationService)service); + super.removedService(reference, service); + } +}
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivator.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivator.java Tue Nov 27 14:45:51 2012 -0500 @@ -48,7 +48,6 @@ import com.redhat.thermostat.client.core.views.HostCpuViewProvider; import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.HostMemoryViewProvider; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmCpuViewProvider; import com.redhat.thermostat.client.core.views.VmGcViewProvider; @@ -64,7 +63,6 @@ import com.redhat.thermostat.client.swing.views.SwingHostCpuViewProvider; import com.redhat.thermostat.client.swing.views.SwingHostInformationViewProvider; import com.redhat.thermostat.client.swing.views.SwingHostMemoryViewProvider; -import com.redhat.thermostat.client.swing.views.SwingHostOverviewViewProvider; import com.redhat.thermostat.client.swing.views.SwingSummaryViewProvider; import com.redhat.thermostat.client.swing.views.SwingVmCpuViewProvider; import com.redhat.thermostat.client.swing.views.SwingVmGcViewProvider; @@ -77,6 +75,7 @@ public class ThermostatActivator implements BundleActivator { + private HostInformationServiceTracker hostInfoServiceTracker; private VmInformationServiceTracker vmInfoServiceTracker; private VMContextActionServiceTracker contextActionTracker; @@ -94,8 +93,6 @@ context.registerService(HostInformationViewProvider.class.getName(), infoProvider, null); HostCpuViewProvider cpuProvider = new SwingHostCpuViewProvider(); context.registerService(HostCpuViewProvider.class.getName(), cpuProvider, null); - HostOverviewViewProvider provider = new SwingHostOverviewViewProvider(); - context.registerService(HostOverviewViewProvider.class.getName(), provider, null); HostMemoryViewProvider memoryProvider = new SwingHostMemoryViewProvider(); context.registerService(HostMemoryViewProvider.class.getName(), memoryProvider, null); @@ -127,6 +124,8 @@ UiFacadeFactory uiFacadeFactory = new UiFacadeFactoryImpl(context); + hostInfoServiceTracker = new HostInformationServiceTracker(context, uiFacadeFactory); + hostInfoServiceTracker.open(); vmInfoServiceTracker = new VmInformationServiceTracker(context, uiFacadeFactory); vmInfoServiceTracker.open(); contextActionTracker = new VMContextActionServiceTracker(context, uiFacadeFactory); @@ -146,6 +145,7 @@ @Override public void stop(BundleContext context) throws Exception { + hostInfoServiceTracker.close(); vmInfoServiceTracker.close(); //context.removeServiceListener(vmInfoServiceTracker); contextActionTracker.close(); cmdReg.unregisterCommands();
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/HostInformationPanel.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/HostInformationPanel.java Tue Nov 27 14:45:51 2012 -0500 @@ -45,6 +45,7 @@ import com.redhat.thermostat.client.core.views.BasicView; import com.redhat.thermostat.client.core.views.HostInformationView; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.swing.SwingComponent; public class HostInformationPanel extends HostInformationView implements SwingComponent { @@ -63,7 +64,7 @@ } @Override - public void addChildView(final String title, final BasicView view) { + public void addChildView(final String title, final UIComponent view) { if (view instanceof SwingComponent) { final SwingComponent component = (SwingComponent)view; SwingUtilities.invokeLater(new Runnable() {
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/HostOverviewPanel.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,309 +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.swing.views; - -import java.awt.BorderLayout; -import java.awt.Component; - -import javax.swing.GroupLayout; -import javax.swing.GroupLayout.Alignment; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.LayoutStyle.ComponentPlacement; -import javax.swing.SwingUtilities; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.JTableHeader; - -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.locale.LocaleResources; -import com.redhat.thermostat.client.swing.SwingComponent; -import com.redhat.thermostat.client.swing.components.LabelField; -import com.redhat.thermostat.client.swing.components.SectionHeader; -import com.redhat.thermostat.client.swing.components.ValueField; -import com.redhat.thermostat.client.ui.ComponentVisibleListener; -import com.redhat.thermostat.common.ActionListener; -import com.redhat.thermostat.common.locale.Translate; - -public class HostOverviewPanel extends HostOverviewView implements SwingComponent { - - private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer(); - - private JPanel visiblePanel; - - private final ValueField hostname = new ValueField("${hostname}"); - private final ValueField cpuModel = new ValueField("${cpu-model}"); - private final ValueField cpuCount = new ValueField("${cpu-count}"); - private final ValueField totalMemory = new ValueField("${total-memory}"); - private final ValueField osName = new ValueField("${os-name}"); - private final ValueField osKernel = new ValueField("${os-kernel}"); - - private final DefaultTableModel networkTableModel = new DefaultTableModel() { - @Override - public boolean isCellEditable(int row, int column) { - return false; - } - }; - - private Object[] networkTableColumns; - private Object[][] networkTableData; - - public HostOverviewPanel() { - super(); - initializePanel(); - - visiblePanel.addHierarchyListener(new ComponentVisibleListener() { - @Override - public void componentShown(Component component) { - notifier.fireAction(Action.VISIBLE); - } - - @Override - public void componentHidden(Component component) { - notifier.fireAction(Action.HIDDEN); - } - }); - } - - @Override - public void addActionListener(ActionListener<Action> listener) { - notifier.addActionListener(listener); - } - - @Override - public void removeActionListener(ActionListener<Action> listener) { - notifier.removeActionListener(listener); - } - - @Override - public void setHostName(final String newHostName) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - hostname.setText(newHostName); - } - }); - } - - @Override - public void setCpuModel(final String newCpuModel) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - cpuModel.setText(newCpuModel); - } - }); - } - - @Override - public void setCpuCount(final String newCpuCount) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - cpuCount.setText(newCpuCount); - } - }); - } - - @Override - public void setTotalMemory(final String newTotalMemory) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - totalMemory.setText(newTotalMemory); - } - }); - } - - @Override - public void setOsName(final String newOsName) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - osName.setText(newOsName); - } - }); - } - - @Override - public void setOsKernel(final String newOsKernel) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - osKernel.setText(newOsKernel); - } - }); - } - - @Override - public void setNetworkTableColumns(final Object[] columns) { - this.networkTableColumns = columns; - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - networkTableModel.setColumnIdentifiers(networkTableColumns); - } - }); - } - - @Override - public void setInitialNetworkTableData(final Object[][] data) { - this.networkTableData = data; - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - networkTableModel.setDataVector(networkTableData, networkTableColumns); - } - }); - } - - @Override - public void updateNetworkTableData(final int row, final int column, final String data) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - networkTableModel.setValueAt(data, row, column); - } - }); - } - - @Override - public Component getUiComponent() { - return visiblePanel; - } - - private void initializePanel() { - visiblePanel = new JPanel(); - SectionHeader overviewSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_BASICS)); - LabelField hostnameLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_HOSTNAME)); - SectionHeader hardwareSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_HARDWARE)); - LabelField cpuModelLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_CPU_MODEL)); - LabelField cpuCountLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_CPU_COUNT)); - LabelField memoryTotalLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_MEMORY_TOTAL)); - LabelField networkLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_NETWORK)); - SectionHeader softwareSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_SOFTWARE)); - LabelField osNameLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_OS_NAME)); - LabelField osKernelLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_OS_KERNEL)); - - JPanel panel = new JPanel(); - - GroupLayout gl_visiblePanel = new GroupLayout(visiblePanel); - gl_visiblePanel.setHorizontalGroup( - gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addContainerGap() - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(hardwareSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) - .addComponent(overviewSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.TRAILING, false) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addGap(12) - .addComponent(hostnameLabel, GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE)) - .addComponent(cpuCountLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cpuModelLabel, GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE) - .addComponent(memoryTotalLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addGap(12) - .addComponent(networkLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(panel, GroupLayout.DEFAULT_SIZE, 462, Short.MAX_VALUE) - .addComponent(cpuCount, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cpuModel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(hostname, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(totalMemory, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - .addComponent(softwareSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addGap(12) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) - .addComponent(osKernelLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(osNameLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 129, Short.MAX_VALUE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(osKernel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(osName, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addContainerGap()) - ); - gl_visiblePanel.setVerticalGroup( - gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addGroup(gl_visiblePanel.createSequentialGroup() - .addContainerGap() - .addComponent(overviewSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) - .addComponent(hostname, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addComponent(hostnameLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.UNRELATED) - .addComponent(hardwareSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) - .addComponent(cpuModelLabel, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addComponent(cpuModel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) - .addComponent(cpuCountLabel, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) - .addComponent(cpuCount, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(memoryTotalLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(totalMemory, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(networkLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(panel, GroupLayout.PREFERRED_SIZE, 109, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(softwareSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(osNameLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(osName, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) - .addComponent(osKernelLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addComponent(osKernel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addGap(128)) - ); - - panel.setLayout(new BorderLayout(0, 0)); - - JTable networkTable = new JTable(networkTableModel); - panel.add(networkTable); - JTableHeader header = networkTable.getTableHeader(); - panel.add(header, BorderLayout.PAGE_START); - visiblePanel.setLayout(gl_visiblePanel); - } -}
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/views/SwingHostOverviewViewProvider.java Mon Nov 26 10:31:29 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +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.swing.views; - -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; - -public class SwingHostOverviewViewProvider implements HostOverviewViewProvider { - - @Override - public HostOverviewView createView() { - return new HostOverviewPanel(); - } - -}
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivatorTest.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivatorTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -46,7 +46,6 @@ import com.redhat.thermostat.client.core.views.HostCpuViewProvider; import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.HostMemoryViewProvider; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmCpuViewProvider; import com.redhat.thermostat.client.core.views.VmGcViewProvider; @@ -59,7 +58,6 @@ import com.redhat.thermostat.client.swing.views.SwingHostCpuViewProvider; import com.redhat.thermostat.client.swing.views.SwingHostInformationViewProvider; import com.redhat.thermostat.client.swing.views.SwingHostMemoryViewProvider; -import com.redhat.thermostat.client.swing.views.SwingHostOverviewViewProvider; import com.redhat.thermostat.client.swing.views.SwingSummaryViewProvider; import com.redhat.thermostat.client.swing.views.SwingVmCpuViewProvider; import com.redhat.thermostat.client.swing.views.SwingVmGcViewProvider; @@ -82,7 +80,6 @@ assertTrue(ctx.isServiceRegistered(HostInformationViewProvider.class.getName(), SwingHostInformationViewProvider.class)); assertTrue(ctx.isServiceRegistered(HostMemoryViewProvider.class.getName(), SwingHostMemoryViewProvider.class)); assertTrue(ctx.isServiceRegistered(HostCpuViewProvider.class.getName(), SwingHostCpuViewProvider.class)); - assertTrue(ctx.isServiceRegistered(HostOverviewViewProvider.class.getName(), SwingHostOverviewViewProvider.class)); assertTrue(ctx.isServiceRegistered(VmInformationViewProvider.class.getName(), SwingVmInformationViewProvider.class)); assertTrue(ctx.isServiceRegistered(VmCpuViewProvider.class.getName(), SwingVmCpuViewProvider.class)); assertTrue(ctx.isServiceRegistered(VmGcViewProvider.class.getName(), SwingVmGcViewProvider.class)); @@ -90,6 +87,6 @@ assertTrue(ctx.isServiceRegistered(AgentInformationViewProvider.class.getName(), SwingAgentInformationViewProvider.class)); assertTrue(ctx.isServiceRegistered(ClientConfigViewProvider.class.getName(), SwingClientConfigurationViewProvider.class)); - assertEquals(12, ctx.getAllServices().size()); + assertEquals(11, ctx.getAllServices().size()); } }
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/views/HostInformationPanelTest.java Mon Nov 26 10:31:29 2012 -0500 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/views/HostInformationPanelTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -52,6 +52,7 @@ import org.junit.Test; import com.redhat.thermostat.client.core.views.BasicView; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.swing.TabbedPaneMatcher; import com.redhat.thermostat.client.swing.views.HostInformationPanel; @@ -106,7 +107,7 @@ @Test public void testAddTwice() throws InvocationTargetException, InterruptedException { - BasicView mock1 = createHostInfoPanel(); + UIComponent mock1 = createHostInfoPanel(); panel.addChildView("foo1", mock1); @@ -114,7 +115,7 @@ // in order to select the right panel. window.panel("panel").tabbedPane(new TabbedPaneMatcher(JTabbedPane.class)).requireTabTitles("foo1"); - BasicView mock2 = createHostInfoPanel(); + UIComponent mock2 = createHostInfoPanel(); panel.addChildView("foo2", mock2); window.panel("panel").tabbedPane(new TabbedPaneMatcher(JTabbedPane.class)).requireTabTitles("foo1", "foo2"); @@ -122,8 +123,8 @@ @Test public void testAddRemove() throws InvocationTargetException, InterruptedException { - BasicView test1 = createHostInfoPanel(); - BasicView test2 = createHostInfoPanel(); + UIComponent test1 = createHostInfoPanel(); + UIComponent test2 = createHostInfoPanel(); panel.addChildView("test1", test1); panel.addChildView("test2", test2);
--- a/distribution/config/commands/gui.properties Mon Nov 26 10:31:29 2012 -0500 +++ b/distribution/config/commands/gui.properties Tue Nov 27 14:45:51 2012 -0500 @@ -6,6 +6,8 @@ thermostat-client-core-@project.version@.jar, \ thermostat-client-swing-@project.version@.jar, \ thermostat-client-command-@project.version@.jar, \ + thermostat-host-overview-client-core-@project.version@.jar, \ + thermostat-host-overview-client-swing-@project.version@.jar, \ thermostat-client-heapdumper-core-@project.version@.jar, \ thermostat-client-heapdumper-swing-@project.version@.jar, \ thermostat-killvm-client-swing-@project.version@.jar, \
--- a/distribution/pom.xml Mon Nov 26 10:31:29 2012 -0500 +++ b/distribution/pom.xml Tue Nov 27 14:45:51 2012 -0500 @@ -308,6 +308,16 @@ </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-host-overview-client-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-host-overview-client-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-client-vmclassstat-swing</artifactId> <version>${project.version}</version> </dependency>
--- a/eclipse/com.redhat.thermostat.client.feature/feature.xml Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.client.feature/feature.xml Tue Nov 27 14:45:51 2012 -0500 @@ -126,4 +126,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="com.redhat.thermostat.host.overview.client.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>
--- a/eclipse/com.redhat.thermostat.client.feature/pom.xml Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.client.feature/pom.xml Tue Nov 27 14:45:51 2012 -0500 @@ -21,6 +21,11 @@ </dependency> <dependency> <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-host-overview-client-core</artifactId> + <version>0.5.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> <artifactId>thermostat-client-vmclassstat-core</artifactId> <version>0.5.0-SNAPSHOT</version> </dependency>
--- a/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Tue Nov 27 14:45:51 2012 -0500 @@ -10,16 +10,17 @@ org.junit;bundle-version="4.10.0", org.hamcrest;bundle-version="1.1.0" Import-Package: com.redhat.thermostat.client.core.views, + com.redhat.thermostat.host.overview.client.core, com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.client.vmclassstat.core, com.redhat.thermostat.common, com.redhat.thermostat.common.appctx, - com.redhat.thermostat.storage.model, com.redhat.thermostat.eclipse, com.redhat.thermostat.eclipse.chart.common, com.redhat.thermostat.eclipse.chart.vmclassstat, com.redhat.thermostat.eclipse.internal.views, + com.redhat.thermostat.storage.model, org.apache.log4j;version="1.2.13", org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.matchers,
--- a/eclipse/com.redhat.thermostat.eclipse.test/META-INF/MANIFEST.MF Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse.test/META-INF/MANIFEST.MF Tue Nov 27 14:45:51 2012 -0500 @@ -13,6 +13,7 @@ com.redhat.thermostat.bundles.org.mockito.mockito-core;resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.redhat.thermostat.client.core.views, + com.redhat.thermostat.host.overview.client.core, com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.client.vmclassstat.core,
--- a/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostCpuViewPartTest.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostCpuViewPartTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -50,8 +50,8 @@ import org.junit.Test; import org.mockito.InOrder; -import com.redhat.thermostat.client.core.views.BasicView; import com.redhat.thermostat.client.core.views.HostCpuViewProvider; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.ui.HostCpuController; import com.redhat.thermostat.common.dao.CpuStatDAO; import com.redhat.thermostat.common.dao.HostInfoDAO; @@ -150,7 +150,7 @@ doReturn(controller).when(((HostCpuViewPart) view)).createController( same(hostInfoDao), same(cpuStatDao), any(HostRef.class), same(viewProvider)); - when(controller.getView()).thenReturn((BasicView) thermoView); + when(controller.getView()).thenReturn((UIComponent) thermoView); } @Override
--- a/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostMemoryViewPartTest.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostMemoryViewPartTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -48,8 +48,8 @@ import org.junit.Test; import org.mockito.InOrder; -import com.redhat.thermostat.client.core.views.BasicView; import com.redhat.thermostat.client.core.views.HostMemoryViewProvider; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.client.ui.HostMemoryController; import com.redhat.thermostat.common.dao.HostInfoDAO; import com.redhat.thermostat.common.dao.HostRef; @@ -98,7 +98,7 @@ doReturn(controller).when(((HostMemoryViewPart) view)) .createController(same(hostInfoDao), same(memStatDao), any(HostRef.class), same(viewProvider)); - when(controller.getView()).thenReturn((BasicView) thermoView); + when(controller.getView()).thenReturn((UIComponent) thermoView); } @Override
--- a/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostOverviewViewPartTest.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse.test/src/com/redhat/thermostat/eclipse/test/views/HostOverviewViewPartTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -48,9 +48,7 @@ import org.junit.Test; import org.mockito.InOrder; -import com.redhat.thermostat.client.core.views.BasicView; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; -import com.redhat.thermostat.client.ui.HostOverviewController; +import com.redhat.thermostat.client.core.views.UIComponent; import com.redhat.thermostat.common.dao.HostInfoDAO; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; @@ -59,6 +57,8 @@ import com.redhat.thermostat.eclipse.internal.views.RefViewPart; import com.redhat.thermostat.eclipse.internal.views.SWTHostOverviewView; import com.redhat.thermostat.eclipse.internal.views.SWTHostOverviewViewProvider; +import com.redhat.thermostat.host.overview.client.core.HostOverviewController; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; public class HostOverviewViewPartTest extends AbstractRefViewPartTest<HostRef> { @@ -99,7 +99,7 @@ doReturn(controller).when(((HostOverviewViewPart) view)) .createController(any(HostRef.class), same(hostInfoDao), same(netIfaceDao), same(viewProvider)); - when(controller.getView()).thenReturn((BasicView) thermoView); + when(controller.getView()).thenReturn((UIComponent) thermoView); } @Override
--- a/eclipse/com.redhat.thermostat.eclipse/META-INF/MANIFEST.MF Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse/META-INF/MANIFEST.MF Tue Nov 27 14:45:51 2012 -0500 @@ -15,12 +15,14 @@ com.redhat.thermostat.client.ui, com.redhat.thermostat.common, com.redhat.thermostat.common.appctx, - com.redhat.thermostat.storage.config, com.redhat.thermostat.common.dao, - com.redhat.thermostat.storage.model, - com.redhat.thermostat.storage.core, com.redhat.thermostat.common.locale, com.redhat.thermostat.common.utils, + com.redhat.thermostat.host.overview.client.core, + com.redhat.thermostat.host.overview.client.locale, + com.redhat.thermostat.storage.config, + com.redhat.thermostat.storage.core, + com.redhat.thermostat.storage.model, com.redhat.thermostat.web.client, com.redhat.thermostat.web.common Export-Package: com.redhat.thermostat.eclipse,
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/Activator.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/Activator.java Tue Nov 27 14:45:51 2012 -0500 @@ -44,7 +44,6 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; import com.redhat.thermostat.common.DbService; import com.redhat.thermostat.common.ThreadPoolTimerFactory; import com.redhat.thermostat.common.TimerFactory; @@ -52,6 +51,7 @@ import com.redhat.thermostat.common.utils.OSGIUtils; import com.redhat.thermostat.eclipse.LoggerFacility; import com.redhat.thermostat.eclipse.internal.views.SWTHostOverviewViewProvider; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; import com.redhat.thermostat.storage.core.ConnectionException; /**
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostOverviewViewPart.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostOverviewViewPart.java Tue Nov 27 14:45:51 2012 -0500 @@ -38,14 +38,14 @@ import org.eclipse.swt.widgets.Composite; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; -import com.redhat.thermostat.client.ui.HostOverviewController; import com.redhat.thermostat.common.dao.HostInfoDAO; import com.redhat.thermostat.common.dao.HostRef; import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; import com.redhat.thermostat.common.utils.OSGIUtils; import com.redhat.thermostat.eclipse.SWTComponent; import com.redhat.thermostat.eclipse.views.HostRefViewPart; +import com.redhat.thermostat.host.overview.client.core.HostOverviewController; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; public class HostOverviewViewPart extends HostRefViewPart {
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/SWTHostOverviewView.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/SWTHostOverviewView.java Tue Nov 27 14:45:51 2012 -0500 @@ -51,8 +51,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.ui.PlatformUI; -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.locale.LocaleResources; +import com.redhat.thermostat.host.overview.client.core.HostOverviewView; +import com.redhat.thermostat.host.overview.client.locale.LocaleResources; import com.redhat.thermostat.common.locale.Translate; import com.redhat.thermostat.eclipse.SWTComponent; import com.redhat.thermostat.eclipse.ThermostatConstants;
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/SWTHostOverviewViewProvider.java Mon Nov 26 10:31:29 2012 -0500 +++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/SWTHostOverviewViewProvider.java Tue Nov 27 14:45:51 2012 -0500 @@ -36,9 +36,9 @@ package com.redhat.thermostat.eclipse.internal.views; -import com.redhat.thermostat.client.core.views.HostOverviewView; -import com.redhat.thermostat.client.core.views.HostOverviewViewProvider; import com.redhat.thermostat.eclipse.SWTViewProvider; +import com.redhat.thermostat.host.overview.client.core.HostOverviewView; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; public class SWTHostOverviewViewProvider extends SWTViewProvider implements HostOverviewViewProvider {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/pom.xml Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>thermostat-host-overview</artifactId> + <groupId>com.redhat.thermostat</groupId> + <version>0.5.0-SNAPSHOT</version> + </parent> + <artifactId>thermostat-host-overview-client-core</artifactId> + <packaging>bundle</packaging> + <name>Thermostat Host Overview Core Client plugin</name> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Private-Package></Private-Package> + <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor> + <Bundle-SymbolicName>com.redhat.thermostat.host.overview.client.core</Bundle-SymbolicName> + <Export-Package> + com.redhat.thermostat.host.overview.client.core, + com.redhat.thermostat.host.overview.client.locale + </Export-Package> + <!-- Do not autogenerate uses clauses in Manifests --> + <_nouses>true</_nouses> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-common-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/java/com/redhat/thermostat/host/overview/client/core/HostOverviewController.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,169 @@ +/* + * 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.host.overview.client.core; + +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; +import java.util.concurrent.TimeUnit; + +import com.redhat.thermostat.client.core.controllers.HostInformationServiceController; +import com.redhat.thermostat.client.core.views.BasicView.Action; +import com.redhat.thermostat.client.core.views.UIComponent; +import com.redhat.thermostat.common.ActionEvent; +import com.redhat.thermostat.common.ActionListener; +import com.redhat.thermostat.common.NotImplementedException; +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.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.HostRef; +import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.common.locale.Translate; +import com.redhat.thermostat.common.utils.DisplayableValues; +import com.redhat.thermostat.host.overview.client.locale.LocaleResources; +import com.redhat.thermostat.storage.model.HostInfo; +import com.redhat.thermostat.storage.model.NetworkInterfaceInfo; + +public class HostOverviewController implements HostInformationServiceController { + + private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer(); + + private final HostInfoDAO hostInfoDAO; + private final NetworkInterfaceInfoDAO networkInfoDAO; + + private final Timer backgroundUpdateTimer; + private final List<String> knownNetworkIfaces = new ArrayList<>(); + + private final HostOverviewView view; + + public HostOverviewController(HostInfoDAO hostInfoDAO, NetworkInterfaceInfoDAO networkInfoDAO, final HostRef ref, HostOverviewViewProvider provider) { + this.hostInfoDAO = hostInfoDAO; + this.networkInfoDAO = networkInfoDAO; + + final Vector<String> networkTableColumnVector; + networkTableColumnVector = new Vector<String>(); + networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_INTERFACE_COLUMN)); + networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_IPV4_COLUMN)); + networkTableColumnVector.add(translator.localize(LocaleResources.NETWORK_IPV6_COLUMN)); + + backgroundUpdateTimer = ApplicationContext.getInstance().getTimerFactory().createTimer(); + backgroundUpdateTimer.setAction(new Runnable() { + @Override + public void run() { + HostInfo hostInfo = HostOverviewController.this.hostInfoDAO.getHostInfo(ref); + view.setHostName(hostInfo.getHostname()); + view.setOsName(hostInfo.getOsName()); + view.setOsKernel(hostInfo.getOsKernel()); + view.setCpuModel(hostInfo.getCpuModel()); + view.setCpuCount(String.valueOf(hostInfo.getCpuCount())); + + String[] parts = DisplayableValues.bytes(hostInfo.getTotalMemory()); + String readableTotalMemory = translator.localize(LocaleResources.NUMBER_AND_UNIT, parts[0], parts[1]); + view.setTotalMemory(readableTotalMemory); + + List<NetworkInterfaceInfo> networkInfo = + HostOverviewController.this.networkInfoDAO.getNetworkInterfaces(ref); + + boolean firstRun = knownNetworkIfaces.isEmpty(); + if (firstRun) { + List<Object[]> data = new ArrayList<Object[]>(); + for (NetworkInterfaceInfo info: networkInfo) { + String ifaceName = info.getInterfaceName(); + String ipv4 = info.getIp4Addr(); + String ipv6 = info.getIp6Addr(); + data.add(new String[] { ifaceName, ipv4, ipv6 }); + knownNetworkIfaces.add(ifaceName); + } + view.setInitialNetworkTableData(data.toArray(new Object[0][0])); + } else { + for (NetworkInterfaceInfo info: networkInfo) { + String ifaceName = info.getInterfaceName(); + String ipv4 = info.getIp4Addr(); + String ipv6 = info.getIp6Addr(); + int index = knownNetworkIfaces.indexOf(ifaceName); + int row = index; + view.updateNetworkTableData(index, 0, ifaceName); + view.updateNetworkTableData(row, 1, ipv4); + view.updateNetworkTableData(row, 2, ipv6); + } + } + } + }); + backgroundUpdateTimer.setSchedulingType(SchedulingType.FIXED_RATE); + backgroundUpdateTimer.setTimeUnit(TimeUnit.SECONDS); + backgroundUpdateTimer.setInitialDelay(0); + backgroundUpdateTimer.setDelay(5); + + view = provider.createView(); + + view.setNetworkTableColumns(networkTableColumnVector.toArray()); + + view.addActionListener(new ActionListener<Action>() { + @Override + public void actionPerformed(ActionEvent<Action> actionEvent) { + switch (actionEvent.getActionId()) { + case HIDDEN: + stop(); + break; + case VISIBLE: + start(); + break; + default: + throw new NotImplementedException("unhandled: " + actionEvent.getActionId()); + } + } + }); + } + + private void start() { + backgroundUpdateTimer.start(); + } + + private void stop() { + backgroundUpdateTimer.stop(); + } + + public UIComponent getView() { + return view; + } + + @Override + public String getLocalizedName() { + return translator.localize(LocaleResources.HOST_INFO_TAB_OVERVIEW); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/java/com/redhat/thermostat/host/overview/client/core/HostOverviewService.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,76 @@ +/* + * 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.host.overview.client.core; + +import com.redhat.thermostat.client.core.HostFilter; +import com.redhat.thermostat.client.core.HostInformationService; +import com.redhat.thermostat.client.core.controllers.HostInformationServiceController; +import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.HostRef; +import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.common.utils.OSGIUtils; + +public class HostOverviewService implements HostInformationService { + + private static final HostFilter FILTER = new HostFilter() { + @Override + public boolean matches(HostRef toMatch) { + return true; + } + }; + + private HostInfoDAO hostInfoDAO; + private NetworkInterfaceInfoDAO networkInfoDAO; + + public HostOverviewService(HostInfoDAO hostInfoDAO, NetworkInterfaceInfoDAO networkInfoDAO) { + this.hostInfoDAO = hostInfoDAO; + this.networkInfoDAO = networkInfoDAO; + } + + @Override + public HostFilter getFilter() { + return FILTER; + } + + @Override + public HostInformationServiceController getInformationServiceController( + HostRef ref) { + HostOverviewViewProvider provider = OSGIUtils.getInstance().getService(HostOverviewViewProvider.class); + return new HostOverviewController(hostInfoDAO, networkInfoDAO, ref, provider); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/java/com/redhat/thermostat/host/overview/client/core/HostOverviewView.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,62 @@ +/* + * 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.host.overview.client.core; + +import com.redhat.thermostat.client.core.views.BasicView; +import com.redhat.thermostat.client.core.views.UIComponent; + + +public abstract class HostOverviewView extends BasicView implements UIComponent { + + public abstract void setHostName(String newHostName); + + public abstract void setCpuModel(String newCpuModel); + + public abstract void setCpuCount(String newCpuCount); + + public abstract void setTotalMemory(String newTotalMemory); + + public abstract void setOsName(String newOsName); + + public abstract void setOsKernel(String newOsKernel); + + public abstract void setNetworkTableColumns(Object[] columns); + + public abstract void setInitialNetworkTableData(Object[][] table); + + public abstract void updateNetworkTableData(int row, int column, String data); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/java/com/redhat/thermostat/host/overview/client/core/HostOverviewViewProvider.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,45 @@ +/* + * 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.host.overview.client.core; + +import com.redhat.thermostat.client.core.views.ViewProvider; + +public interface HostOverviewViewProvider extends ViewProvider { + + @Override + public HostOverviewView createView(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/java/com/redhat/thermostat/host/overview/client/locale/LocaleResources.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,70 @@ +/* + * 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.host.overview.client.locale; + +import com.redhat.thermostat.common.locale.Translate; + +public enum LocaleResources { + NUMBER_AND_UNIT, + + HOST_INFO_TAB_OVERVIEW, + + HOST_OVERVIEW_SECTION_BASICS, + HOST_OVERVIEW_SECTION_HARDWARE, + HOST_OVERVIEW_SECTION_SOFTWARE, + + HOST_INFO_HOSTNAME, + HOST_INFO_CPU_COUNT, + HOST_INFO_CPU_MODEL, + HOST_INFO_OS_NAME, + HOST_INFO_OS_KERNEL, + + HOST_INFO_MEMORY_TOTAL, + HOST_INFO_NETWORK, + + NETWORK_INTERFACE_COLUMN, + NETWORK_IPV4_COLUMN, + NETWORK_IPV6_COLUMN, + ; + + static final String RESOURCE_BUNDLE = + "com.redhat.thermostat.host.overview.client.locale.strings"; + + public static Translate<LocaleResources> createLocalizer() { + return new Translate<>(RESOURCE_BUNDLE, LocaleResources.class); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/main/resources/com/redhat/thermostat/host/overview/client/locale/strings.properties Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,19 @@ +NUMBER_AND_UNIT = {0} {1} + +HOST_INFO_TAB_OVERVIEW = Overview + +HOST_OVERVIEW_SECTION_BASICS = Basics +HOST_OVERVIEW_SECTION_HARDWARE = Hardware +HOST_OVERVIEW_SECTION_SOFTWARE = Software + +HOST_INFO_HOSTNAME = Host +HOST_INFO_CPU_COUNT = Processor Count +HOST_INFO_CPU_MODEL = Processor Model +HOST_INFO_OS_NAME = OS Name +HOST_INFO_OS_KERNEL = OS Kernel +HOST_INFO_MEMORY_TOTAL = Total Memory +HOST_INFO_NETWORK = Network + +NETWORK_INTERFACE_COLUMN = Interface +NETWORK_IPV4_COLUMN = IPv4 Address +NETWORK_IPV6_COLUMN = IPv6 Address \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-core/src/test/java/com/redhat/thermostat/host/overview/client/core/HostOverviewControllerTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,181 @@ +/* + * 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.host.overview.client.core; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNotNull; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +import com.redhat.thermostat.client.core.views.BasicView.Action; +import com.redhat.thermostat.common.ActionEvent; +import com.redhat.thermostat.common.ActionListener; +import com.redhat.thermostat.common.Timer; +import com.redhat.thermostat.common.Timer.SchedulingType; +import com.redhat.thermostat.common.TimerFactory; +import com.redhat.thermostat.common.appctx.ApplicationContext; +import com.redhat.thermostat.common.appctx.ApplicationContextUtil; +import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.HostRef; +import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.host.overview.client.core.HostOverviewController; +import com.redhat.thermostat.host.overview.client.core.HostOverviewView; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; +import com.redhat.thermostat.storage.model.HostInfo; +import com.redhat.thermostat.storage.model.NetworkInterfaceInfo; + +public class HostOverviewControllerTest { + + private static final String HOST_NAME = "host-name"; + private static final String OS_NAME = "some os"; + private static final String KERNEL_NAME = "korn"; + private static final int CPU_COUNT = 99; + private static final String CPU_MODEL = "cpu-model"; + private static final long TOTAL_MEMORY = 99+99; + private static final String NETWORK_INTERFACE = "iface0"; + private static final String IPV4_ADDR = "0xcafef00d"; + private static final String IPV6_ADDR = "HOME_SWEET_HOME"; + + private Timer timer; + private Runnable timerAction; + private HostOverviewView view; + private ActionListener<HostOverviewView.Action> listener; + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Before + public void setUp() { + ApplicationContextUtil.resetApplicationContext(); + + // Setup timer + timer = mock(Timer.class); + ArgumentCaptor<Runnable> timerActionCaptor = ArgumentCaptor.forClass(Runnable.class); + doNothing().when(timer).setAction(timerActionCaptor.capture()); + + TimerFactory timerFactory = mock(TimerFactory.class); + when(timerFactory.createTimer()).thenReturn(timer); + ApplicationContext.getInstance().setTimerFactory(timerFactory); + + // Setup DAOs + HostInfo hostInfo = new HostInfo(HOST_NAME, OS_NAME, KERNEL_NAME, CPU_MODEL, CPU_COUNT, TOTAL_MEMORY); + + List<NetworkInterfaceInfo> networkInfo = new ArrayList<NetworkInterfaceInfo>(); + NetworkInterfaceInfo ifaceInfo = new NetworkInterfaceInfo(NETWORK_INTERFACE); + ifaceInfo.setIp4Addr(IPV4_ADDR); + ifaceInfo.setIp6Addr(IPV6_ADDR); + networkInfo.add(ifaceInfo); + + HostRef ref = mock(HostRef.class); + + HostInfoDAO hostInfoDao = mock(HostInfoDAO.class); + when(hostInfoDao.getHostInfo(any(HostRef.class))).thenReturn(hostInfo); + + NetworkInterfaceInfoDAO networkInfoDao = mock(NetworkInterfaceInfoDAO.class); + when(networkInfoDao.getNetworkInterfaces(any(HostRef.class))).thenReturn(networkInfo); + + // Setup View + ArgumentCaptor<ActionListener> listenerCaptor = ArgumentCaptor.forClass(ActionListener.class); + view = mock(HostOverviewView.class); + doNothing().when(view).addActionListener(listenerCaptor.capture()); + HostOverviewViewProvider viewProvider = mock(HostOverviewViewProvider.class); + when(viewProvider.createView()).thenReturn(view); + + @SuppressWarnings("unused") + HostOverviewController controller = new HostOverviewController(hostInfoDao, networkInfoDao, ref, viewProvider); + + listener = listenerCaptor.getValue(); + timerAction = timerActionCaptor.getValue(); + } + + @After + public void tearDown() { + ApplicationContextUtil.resetApplicationContext(); + } + + @Test + public void verifyViewIsUpdatedWithData() { + timerAction.run(); + + verify(view).setCpuCount(eq(String.valueOf(CPU_COUNT))); + verify(view).setCpuModel(eq(CPU_MODEL)); + verify(view).setHostName(eq(HOST_NAME)); + + verify(view).setNetworkTableColumns(any(String[][].class)); + verify(view).setInitialNetworkTableData(eq(new String[][] { new String[] { NETWORK_INTERFACE, IPV4_ADDR, IPV6_ADDR }, })); + + verify(view).setOsKernel(eq(KERNEL_NAME)); + verify(view).setOsName(eq(OS_NAME)); + + final String UNITS = " B"; + verify(view).setTotalMemory(eq(String.valueOf(TOTAL_MEMORY + UNITS))); + } + + @Test + public void verifyTimerIsSetUpCorrectly() { + assertNotNull(timer); + + verify(timer).setAction(isNotNull(Runnable.class)); + verify(timer).setDelay(5); + verify(timer).setTimeUnit(TimeUnit.SECONDS); + verify(timer).setInitialDelay(0); + verify(timer).setSchedulingType(SchedulingType.FIXED_RATE); + } + + @Test + public void verifyTimerRunsWhenNeeded() { + listener.actionPerformed(new ActionEvent<>(view, Action.VISIBLE)); + + verify(timer).start(); + + listener.actionPerformed(new ActionEvent<>(view, Action.HIDDEN)); + + verify(timer).stop(); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-swing/pom.xml Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>thermostat-host-overview</artifactId> + <groupId>com.redhat.thermostat</groupId> + <version>0.5.0-SNAPSHOT</version> + </parent> + <artifactId>thermostat-host-overview-client-swing</artifactId> + <packaging>bundle</packaging> + <name>Thermostat Host Overview Swing Client plugin</name> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Private-Package>com.redhat.thermostat.host.overview.client.swing</Private-Package> + <Bundle-Activator>com.redhat.thermostat.host.overview.client.swing.Activator</Bundle-Activator> + <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor> + <Bundle-SymbolicName>com.redhat.thermostat.host.overview.client.swing</Bundle-SymbolicName> + <!-- Do not autogenerate uses clauses in Manifests --> + <_nouses>true</_nouses> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <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.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-common-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-client-swing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat-host-overview-client-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/Activator.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,97 @@ +/* + * 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.host.overview.client.swing; + +import java.util.Map; +import java.util.Objects; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceRegistration; + +import com.redhat.thermostat.client.core.HostInformationService; +import com.redhat.thermostat.common.MultipleServiceTracker; +import com.redhat.thermostat.common.MultipleServiceTracker.Action; +import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.host.overview.client.core.HostOverviewService; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; + +public class Activator implements BundleActivator { + + private MultipleServiceTracker tracker; + private ServiceRegistration reg; + + @Override + public void start(final BundleContext context) throws Exception { + HostOverviewViewProvider viewProvider = new SwingHostOverviewViewProvider(); + context.registerService(HostOverviewViewProvider.class.getName(), viewProvider, null); + + Class<?>[] deps = new Class<?>[] { + HostInfoDAO.class, + NetworkInterfaceInfoDAO.class, + }; + + tracker = new MultipleServiceTracker(context, deps, new Action() { + + @Override + public void dependenciesAvailable(Map<String, Object> services) { + HostInfoDAO hostInfoDAO = (HostInfoDAO) services.get(HostInfoDAO.class.getName()); + Objects.requireNonNull(hostInfoDAO); + NetworkInterfaceInfoDAO networkInfoDAO = (NetworkInterfaceInfoDAO) + services.get(NetworkInterfaceInfoDAO.class.getName()); + Objects.requireNonNull(networkInfoDAO); + HostOverviewService service = new HostOverviewService(hostInfoDAO, networkInfoDAO); + reg = context.registerService(HostInformationService.class.getName(), service, null); + } + + @Override + public void dependenciesUnavailable() { + reg.unregister(); + } + + }); + tracker.open(); + } + + @Override + public void stop(BundleContext context) throws Exception { + tracker.close(); + } + +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/HostOverviewPanel.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,309 @@ +/* + * 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.host.overview.client.swing; + +import java.awt.BorderLayout; +import java.awt.Component; + +import javax.swing.GroupLayout; +import javax.swing.GroupLayout.Alignment; +import javax.swing.JPanel; +import javax.swing.JTable; +import javax.swing.LayoutStyle.ComponentPlacement; +import javax.swing.SwingUtilities; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.JTableHeader; + +import com.redhat.thermostat.client.swing.SwingComponent; +import com.redhat.thermostat.client.swing.components.LabelField; +import com.redhat.thermostat.client.swing.components.SectionHeader; +import com.redhat.thermostat.client.swing.components.ValueField; +import com.redhat.thermostat.client.ui.ComponentVisibleListener; +import com.redhat.thermostat.common.ActionListener; +import com.redhat.thermostat.common.locale.Translate; +import com.redhat.thermostat.host.overview.client.core.HostOverviewView; +import com.redhat.thermostat.host.overview.client.locale.LocaleResources; + +public class HostOverviewPanel extends HostOverviewView implements SwingComponent { + + private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer(); + + private JPanel visiblePanel; + + private final ValueField hostname = new ValueField("${hostname}"); + private final ValueField cpuModel = new ValueField("${cpu-model}"); + private final ValueField cpuCount = new ValueField("${cpu-count}"); + private final ValueField totalMemory = new ValueField("${total-memory}"); + private final ValueField osName = new ValueField("${os-name}"); + private final ValueField osKernel = new ValueField("${os-kernel}"); + + private final DefaultTableModel networkTableModel = new DefaultTableModel() { + @Override + public boolean isCellEditable(int row, int column) { + return false; + } + }; + + private Object[] networkTableColumns; + private Object[][] networkTableData; + + public HostOverviewPanel() { + super(); + initializePanel(); + + visiblePanel.addHierarchyListener(new ComponentVisibleListener() { + @Override + public void componentShown(Component component) { + notifier.fireAction(Action.VISIBLE); + } + + @Override + public void componentHidden(Component component) { + notifier.fireAction(Action.HIDDEN); + } + }); + } + + @Override + public void addActionListener(ActionListener<Action> listener) { + notifier.addActionListener(listener); + } + + @Override + public void removeActionListener(ActionListener<Action> listener) { + notifier.removeActionListener(listener); + } + + @Override + public void setHostName(final String newHostName) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + hostname.setText(newHostName); + } + }); + } + + @Override + public void setCpuModel(final String newCpuModel) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + cpuModel.setText(newCpuModel); + } + }); + } + + @Override + public void setCpuCount(final String newCpuCount) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + cpuCount.setText(newCpuCount); + } + }); + } + + @Override + public void setTotalMemory(final String newTotalMemory) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + totalMemory.setText(newTotalMemory); + } + }); + } + + @Override + public void setOsName(final String newOsName) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + osName.setText(newOsName); + } + }); + } + + @Override + public void setOsKernel(final String newOsKernel) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + osKernel.setText(newOsKernel); + } + }); + } + + @Override + public void setNetworkTableColumns(final Object[] columns) { + this.networkTableColumns = columns; + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + networkTableModel.setColumnIdentifiers(networkTableColumns); + } + }); + } + + @Override + public void setInitialNetworkTableData(final Object[][] data) { + this.networkTableData = data; + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + networkTableModel.setDataVector(networkTableData, networkTableColumns); + } + }); + } + + @Override + public void updateNetworkTableData(final int row, final int column, final String data) { + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + networkTableModel.setValueAt(data, row, column); + } + }); + } + + @Override + public Component getUiComponent() { + return visiblePanel; + } + + private void initializePanel() { + visiblePanel = new JPanel(); + SectionHeader overviewSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_BASICS)); + LabelField hostnameLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_HOSTNAME)); + SectionHeader hardwareSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_HARDWARE)); + LabelField cpuModelLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_CPU_MODEL)); + LabelField cpuCountLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_CPU_COUNT)); + LabelField memoryTotalLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_MEMORY_TOTAL)); + LabelField networkLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_NETWORK)); + SectionHeader softwareSection = new SectionHeader(translator.localize(LocaleResources.HOST_OVERVIEW_SECTION_SOFTWARE)); + LabelField osNameLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_OS_NAME)); + LabelField osKernelLabel = new LabelField(translator.localize(LocaleResources.HOST_INFO_OS_KERNEL)); + + JPanel panel = new JPanel(); + + GroupLayout gl_visiblePanel = new GroupLayout(visiblePanel); + gl_visiblePanel.setHorizontalGroup( + gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addContainerGap() + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(hardwareSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) + .addComponent(overviewSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.TRAILING, false) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addGap(12) + .addComponent(hostnameLabel, GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE)) + .addComponent(cpuCountLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cpuModelLabel, GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE) + .addComponent(memoryTotalLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addGap(12) + .addComponent(networkLabel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(panel, GroupLayout.DEFAULT_SIZE, 462, Short.MAX_VALUE) + .addComponent(cpuCount, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cpuModel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(hostname, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(totalMemory, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(softwareSection, GroupLayout.DEFAULT_SIZE, 620, Short.MAX_VALUE) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addGap(12) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) + .addComponent(osKernelLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(osNameLabel, Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 129, Short.MAX_VALUE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(osKernel, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(osName, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addContainerGap()) + ); + gl_visiblePanel.setVerticalGroup( + gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addGroup(gl_visiblePanel.createSequentialGroup() + .addContainerGap() + .addComponent(overviewSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) + .addComponent(hostname, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addComponent(hostnameLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.UNRELATED) + .addComponent(hardwareSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) + .addComponent(cpuModelLabel, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addComponent(cpuModel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING, false) + .addComponent(cpuCountLabel, GroupLayout.PREFERRED_SIZE, 15, GroupLayout.PREFERRED_SIZE) + .addComponent(cpuCount, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(memoryTotalLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(totalMemory, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(networkLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(panel, GroupLayout.PREFERRED_SIZE, 109, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addComponent(softwareSection, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(osNameLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(osName, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_visiblePanel.createParallelGroup(Alignment.LEADING) + .addComponent(osKernelLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addComponent(osKernel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addGap(128)) + ); + + panel.setLayout(new BorderLayout(0, 0)); + + JTable networkTable = new JTable(networkTableModel); + panel.add(networkTable); + JTableHeader header = networkTable.getTableHeader(); + panel.add(header, BorderLayout.PAGE_START); + visiblePanel.setLayout(gl_visiblePanel); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-swing/src/main/java/com/redhat/thermostat/host/overview/client/swing/SwingHostOverviewViewProvider.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,49 @@ +/* + * 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.host.overview.client.swing; + +import com.redhat.thermostat.host.overview.client.core.HostOverviewView; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; + +public class SwingHostOverviewViewProvider implements HostOverviewViewProvider { + + @Override + public HostOverviewView createView() { + return new HostOverviewPanel(); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/client-swing/src/test/java/com/redhat/thermostat/host/overview/client/swing/ActivatorTest.java Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,104 @@ +/* + * 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.host.overview.client.swing; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + +import org.junit.Test; + +import com.redhat.thermostat.client.core.HostInformationService; +import com.redhat.thermostat.common.dao.HostInfoDAO; +import com.redhat.thermostat.common.dao.NetworkInterfaceInfoDAO; +import com.redhat.thermostat.host.overview.client.core.HostOverviewService; +import com.redhat.thermostat.host.overview.client.core.HostOverviewViewProvider; +import com.redhat.thermostat.host.overview.client.swing.Activator; +import com.redhat.thermostat.host.overview.client.swing.SwingHostOverviewViewProvider; +import com.redhat.thermostat.test.StubBundleContext; + +public class ActivatorTest { + + @Test + public void verifyActivatorDoesNotRegisterServiceOnMissingDeps() throws Exception { + StubBundleContext context = new StubBundleContext(); + + Activator activator = new Activator(); + + activator.start(context); + + // View provider registers unconditionally + assertEquals(1, context.getAllServices().size()); + assertNotSame(1, context.getServiceListeners().size()); + + activator.stop(context); + + assertEquals(0, context.getServiceListeners().size()); + } + + @Test + public void verifyActivatorRegistersServices() throws Exception { + StubBundleContext context = new StubBundleContext(); + HostInfoDAO hostInfoDAO = mock(HostInfoDAO.class); + NetworkInterfaceInfoDAO networkInfoDAO = mock(NetworkInterfaceInfoDAO.class); + + context.registerService(HostInfoDAO.class, hostInfoDAO, null); + context.registerService(NetworkInterfaceInfoDAO.class, networkInfoDAO, null); + + Activator activator = new Activator(); + + activator.start(context); + + assertTrue(context.isServiceRegistered(HostInformationService.class.getName(), HostOverviewService.class)); + + activator.stop(context); + + assertEquals(0, context.getServiceListeners().size()); + assertEquals(3, context.getAllServices().size()); + } + + @Test + public void verifyStartRegistersViewProvider() throws Exception { + StubBundleContext ctx = new StubBundleContext(); + Activator activator = new Activator(); + activator.start(ctx); + assertTrue(ctx.isServiceRegistered(HostOverviewViewProvider.class.getName(), SwingHostOverviewViewProvider.class)); + assertEquals(1, ctx.getAllServices().size()); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/host-overview/pom.xml Tue Nov 27 14:45:51 2012 -0500 @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>com.redhat.thermostat</groupId> + <artifactId>thermostat</artifactId> + <version>0.5.0-SNAPSHOT</version> + </parent> + + <artifactId>thermostat-host-overview</artifactId> + <packaging>pom</packaging> + + <name>Thermostat Host Overview plugin</name> + + <modules> + <module>client-core</module> + <module>client-swing</module> + </modules> + +</project>