From 5cfe944d37eb07f1784100df6ba3479cb08297eb Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Tue, 18 Mar 2008 22:43:43 +0000 Subject: [PATCH] Fix plugin listeners. --- .../communicator/impl/gui/GuiActivator.java | 6 ++- .../communicator/impl/gui/UIServiceImpl.java | 9 ++--- .../communicator/impl/gui/main/MainFrame.java | 29 +++++++------- .../impl/gui/main/MainTabbedPane.java | 20 +++++----- .../impl/gui/main/call/CallListPanel.java | 14 +++---- .../impl/gui/main/chat/ChatWindow.java | 25 ++++++------ .../impl/gui/main/chat/menus/HelpMenu.java | 14 +++---- .../chat/toolBars/ExtendedMainToolBar.java | 18 ++++----- .../gui/main/chat/toolBars/MainToolBar.java | 18 ++++----- .../contactlist/ContactRightButtonMenu.java | 16 ++++---- .../contactlist/GroupRightButtonMenu.java | 18 ++++----- .../gui/main/menus/ExtendedQuickMenu.java | 39 +++++++++---------- .../impl/gui/main/menus/HelpMenu.java | 15 +++---- .../impl/gui/main/menus/QuickMenu.java | 39 +++++++++---------- .../impl/gui/main/menus/ToolsMenu.java | 14 +++---- 15 files changed, 146 insertions(+), 148 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/GuiActivator.java b/src/net/java/sip/communicator/impl/gui/GuiActivator.java index 6af9a1419..c98cd41f4 100644 --- a/src/net/java/sip/communicator/impl/gui/GuiActivator.java +++ b/src/net/java/sip/communicator/impl/gui/GuiActivator.java @@ -66,9 +66,9 @@ public void start(BundleContext bundleContext) throws Exception { NotificationManager.registerGuiNotifications(); bundleContext.addServiceListener(new NotificationServiceListener()); - + ConfigurationManager.loadGuiConfigurations(); - + try { // Create the ui service this.uiService = new UIServiceImpl(); @@ -87,6 +87,8 @@ public void start(BundleContext bundleContext) throws Exception { finally { logger.logExit(); } + + bundleContext.addServiceListener(uiService); } /** diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java index 4549d56af..91840f163 100644 --- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java +++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java @@ -12,8 +12,6 @@ import javax.swing.*; -import org.osgi.framework.*; - import net.java.sip.communicator.impl.gui.event.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; @@ -27,10 +25,11 @@ import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; -import net.java.sip.communicator.service.gui.event.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; +import org.osgi.framework.*; + /** * An implementation of the UIService that gives access to other * bundles to this particular swing ui implementation. @@ -360,7 +359,7 @@ private void firePluginEvent( PluginComponent pluginComponent, = new PluginComponentEvent( pluginComponent, eventID); - logger.trace("Will dispatch the following plugin component event: " + logger.debug("Will dispatch the following plugin component event: " + evt); synchronized (pluginComponentListeners) @@ -856,7 +855,7 @@ public void serviceChanged(ServiceEvent event) if (event.getType() == ServiceEvent.REGISTERED) { logger - .debug("Handling registration of a new Plugin Component."); + .info("Handling registration of a new Plugin Component."); if(!(pluginComponent.getComponent() instanceof Component)) { diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 247fcae56..a8426a380 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -1298,26 +1298,25 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent c = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]); + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent c = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]); - Object constraints = null; + Object constraints = null; - if (c.getConstraints() != null) - constraints = UIServiceImpl - .getBorderLayoutConstraintsFromContainer(c.getConstraints()); - else - constraints = BorderLayout.SOUTH; + if (c.getConstraints() != null) + constraints = UIServiceImpl + .getBorderLayoutConstraintsFromContainer(c.getConstraints()); + else + constraints = BorderLayout.SOUTH; - this.getContentPane().add( (Component) c.getComponent(), - constraints); + this.getContentPane().add( (Component) c.getComponent(), + constraints); + } } - GuiActivator.getUIService().addPluginComponentListener(this); } diff --git a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java index a0ac70d41..1a281fa0a 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java @@ -76,7 +76,7 @@ public MainTabbedPane(MainFrame parent) { this.addChangeListener(this); - GuiActivator.getUIService().addPluginComponentListener(this); + this.initPluginComponents(); } /** @@ -175,16 +175,16 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; - - this.addTab(component.getName(), - (Component) component.getComponent()); + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; + + this.addTab(component.getName(), + (Component) component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallListPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallListPanel.java index e6f140464..b98beb89a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallListPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallListPanel.java @@ -138,15 +138,15 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - this.pluginPanel.add((Component)component.getComponent()); + this.pluginPanel.add((Component)component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index b4f50fd8d..a70666cdc 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -13,23 +13,21 @@ import javax.swing.*; -import org.osgi.framework.*; - import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.customcontrols.events.*; import net.java.sip.communicator.impl.gui.event.*; import net.java.sip.communicator.impl.gui.main.*; -import net.java.sip.communicator.impl.gui.main.MainFrame.*; import net.java.sip.communicator.impl.gui.main.chat.menus.*; import net.java.sip.communicator.impl.gui.main.chat.toolBars.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.impl.gui.utils.Constants; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; -import net.java.sip.communicator.service.gui.event.*; import net.java.sip.communicator.util.*; +import org.osgi.framework.*; + /** * The chat window is the place, where users can write and send messages, view * received messages. The ChatWindow supports two modes of use: "Group all @@ -676,18 +674,19 @@ private void initPluginComponents() logger.error("Could not obtain plugin component reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent c = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]); - Object borderLayoutConstraint = UIServiceImpl - .getBorderLayoutConstraintsFromContainer(c.getConstraints()); + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent c = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]); - this.add((Component)c.getComponent(), borderLayoutConstraint); + Object borderLayoutConstraint = UIServiceImpl + .getBorderLayoutConstraintsFromContainer(c.getConstraints()); + + this.add((Component)c.getComponent(), borderLayoutConstraint); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java index f4266d26d..f8eec7dc3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java @@ -92,15 +92,15 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java index 4f05fb924..4f8c0ec91 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java @@ -400,18 +400,18 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); - this.revalidate(); - this.repaint(); + this.revalidate(); + this.repaint(); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java index 4ee792998..b693a027b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java @@ -403,18 +403,18 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); - this.revalidate(); - this.repaint(); + this.revalidate(); + this.repaint(); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index a69fd3f51..bddfa4fef 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -384,17 +384,17 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - component.setCurrentContact(contactItem); + component.setCurrentContact(contactItem); - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java index 350779da7..4bf8bc364 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java @@ -166,19 +166,19 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - component.setCurrentContactGroup(group); + component.setCurrentContactGroup(group); - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); - this.repaint(); + this.repaint(); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java index 89ccdd847..585f021c2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java @@ -212,31 +212,30 @@ else if(selectedValue instanceof MetaContactGroup) logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - Object selectedValue = mainFrame.getContactListPanel() - .getContactList().getSelectedValue(); + Object selectedValue = mainFrame.getContactListPanel() + .getContactList().getSelectedValue(); - if(selectedValue instanceof MetaContact) - { - component.setCurrentContact((MetaContact)selectedValue); - } - else if(selectedValue instanceof MetaContactGroup) - { - component - .setCurrentContactGroup((MetaContactGroup)selectedValue); - } + if(selectedValue instanceof MetaContact) + { + component.setCurrentContact((MetaContact)selectedValue); + } + else if(selectedValue instanceof MetaContactGroup) + { + component + .setCurrentContactGroup((MetaContactGroup)selectedValue); + } - - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); - this.repaint(); + this.repaint(); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java index 7e1857d82..40650e7ce 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java @@ -91,15 +91,16 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; - this.add((Component)component.getComponent()); + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; + + this.add((Component)component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/QuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/QuickMenu.java index 43d9764a4..eb2f1ab54 100755 --- a/src/net/java/sip/communicator/impl/gui/main/menus/QuickMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/QuickMenu.java @@ -208,31 +208,30 @@ else if(selectedValue instanceof MetaContactGroup) logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - Object selectedValue = mainFrame.getContactListPanel() - .getContactList().getSelectedValue(); + Object selectedValue = mainFrame.getContactListPanel() + .getContactList().getSelectedValue(); - if(selectedValue instanceof MetaContact) - { - component.setCurrentContact((MetaContact)selectedValue); - } - else if(selectedValue instanceof MetaContactGroup) - { - component - .setCurrentContactGroup((MetaContactGroup)selectedValue); - } + if(selectedValue instanceof MetaContact) + { + component.setCurrentContact((MetaContact)selectedValue); + } + else if(selectedValue instanceof MetaContactGroup) + { + component + .setCurrentContactGroup((MetaContactGroup)selectedValue); + } - - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); - this.repaint(); + this.repaint(); + } } GuiActivator.getUIService().addPluginComponentListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java index 87cdb139d..ec6f6620a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java @@ -109,15 +109,15 @@ private void initPluginComponents() logger.error("Could not obtain plugin reference.", exc); } - if (serRefs == null) - return; - - for (int i = 0; i < serRefs.length; i ++) + if (serRefs != null) { - PluginComponent component = (PluginComponent) GuiActivator - .bundleContext.getService(serRefs[i]);; + for (int i = 0; i < serRefs.length; i ++) + { + PluginComponent component = (PluginComponent) GuiActivator + .bundleContext.getService(serRefs[i]);; - this.add((Component)component.getComponent()); + this.add((Component)component.getComponent()); + } } GuiActivator.getUIService().addPluginComponentListener(this);