From 21ce7a42012a626741ce0bc07a4e6869217aca75 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Thu, 1 May 2008 20:02:08 +0000 Subject: [PATCH] Check if the pluginComponent is null before proceeding and firing events --- src/net/java/sip/communicator/impl/gui/UIServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java index 4196516ed..ac2af5a45 100644 --- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java +++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java @@ -862,7 +862,8 @@ public void serviceChanged(ServiceEvent event) logger .info("Handling registration of a new Plugin Component."); - if(!(pluginComponent.getComponent() instanceof Component)) + if(pluginComponent.getComponent() == null + || !(pluginComponent.getComponent() instanceof Component)) { logger.error("Plugin Component type is not supported." + "Should provide a plugin in AWT, SWT or Swing."); @@ -884,7 +885,7 @@ else if (event.getType() == ServiceEvent.UNREGISTERING) * Returns the corresponding BorderLayout constraint from the given * Container constraint. * - * @param containerConstraint constraints defined in the Container + * @param containerConstraints constraints defined in the Container * @return the corresponding BorderLayout constraint from the given * Container constraint. */ @@ -892,6 +893,9 @@ public static Object getBorderLayoutConstraintsFromContainer( Object containerConstraints) { Object layoutConstraint = null; + if (containerConstraints == null) + return null; + if (containerConstraints.equals(Container.START)) layoutConstraint = BorderLayout.LINE_START; else if (containerConstraints.equals(Container.END))