Mercurial > hg > release > thermostat-0.13
view vm-jmx/client-swing/src/main/java/com/redhat/thermostat/vm/jmx/client/swing/internal/JmxNotificationsSwingView.java @ 1198:9cb09d6aeddb
Support web storage in JMX plugin
This commit fixes the JMX plugin to work with web storage. Aside from
needing a command channel action and associated role, there were a few
other issues this commit addresses.
Most importantly, I noticed the GUI would hang when trying to enable JMX
notifications without proper permissions after the third attempt. This
seems to be due to another issue where the web service stops responding
to the client's requests. I traced the hang down to waiting on the
network for AgentInfoDAO.getAgentInformation. I've fixed the GUI hang by
making the toggle notifications action asynchronous, running in an
executor provided by ApplicationService.
Another fix in this commit is provided feedback to the user when
authentication fails when trying to toggle JMX notifications. This is
done using a dialog box similar to the thread plugin. One final small
fix is to add the jmx-common bundle to the webservice command in
thermostat-plugin.xml. Without this, the webservice cannot find the JMX
storage entities it needs.
Reviewed-by: vanaltj
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-July/007712.html
author | Elliott Baron <ebaron@redhat.com> |
---|---|
date | Thu, 01 Aug 2013 14:05:00 -0400 |
parents | 9d27da66582c |
children |
line wrap: on
line source
/* * 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.vm.jmx.client.swing.internal; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.ButtonModel; import javax.swing.DefaultListModel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import com.redhat.thermostat.client.swing.ComponentVisibleListener; import com.redhat.thermostat.client.swing.IconResource; import com.redhat.thermostat.client.swing.SwingComponent; import com.redhat.thermostat.client.swing.components.ActionToggleButton; import com.redhat.thermostat.client.swing.components.LocalizedLabel; import com.redhat.thermostat.client.swing.components.HeaderPanel; import com.redhat.thermostat.common.ActionEvent; import com.redhat.thermostat.common.ActionListener; import com.redhat.thermostat.shared.locale.LocalizedString; import com.redhat.thermostat.shared.locale.Translate; import com.redhat.thermostat.vm.jmx.client.core.JmxNotificationsView; import com.redhat.thermostat.vm.jmx.client.core.LocaleResources; import com.redhat.thermostat.vm.jmx.common.JmxNotification; public class JmxNotificationsSwingView extends JmxNotificationsView implements SwingComponent { private static final Translate<LocaleResources> translate = LocaleResources.createLocalizer(); private List<ActionListener<NotificationAction>> listeners = new CopyOnWriteArrayList<>(); private final HeaderPanel visiblePanel; private final DefaultListModel<String> listModel = new DefaultListModel<>(); private ActionToggleButton toolbarButton; public JmxNotificationsSwingView() { LocalizedLabel description = new LocalizedLabel(translate.localize(LocaleResources.NOTIFICATIONS_DESCRIPTION)); description.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); JList<String> issuesList = new JList<>(listModel); JPanel contents = new JPanel(); contents.setLayout(new GridBagLayout()); GridBagConstraints c = new GridBagConstraints(); c.gridx = 0; c.gridy = 0; c.anchor = GridBagConstraints.FIRST_LINE_START; contents.add(description, c); c.gridy++; c.weightx = 1; c.weighty = 1; c.fill = GridBagConstraints.BOTH; c.anchor = GridBagConstraints.FIRST_LINE_START; contents.add(new JScrollPane(issuesList), c); contents.addHierarchyListener(new ComponentVisibleListener() { @Override public void componentShown(Component component) { notifier.fireAction(Action.VISIBLE); } @Override public void componentHidden(Component component) { notifier.fireAction(Action.HIDDEN); } }); toolbarButton = new ActionToggleButton(IconResource.SAMPLE.getIcon(), translate.localize(LocaleResources.NOTIFICATIONS_ENABLE)); toolbarButton.setName("toggleNotifications"); toolbarButton.setToolTipText(translate.localize(LocaleResources.NOTIFICATIONS_ENABLE_DESCRIPTION).getContents()); toolbarButton.addActionListener(new java.awt.event.ActionListener() { @Override public void actionPerformed(java.awt.event.ActionEvent e) { fireNotificationAction(NotificationAction.TOGGLE_NOTIFICATIONS); } }); toolbarButton.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { ButtonModel model = ((AbstractButton) e.getSource()).getModel(); if (model.isSelected()) { toolbarButton.setText(translate.localize(LocaleResources.NOTIFICATIONS_DISABLE).getContents()); toolbarButton.setToolTipText(translate.localize(LocaleResources.NOTIFICATIONS_DISABLE_DESCRIPTION).getContents()); } else { toolbarButton.setText(translate.localize(LocaleResources.NOTIFICATIONS_ENABLE).getContents()); toolbarButton.setToolTipText(translate.localize(LocaleResources.NOTIFICATIONS_ENABLE_DESCRIPTION).getContents()); } } }); visiblePanel = new HeaderPanel(translate.localize(LocaleResources.NOTIFICATIONS_HEADER)); visiblePanel.addToolBarButton(toolbarButton); visiblePanel.setContent(contents); } @Override public void addNotificationActionListener(ActionListener<NotificationAction> listener) { listeners.add(listener); } @Override public void removeNotificationActionListener(ActionListener<NotificationAction> listener) { listeners.remove(listener); } private void fireNotificationAction(NotificationAction action) { for (ActionListener<NotificationAction> listener : listeners) { listener.actionPerformed(new ActionEvent<>(this, action)); } } @Override public void setNotificationsEnabled(final boolean enabled) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { toolbarButton.setSelected(enabled); } }); } @Override public void clearNotifications() { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { listModel.clear(); } }); } @Override public void addNotification(final JmxNotification data) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { listModel.add(listModel.size(), data.getContents()); } }); } @Override public Component getUiComponent() { return visiblePanel; } @Override public void displayWarning(final LocalizedString warning) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { JOptionPane.showMessageDialog(visiblePanel.getParent(), warning.getContents(), "", JOptionPane.WARNING_MESSAGE); } }); } }