Author: rob.stryker(a)jboss.com Date: 2009-12-21 18:49:23 -0500 (Mon, 21 Dec 2009) New Revision: 19509 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/build.properties trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java Log: JBIDE-5503 - icons not included in trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/build.properties 2009-12-21 23:41:51 UTC (rev 19508) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/build.properties 2009-12-21 23:49:23 UTC (rev 19509) @@ -2,4 +2,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + icons/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java 2009-12-21 23:41:51 UTC (rev 19508) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/src/org/jboss/ide/eclipse/as/wtp/ui/propertypage/DependencyPageExtensionManager.java 2009-12-21 23:49:23 UTC (rev 19509) @@ -110,7 +110,8 @@ if( image == null ) { if( imageLoc != null && element.getContributor().getName() != null) { ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(element.getContributor().getName(), imageLoc); - image = desc.createImage(); + if( desc != null ) + image = desc.createImage(); } } return image;