Mercurial > hg > release > thermostat-0.7
changeset 1040:fd4f84176be8
Moves classes from c.r.t.client.osgi.service to c.r.t.client.ui
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-March/006089.html
line wrap: on
line diff
--- a/client/core/pom.xml Wed Mar 20 13:11:02 2013 -0400 +++ b/client/core/pom.xml Wed Mar 20 13:31:06 2013 -0400 @@ -119,7 +119,6 @@ <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor> <Bundle-SymbolicName>com.redhat.thermostat.client.core</Bundle-SymbolicName> <Export-Package> - com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.client.locale, <!-- Interfaces for views, controllers, etc. -->
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/ContextAction.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -/** - * Parent interface for all context-sensitive actions. - * <p> - * {@code ContextAction}s are executed once the user selects the appropriate UI - * elements in the view and triggers the registered action. - * <p> - * The name of the action (as returned by {@link #getName()}) is likely to be - * user-visible and should be localized. - * - * <h2>Implementation Notes</h2> - * <p> - * The following information is specific to the current release and may change - * in a future release. - * <p> - * The swing client uses {@code ContextAction}s to mostly implement menus. Some - * of these menus are shown when a user right-clicks on a widget, but some are - * associated with a window. - * - * @see MenuAction - * @see VMContextAction - */ -public interface ContextAction { - - /** A user-visible name for this action */ - String getName(); - - /** A user-visible description for this action */ - String getDescription(); -} -
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/DecoratorProvider.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.ui.Decorator; -import com.redhat.thermostat.storage.core.Ref; - -/** - * This interface allows plugins to install a custom {@link Decorator} into - * the Reference List view. - * - * <br /><br /> - * - * Active {@link Decorator}s are first queried against their filters - * and then installed into the view if the filter passes. - */ -public interface DecoratorProvider<T extends Ref> { - - Decorator getDecorator(); - Filter<T> getFilter(); - -} -
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/HostContextAction.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import com.redhat.thermostat.annotations.ExtensionPoint; -import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.storage.core.HostRef; - -/** - * {@code HostContextAction}s provide actions that are associated with hosts and - * can be invoked by users. The exact position and appearance of these - * {@code HostContextAction}s varies based on the implementation. - * <p> - * Plugins can register implementations of this interface as OSGi services to - * provide additional {@code HostContextAction}s. - * <p> - * <h2>Implementation Note</h2> - * <p> - * The following information is specific to the current release and may change - * in a future release. - * <p> - * The swing client uses instances of this interface to provide menu items for - * the Host/VM tree. The menu is shown when a user right clicks a host in the - * Host/VM tree. A menu item for every {@code HostContextAction} is added, if - * the {@link Filter} matches, to this menu. Selecting a menu item invokes the - * appropriate {@code HostContextAction}. - * - * @see VMContextAction - */ -@ExtensionPoint -public interface HostContextAction extends ContextAction { - - /** - * A user-visible name for this {@code HostContextAction}. This should be - * localized. - */ - @Override - String getName(); - - /** - * A user-visible description for this {@code HostContextAction}. This - * should be localized. - */ - @Override - String getDescription(); - - /** - * Invoked when the user selects this {@code HostContextAction}. - * - * @param reference the host on which this {@code HostContextAction} was - * invoked on. - */ - void execute(HostRef reference); - - /** - * The {@link Filter} returned by this method is used to select what VMs - * this {@code HostContextAction} is applicable to. - */ - Filter<HostRef> getFilter(); -} -
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/MenuAction.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import com.redhat.thermostat.annotations.ExtensionPoint; - -/** - * {@code MenuAction}s are used to create top-level menu items in the main - * window. - * <p> - * Plugins can register menu items by creating classes that implement this - * interface and registering them as OSGi services. To register a menu item for - * for the menu "File" in thermostat client window, register a service that - * returns <code> {"File", getName()}</code> from {@link #getPath()}. - * - * <h2>Implementation Notes</h2> - * <p> - * The following information is specific to the current release and may change - * in a future release. - * <p> - * The swing client uses {@code MenuActions}s to implement top-level menus in - * the main window only. - */ -@ExtensionPoint -public interface MenuAction extends ContextAction { - - public static enum Type { - CHECK, - RADIO, - STANDARD - } - - /** The user-visible text displayed as the menu item. */ - @Override - public String getName(); - - /** A user-visible description of what this {@code MenuAction} does. */ - @Override - public String getDescription(); - - /** Invoked when the user selects this menu item */ - void execute(); - - /** The type of the menu (radio, check, standard) */ - Type getType(); - - /** The path to the menu action. The last element must equal getName() */ - String[] getPath(); - -} -
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/MenuRegistry.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.InvalidSyntaxException; - -import com.redhat.thermostat.common.ThermostatExtensionRegistry; - -public class MenuRegistry extends ThermostatExtensionRegistry<MenuAction> { - - private static final String FILTER = "(" + Constants.OBJECTCLASS + "=" + MenuAction.class.getName() + ")"; - - public MenuRegistry(BundleContext context) throws InvalidSyntaxException { - super(context, FILTER, MenuAction.class); - } - -} -
--- a/client/core/src/main/java/com/redhat/thermostat/client/osgi/service/VMContextAction.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import com.redhat.thermostat.annotations.ExtensionPoint; -import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.storage.core.VmRef; - -/** - * {@code VMContextAction}s provide actions that are associated with Java - * Virtual Machines and can be invoked by users. The exact position and - * appearance of these {@code VMContextAction}s varies based on the client - * implementation. - * <p> - * Plugins can register implementation of this interface as OSGi services to - * provide additional {@code VMContextAction}s. - * <p> - * <h2>Implementation Note</h2> - * <p> - * The following information is specific to the current release and may change - * in a future release. - * <p> - * The swing client uses instances of this class to provide menu items in the - * Host/VM tree. The menu is shown when a user right-clicks a VM in the Host/VM - * tree. A menu item for every {@link VMContextAction} is added, if the - * {@code Filter} matches, to this menu. Selecting a menu item invokes the - * corresponding {@code VMContextAction}. - * - * @see HostContextAction - */ -@ExtensionPoint -public interface VMContextAction extends ContextAction { - - /** - * A user-visible name for this {@code VMContextAction}. Should be - * localized. - */ - @Override - public String getName(); - - /** - * A user-visible description for {@code VMContextAction}. Should be - * localized. - */ - @Override - public String getDescription(); - - /** - * Invoked when the user selects this {@code VMContextAction}. - * - * @param reference specifies the vm that this {@code VMContextAction} was - * invoked on. - */ - void execute(VmRef reference); - - /** - * The {@link Filter} returned by this method is used to select what VMs - * this {@code VMContextAction} is applicable to. - */ - Filter<VmRef> getFilter(); -} -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/ContextAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,68 @@ +/* + * Copyright 2012, 2013 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; + +/** + * Parent interface for all context-sensitive actions. + * <p> + * {@code ContextAction}s are executed once the user selects the appropriate UI + * elements in the view and triggers the registered action. + * <p> + * The name of the action (as returned by {@link #getName()}) is likely to be + * user-visible and should be localized. + * + * <h2>Implementation Notes</h2> + * <p> + * The following information is specific to the current release and may change + * in a future release. + * <p> + * The swing client uses {@code ContextAction}s to mostly implement menus. Some + * of these menus are shown when a user right-clicks on a widget, but some are + * associated with a window. + * + * @see MenuAction + * @see VMContextAction + */ +public interface ContextAction { + + /** A user-visible name for this action */ + String getName(); + + /** A user-visible description for this action */ + String getDescription(); +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/DecoratorProvider.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,57 @@ +/* + * Copyright 2012, 2013 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 com.redhat.thermostat.client.core.Filter; +import com.redhat.thermostat.storage.core.Ref; + +/** + * This interface allows plugins to install a custom {@link Decorator} into + * the Reference List view. + * + * <br /><br /> + * + * Active {@link Decorator}s are first queried against their filters + * and then installed into the view if the filter passes. + */ +public interface DecoratorProvider<T extends Ref> { + + Decorator getDecorator(); + Filter<T> getFilter(); + +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/HostContextAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,95 @@ +/* + * Copyright 2012, 2013 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 com.redhat.thermostat.annotations.ExtensionPoint; +import com.redhat.thermostat.client.core.Filter; +import com.redhat.thermostat.storage.core.HostRef; + +/** + * {@code HostContextAction}s provide actions that are associated with hosts and + * can be invoked by users. The exact position and appearance of these + * {@code HostContextAction}s varies based on the implementation. + * <p> + * Plugins can register implementations of this interface as OSGi services to + * provide additional {@code HostContextAction}s. + * <p> + * <h2>Implementation Note</h2> + * <p> + * The following information is specific to the current release and may change + * in a future release. + * <p> + * The swing client uses instances of this interface to provide menu items for + * the Host/VM tree. The menu is shown when a user right clicks a host in the + * Host/VM tree. A menu item for every {@code HostContextAction} is added, if + * the {@link Filter} matches, to this menu. Selecting a menu item invokes the + * appropriate {@code HostContextAction}. + * + * @see VMContextAction + */ +@ExtensionPoint +public interface HostContextAction extends ContextAction { + + /** + * A user-visible name for this {@code HostContextAction}. This should be + * localized. + */ + @Override + String getName(); + + /** + * A user-visible description for this {@code HostContextAction}. This + * should be localized. + */ + @Override + String getDescription(); + + /** + * Invoked when the user selects this {@code HostContextAction}. + * + * @param reference the host on which this {@code HostContextAction} was + * invoked on. + */ + void execute(HostRef reference); + + /** + * The {@link Filter} returned by this method is used to select what VMs + * this {@code HostContextAction} is applicable to. + */ + Filter<HostRef> getFilter(); +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/MenuAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,84 @@ +/* + * Copyright 2012, 2013 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 com.redhat.thermostat.annotations.ExtensionPoint; + +/** + * {@code MenuAction}s are used to create top-level menu items in the main + * window. + * <p> + * Plugins can register menu items by creating classes that implement this + * interface and registering them as OSGi services. To register a menu item for + * for the menu "File" in thermostat client window, register a service that + * returns <code> {"File", getName()}</code> from {@link #getPath()}. + * + * <h2>Implementation Notes</h2> + * <p> + * The following information is specific to the current release and may change + * in a future release. + * <p> + * The swing client uses {@code MenuActions}s to implement top-level menus in + * the main window only. + */ +@ExtensionPoint +public interface MenuAction extends ContextAction { + + public static enum Type { + CHECK, + RADIO, + STANDARD + } + + /** The user-visible text displayed as the menu item. */ + @Override + public String getName(); + + /** A user-visible description of what this {@code MenuAction} does. */ + @Override + public String getDescription(); + + /** Invoked when the user selects this menu item */ + void execute(); + + /** The type of the menu (radio, check, standard) */ + Type getType(); + + /** The path to the menu action. The last element must equal getName() */ + String[] getPath(); + +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/MenuRegistry.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,53 @@ +/* + * Copyright 2012, 2013 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 org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; + +import com.redhat.thermostat.common.ThermostatExtensionRegistry; + +public class MenuRegistry extends ThermostatExtensionRegistry<MenuAction> { + + private static final String FILTER = "(" + Constants.OBJECTCLASS + "=" + MenuAction.class.getName() + ")"; + + public MenuRegistry(BundleContext context) throws InvalidSyntaxException { + super(context, FILTER, MenuAction.class); + } + +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/main/java/com/redhat/thermostat/client/ui/VMContextAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,96 @@ +/* + * Copyright 2012, 2013 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 com.redhat.thermostat.annotations.ExtensionPoint; +import com.redhat.thermostat.client.core.Filter; +import com.redhat.thermostat.storage.core.VmRef; + +/** + * {@code VMContextAction}s provide actions that are associated with Java + * Virtual Machines and can be invoked by users. The exact position and + * appearance of these {@code VMContextAction}s varies based on the client + * implementation. + * <p> + * Plugins can register implementation of this interface as OSGi services to + * provide additional {@code VMContextAction}s. + * <p> + * <h2>Implementation Note</h2> + * <p> + * The following information is specific to the current release and may change + * in a future release. + * <p> + * The swing client uses instances of this class to provide menu items in the + * Host/VM tree. The menu is shown when a user right-clicks a VM in the Host/VM + * tree. A menu item for every {@link VMContextAction} is added, if the + * {@code Filter} matches, to this menu. Selecting a menu item invokes the + * corresponding {@code VMContextAction}. + * + * @see HostContextAction + */ +@ExtensionPoint +public interface VMContextAction extends ContextAction { + + /** + * A user-visible name for this {@code VMContextAction}. Should be + * localized. + */ + @Override + public String getName(); + + /** + * A user-visible description for {@code VMContextAction}. Should be + * localized. + */ + @Override + public String getDescription(); + + /** + * Invoked when the user selects this {@code VMContextAction}. + * + * @param reference specifies the vm that this {@code VMContextAction} was + * invoked on. + */ + void execute(VmRef reference); + + /** + * The {@link Filter} returned by this method is used to select what VMs + * this {@code VMContextAction} is applicable to. + */ + Filter<VmRef> getFilter(); +} +
--- a/client/core/src/test/java/com/redhat/thermostat/client/osgi/service/MenuRegistryTest.java Wed Mar 20 13:11:02 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -/* - * Copyright 2012, 2013 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.osgi.service; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.junit.Test; -import org.mockito.ArgumentCaptor; -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; - -import com.redhat.thermostat.common.ActionEvent; -import com.redhat.thermostat.common.ActionListener; -import com.redhat.thermostat.common.ThermostatExtensionRegistry; - -public class MenuRegistryTest { - - @Test - public void verifyMenuRegistryReactsToMenuActions() throws InvalidSyntaxException { - ArgumentCaptor<ServiceListener> serviceListenerCaptor = ArgumentCaptor.forClass(ServiceListener.class); - ArgumentCaptor<String> filterCaptor = ArgumentCaptor.forClass(String.class); - - ActionListener<ThermostatExtensionRegistry.Action> menuListener = mock(ActionListener.class); - MenuAction menuAction = mock(MenuAction.class); - - BundleContext context = mock(BundleContext.class); - doNothing().when(context).addServiceListener(serviceListenerCaptor.capture(), filterCaptor.capture()); - - ServiceReference ref = mock(ServiceReference.class); - when(ref.getProperty("objectClass")).thenReturn(MenuAction.class.getName()); - - when(context.getService(ref)).thenReturn(menuAction); - - MenuRegistry registry = new MenuRegistry(context); - registry.addActionListener(menuListener); - registry.start(); - - ServiceListener serviceListener = serviceListenerCaptor.getValue(); - serviceListener.serviceChanged(new ServiceEvent(ServiceEvent.REGISTERED, ref)); - - ArgumentCaptor<ActionEvent> eventCaptor = ArgumentCaptor.forClass(ActionEvent.class); - serviceListener.serviceChanged(new ServiceEvent(ServiceEvent.UNREGISTERING, ref)); - - verify(menuListener, times(2)).actionPerformed(eventCaptor.capture()); - - ActionEvent firstEvent = eventCaptor.getAllValues().get(0); - ActionEvent secondEvent = eventCaptor.getAllValues().get(1); - - assertEquals(ThermostatExtensionRegistry.Action.SERVICE_ADDED, firstEvent.getActionId()); - assertEquals(ThermostatExtensionRegistry.Action.SERVICE_REMOVED, secondEvent.getActionId()); - - } -} -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/core/src/test/java/com/redhat/thermostat/client/ui/MenuRegistryTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -0,0 +1,98 @@ +/* + * Copyright 2012, 2013 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.assertEquals; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceReference; + +import com.redhat.thermostat.client.ui.MenuAction; +import com.redhat.thermostat.client.ui.MenuRegistry; +import com.redhat.thermostat.common.ActionEvent; +import com.redhat.thermostat.common.ActionListener; +import com.redhat.thermostat.common.ThermostatExtensionRegistry; + +public class MenuRegistryTest { + + @Test + public void verifyMenuRegistryReactsToMenuActions() throws InvalidSyntaxException { + ArgumentCaptor<ServiceListener> serviceListenerCaptor = ArgumentCaptor.forClass(ServiceListener.class); + ArgumentCaptor<String> filterCaptor = ArgumentCaptor.forClass(String.class); + + ActionListener<ThermostatExtensionRegistry.Action> menuListener = mock(ActionListener.class); + MenuAction menuAction = mock(MenuAction.class); + + BundleContext context = mock(BundleContext.class); + doNothing().when(context).addServiceListener(serviceListenerCaptor.capture(), filterCaptor.capture()); + + ServiceReference ref = mock(ServiceReference.class); + when(ref.getProperty("objectClass")).thenReturn(MenuAction.class.getName()); + + when(context.getService(ref)).thenReturn(menuAction); + + MenuRegistry registry = new MenuRegistry(context); + registry.addActionListener(menuListener); + registry.start(); + + ServiceListener serviceListener = serviceListenerCaptor.getValue(); + serviceListener.serviceChanged(new ServiceEvent(ServiceEvent.REGISTERED, ref)); + + ArgumentCaptor<ActionEvent> eventCaptor = ArgumentCaptor.forClass(ActionEvent.class); + serviceListener.serviceChanged(new ServiceEvent(ServiceEvent.UNREGISTERING, ref)); + + verify(menuListener, times(2)).actionPerformed(eventCaptor.capture()); + + ActionEvent firstEvent = eventCaptor.getAllValues().get(0); + ActionEvent secondEvent = eventCaptor.getAllValues().get(1); + + assertEquals(ThermostatExtensionRegistry.Action.SERVICE_ADDED, firstEvent.getActionId()); + assertEquals(ThermostatExtensionRegistry.Action.SERVICE_REMOVED, secondEvent.getActionId()); + + } +} +
--- a/client/living-vm-filter/core/src/main/java/com/redhat/thermostat/client/filter/vm/core/LivingVMFilterMenuAction.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/core/src/main/java/com/redhat/thermostat/client/filter/vm/core/LivingVMFilterMenuAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -36,7 +36,7 @@ package com.redhat.thermostat.client.filter.vm.core; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.MenuAction; class LivingVMFilterMenuAction implements MenuAction {
--- a/client/living-vm-filter/core/src/main/java/com/redhat/thermostat/client/filter/vm/core/VMFilterActivator.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/core/src/main/java/com/redhat/thermostat/client/filter/vm/core/VMFilterActivator.java Wed Mar 20 13:31:06 2013 -0400 @@ -50,7 +50,7 @@ import org.osgi.util.tracker.ServiceTracker; import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.MenuAction; import com.redhat.thermostat.common.Constants; import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.storage.dao.VmInfoDAO;
--- a/client/living-vm-filter/core/src/test/java/com/redhat/thermostat/client/filter/vm/core/VMFilterActivatorTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/core/src/test/java/com/redhat/thermostat/client/filter/vm/core/VMFilterActivatorTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -44,7 +44,7 @@ import org.osgi.framework.ServiceRegistration; import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.MenuAction; import com.redhat.thermostat.storage.dao.VmInfoDAO; import com.redhat.thermostat.testutils.StubBundleContext; import com.redhat.thermostat.testutils.StubServiceReference;
--- a/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/DeadVMDecoratorProvider.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/DeadVMDecoratorProvider.java Wed Mar 20 13:31:06 2013 -0400 @@ -39,8 +39,8 @@ import java.io.IOException; import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; import com.redhat.thermostat.client.ui.Decorator; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.client.ui.IconDescriptor; import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.storage.dao.VmInfoDAO;
--- a/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/LivingVMDecoratorProvider.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/LivingVMDecoratorProvider.java Wed Mar 20 13:31:06 2013 -0400 @@ -40,9 +40,9 @@ import com.redhat.thermostat.client.core.Filter; import com.redhat.thermostat.client.filter.vm.core.LivingVMFilter; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; import com.redhat.thermostat.client.swing.IconResource; import com.redhat.thermostat.client.ui.Decorator; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.client.ui.IconDescriptor; import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.storage.dao.VmInfoDAO;
--- a/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivator.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/swing/src/main/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivator.java Wed Mar 20 13:31:06 2013 -0400 @@ -49,7 +49,7 @@ import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.common.Constants; import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.storage.dao.VmInfoDAO;
--- a/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivatorTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/living-vm-filter/swing/src/test/java/com/redhat/thermostat/client/filter/vm/swing/VMFilterActivatorTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,7 +43,7 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.storage.dao.VmInfoDAO; import com.redhat.thermostat.testutils.StubBundleContext; import com.redhat.thermostat.testutils.StubServiceReference;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/MenuHelper.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/MenuHelper.java Wed Mar 20 13:31:06 2013 -0400 @@ -49,7 +49,7 @@ import javax.swing.JRadioButtonMenuItem; import javax.swing.MenuElement; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.MenuAction; import com.redhat.thermostat.common.utils.LoggingUtils; import com.redhat.thermostat.common.utils.StringUtils;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/HostIconDecoratorProvider.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/HostIconDecoratorProvider.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,9 +43,9 @@ import com.redhat.thermostat.client.core.Filter; import com.redhat.thermostat.client.core.NameMatchingRefFilter; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; import com.redhat.thermostat.client.swing.IconResource; import com.redhat.thermostat.client.ui.Decorator; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.client.ui.IconDescriptor; import com.redhat.thermostat.common.utils.StreamUtils; import com.redhat.thermostat.storage.core.HostRef;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/HostTreeDecoratorRegistry.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/HostTreeDecoratorRegistry.java Wed Mar 20 13:31:06 2013 -0400 @@ -40,7 +40,7 @@ import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.common.ThermostatExtensionRegistry; import com.redhat.thermostat.storage.core.HostRef;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainView.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainView.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,9 +43,9 @@ import com.redhat.thermostat.client.core.Filter; import com.redhat.thermostat.client.core.views.BasicView; -import com.redhat.thermostat.client.osgi.service.ContextAction; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.ContextAction; +import com.redhat.thermostat.client.ui.DecoratorProvider; +import com.redhat.thermostat.client.ui.MenuAction; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; import com.redhat.thermostat.storage.core.HostRef;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindow.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindow.java Wed Mar 20 13:31:06 2013 -0400 @@ -93,11 +93,6 @@ import com.redhat.thermostat.client.core.Filter; import com.redhat.thermostat.client.core.views.BasicView; import com.redhat.thermostat.client.locale.LocaleResources; -import com.redhat.thermostat.client.osgi.service.ContextAction; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; -import com.redhat.thermostat.client.osgi.service.HostContextAction; -import com.redhat.thermostat.client.osgi.service.MenuAction; -import com.redhat.thermostat.client.osgi.service.VMContextAction; import com.redhat.thermostat.client.swing.EdtHelper; import com.redhat.thermostat.client.swing.MenuHelper; import com.redhat.thermostat.client.swing.SwingComponent; @@ -106,8 +101,13 @@ import com.redhat.thermostat.client.swing.components.StatusBar; import com.redhat.thermostat.client.swing.components.ThermostatPopupMenu; import com.redhat.thermostat.client.swing.internal.components.DecoratedDefaultMutableTreeNode; +import com.redhat.thermostat.client.ui.ContextAction; import com.redhat.thermostat.client.ui.Decorator; +import com.redhat.thermostat.client.ui.DecoratorProvider; +import com.redhat.thermostat.client.ui.HostContextAction; import com.redhat.thermostat.client.ui.IconDescriptor; +import com.redhat.thermostat.client.ui.MenuAction; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; import com.redhat.thermostat.common.ActionNotifier;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindowControllerImpl.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/MainWindowControllerImpl.java Wed Mar 20 13:31:06 2013 -0400 @@ -61,12 +61,6 @@ import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmInformationViewProvider; -import com.redhat.thermostat.client.osgi.service.ContextAction; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; -import com.redhat.thermostat.client.osgi.service.HostContextAction; -import com.redhat.thermostat.client.osgi.service.MenuAction; -import com.redhat.thermostat.client.osgi.service.MenuRegistry; -import com.redhat.thermostat.client.osgi.service.VMContextAction; import com.redhat.thermostat.client.swing.internal.MainView.Action; import com.redhat.thermostat.client.swing.internal.osgi.HostContextActionServiceTracker; import com.redhat.thermostat.client.swing.internal.osgi.InformationServiceTracker; @@ -74,9 +68,15 @@ import com.redhat.thermostat.client.ui.AgentInformationDisplayController; import com.redhat.thermostat.client.ui.AgentInformationDisplayModel; import com.redhat.thermostat.client.ui.ClientConfigurationController; +import com.redhat.thermostat.client.ui.ContextAction; +import com.redhat.thermostat.client.ui.DecoratorProvider; +import com.redhat.thermostat.client.ui.HostContextAction; import com.redhat.thermostat.client.ui.HostInformationController; import com.redhat.thermostat.client.ui.MainWindowController; +import com.redhat.thermostat.client.ui.MenuAction; +import com.redhat.thermostat.client.ui.MenuRegistry; import com.redhat.thermostat.client.ui.SummaryController; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.client.ui.VmInformationController; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/RegistryFactory.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/RegistryFactory.java Wed Mar 20 13:31:06 2013 -0400 @@ -36,7 +36,8 @@ package com.redhat.thermostat.client.swing.internal; -import com.redhat.thermostat.client.osgi.service.MenuRegistry; +import com.redhat.thermostat.client.ui.MenuRegistry; + import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/VMTreeDecoratorRegistry.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/VMTreeDecoratorRegistry.java Wed Mar 20 13:31:06 2013 -0400 @@ -40,7 +40,7 @@ import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.common.ThermostatExtensionRegistry; import com.redhat.thermostat.storage.core.VmRef;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/HostContextActionServiceTracker.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/HostContextActionServiceTracker.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,7 +43,7 @@ import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; -import com.redhat.thermostat.client.osgi.service.HostContextAction; +import com.redhat.thermostat.client.ui.HostContextAction; @SuppressWarnings("rawtypes") public class HostContextActionServiceTracker extends ServiceTracker {
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivator.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivator.java Wed Mar 20 13:31:06 2013 -0400 @@ -49,7 +49,6 @@ import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmInformationViewProvider; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; import com.redhat.thermostat.client.swing.internal.GUIClientCommand; import com.redhat.thermostat.client.swing.internal.HostIconDecoratorProvider; import com.redhat.thermostat.client.swing.internal.Main; @@ -58,6 +57,7 @@ import com.redhat.thermostat.client.swing.internal.views.SwingHostInformationViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingSummaryViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingVmInformationViewProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.common.ApplicationService; import com.redhat.thermostat.common.Constants; import com.redhat.thermostat.common.MultipleServiceTracker;
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/VMContextActionServiceTracker.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/internal/osgi/VMContextActionServiceTracker.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,7 +43,7 @@ import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.VMContextAction; @SuppressWarnings("rawtypes") public class VMContextActionServiceTracker extends ServiceTracker {
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/MenuHelperTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/MenuHelperTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -63,7 +63,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import com.redhat.thermostat.client.osgi.service.MenuAction; +import com.redhat.thermostat.client.ui.MenuAction; @RunWith(CacioFESTRunner.class) public class MenuHelperTest {
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowControllerImplTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowControllerImplTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -72,13 +72,13 @@ import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmInformationView; import com.redhat.thermostat.client.core.views.VmInformationViewProvider; -import com.redhat.thermostat.client.osgi.service.ContextAction; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; -import com.redhat.thermostat.client.osgi.service.HostContextAction; -import com.redhat.thermostat.client.osgi.service.MenuAction; -import com.redhat.thermostat.client.osgi.service.MenuRegistry; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.ContextAction; +import com.redhat.thermostat.client.ui.DecoratorProvider; +import com.redhat.thermostat.client.ui.HostContextAction; +import com.redhat.thermostat.client.ui.MenuAction; +import com.redhat.thermostat.client.ui.MenuRegistry; import com.redhat.thermostat.client.ui.SummaryController; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.client.ui.VmInformationController; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener;
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/MainWindowTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -76,12 +76,12 @@ import org.mockito.ArgumentCaptor; import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.osgi.service.ContextAction; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; -import com.redhat.thermostat.client.osgi.service.HostContextAction; -import com.redhat.thermostat.client.osgi.service.MenuAction; import com.redhat.thermostat.client.swing.components.SearchField; +import com.redhat.thermostat.client.ui.ContextAction; import com.redhat.thermostat.client.ui.Decorator; +import com.redhat.thermostat.client.ui.DecoratorProvider; +import com.redhat.thermostat.client.ui.HostContextAction; +import com.redhat.thermostat.client.ui.MenuAction; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; import com.redhat.thermostat.storage.core.HostRef;
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/HostContextActionServiceTrackerTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/HostContextActionServiceTrackerTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,7 +43,7 @@ import org.junit.Test; import org.osgi.framework.ServiceRegistration; -import com.redhat.thermostat.client.osgi.service.HostContextAction; +import com.redhat.thermostat.client.ui.HostContextAction; import com.redhat.thermostat.testutils.StubBundleContext; public class HostContextActionServiceTrackerTest {
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivatorTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/ThermostatActivatorTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -46,13 +46,13 @@ import com.redhat.thermostat.client.core.views.HostInformationViewProvider; import com.redhat.thermostat.client.core.views.SummaryViewProvider; import com.redhat.thermostat.client.core.views.VmInformationViewProvider; -import com.redhat.thermostat.client.osgi.service.DecoratorProvider; import com.redhat.thermostat.client.swing.internal.HostIconDecoratorProvider; import com.redhat.thermostat.client.swing.internal.views.SwingAgentInformationViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingClientConfigurationViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingHostInformationViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingSummaryViewProvider; import com.redhat.thermostat.client.swing.internal.views.SwingVmInformationViewProvider; +import com.redhat.thermostat.client.ui.DecoratorProvider; import com.redhat.thermostat.testutils.StubBundleContext; public class ThermostatActivatorTest {
--- a/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/VMContextActionServiceTrackerTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/client/swing/src/test/java/com/redhat/thermostat/client/swing/internal/osgi/VMContextActionServiceTrackerTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -43,7 +43,7 @@ import org.junit.Test; import org.osgi.framework.ServiceRegistration; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.testutils.StubBundleContext; public class VMContextActionServiceTrackerTest {
--- a/eclipse/com.redhat.thermostat.eclipse.chart.common/META-INF/MANIFEST.MF Wed Mar 20 13:11:02 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.chart.common/META-INF/MANIFEST.MF Wed Mar 20 13:31:06 2013 -0400 @@ -9,7 +9,6 @@ Import-Package: com.redhat.thermostat.client.core.controllers, com.redhat.thermostat.client.core.views, com.redhat.thermostat.client.locale, - com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.common, com.redhat.thermostat.common.locale,
--- a/eclipse/com.redhat.thermostat.eclipse.chart.vmclassstat/META-INF/MANIFEST.MF Wed Mar 20 13:11:02 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.chart.vmclassstat/META-INF/MANIFEST.MF Wed Mar 20 13:31:06 2013 -0400 @@ -11,7 +11,6 @@ Bundle-ActivationPolicy: lazy Import-Package: com.redhat.thermostat.client.core.controllers, com.redhat.thermostat.client.core.views, - com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.common, com.redhat.thermostat.storage.dao,
--- a/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Wed Mar 20 13:11:02 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.test.ui/META-INF/MANIFEST.MF Wed Mar 20 13:31:06 2013 -0400 @@ -10,7 +10,6 @@ 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.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.common, com.redhat.thermostat.eclipse,
--- a/eclipse/com.redhat.thermostat.eclipse.test/META-INF/MANIFEST.MF Wed Mar 20 13:11:02 2013 -0400 +++ b/eclipse/com.redhat.thermostat.eclipse.test/META-INF/MANIFEST.MF Wed Mar 20 13:31:06 2013 -0400 @@ -18,7 +18,6 @@ Import-Package: com.redhat.thermostat.client.core, com.redhat.thermostat.client.core.controllers, com.redhat.thermostat.client.core.views, - com.redhat.thermostat.client.osgi.service, com.redhat.thermostat.client.ui, com.redhat.thermostat.common, com.redhat.thermostat.storage.core,
--- a/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/Activator.java Wed Mar 20 13:11:02 2013 -0400 +++ b/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/Activator.java Wed Mar 20 13:31:06 2013 -0400 @@ -42,7 +42,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.common.MultipleServiceTracker; import com.redhat.thermostat.common.MultipleServiceTracker.Action; import com.redhat.thermostat.storage.dao.AgentInfoDAO;
--- a/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/KillVMAction.java Wed Mar 20 13:11:02 2013 -0400 +++ b/killvm/client-swing/src/main/java/com/redhat/thermostat/killvm/client/internal/KillVMAction.java Wed Mar 20 13:31:06 2013 -0400 @@ -41,7 +41,7 @@ import com.redhat.thermostat.client.command.RequestQueue; import com.redhat.thermostat.client.core.Filter; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Request.RequestType; import com.redhat.thermostat.common.command.RequestResponseListener;
--- a/killvm/client-swing/src/test/java/com/redhat/thermostat/killvm/client/internal/ActivatorTest.java Wed Mar 20 13:11:02 2013 -0400 +++ b/killvm/client-swing/src/test/java/com/redhat/thermostat/killvm/client/internal/ActivatorTest.java Wed Mar 20 13:31:06 2013 -0400 @@ -51,7 +51,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import com.redhat.thermostat.client.osgi.service.VMContextAction; +import com.redhat.thermostat.client.ui.VMContextAction; import com.redhat.thermostat.killvm.client.internal.Activator; import com.redhat.thermostat.killvm.client.internal.KillVMAction;