Author: dgolovin Date: 2009-11-10 20:03:01 -0500 (Tue, 10 Nov 2009) New Revision: 18601 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/NodeContribution.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3628 Plugins should be .jar's not directories for efficiency sake Error about loading images with $nl$ variable in path in NodeContribution.java was fixed $nl$/restored in icons references in plugin.xml's for archives.ui and archives.webtools plugins Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2009-11-11 00:04:02 UTC (rev 18600) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2009-11-11 01:03:01 UTC (rev 18601) @@ -14,7 +14,7 @@ allowMultiple="false" category="org.jboss.tools.common.model.ui.views" class="org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesCommonView" - icon="icons/jar_obj.gif" + icon="$nl$/icons/jar_obj.gif" id="org.jboss.ide.eclipse.archives.ui.ProjectArchivesView" name="%ViewName_ProjectArchives"/> </extension> @@ -23,7 +23,7 @@ point="org.jboss.ide.eclipse.archives.ui.newArchiveActions"> <newPackageAction class="org.jboss.ide.eclipse.archives.ui.actions.NewJARAction" - icon="icons/new_package.gif" + icon="$nl$/icons/new_package.gif" id="org.jboss.ide.eclipse.archives.ui.newJARAction" label="%newPackageAction.label.jar"/> </extension> @@ -37,7 +37,7 @@ <action class="org.jboss.ide.eclipse.archives.ui.actions.BuildAction" definitionId="org.jboss.ide.eclipse.packages.ui.actions.BuildArchivesAction" - icon="icons/build_packages.gif" + icon="$nl$/icons/build_packages.gif" id="org.jboss.ide.eclipse.archives.ui.actions.BuildArchivesAction" label="Build Packages" menubarPath="project/additions" @@ -134,7 +134,7 @@ <navigatorContent activeByDefault="true" contentProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesRootContentProvider" - icon="icons/jar_obj.gif" + icon="$nl$/icons/jar_obj.gif" id="org.jboss.ide.eclipse.archives.ui.archivesContent" labelProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider" name="%NavigatorContent_ArchivesContent" @@ -172,7 +172,7 @@ </navigatorContent> <navigatorContent contentProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesRootBridgeContentProvider" - icon="icons/jar_obj.gif" + icon="$nl$/icons/jar_obj.gif" id="org.jboss.ide.eclipse.archives.ui.archivesRootBridgeContent" labelProvider="org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider" name="%NavigatorContent_ProjectArchives" Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/NodeContribution.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/NodeContribution.java 2009-11-11 00:04:02 UTC (rev 18600) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/NodeContribution.java 2009-11-11 01:03:01 UTC (rev 18601) @@ -53,7 +53,6 @@ Bundle bundle = Platform.getBundle(pluginId); URL iconURL = iconPath == null ? null : FileLocator.find(bundle, new Path(iconPath), null); if (iconURL != null) { - iconURL = bundle.getEntry(iconPath); icon = ImageDescriptor.createFromURL(iconURL); } String weightString = element.getAttribute(WEIGHT); Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-11-11 00:04:02 UTC (rev 18600) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-11-11 01:03:01 UTC (rev 18601) @@ -55,13 +55,13 @@ point="org.jboss.ide.eclipse.archives.ui.nodePopupMenus"> <nodeContribution class="org.jboss.ide.eclipse.archives.webtools.ui.PublishAction" - icon="icons/publish.gif" + icon="$nl$/icons/publish.gif" id="org.jboss.ide.eclipse.as.ui.publishNodeContextContrib" label="%nodeContribution.label.publishToServer" weight="1"/> <nodeContribution class="org.jboss.ide.eclipse.archives.webtools.ui.EditPublishAction" - icon="icons/publishDetails.gif " + icon="$nl$/icons/publishDetails.gif " id="org.jboss.ide.eclipse.as.ui.modifyPublishNodeContextContrib" label="%nodeContribution.label.editPublishSettings"> </nodeContribution> @@ -70,17 +70,17 @@ point="org.jboss.ide.eclipse.archives.ui.newArchiveActions"> <newPackageAction class="org.jboss.ide.eclipse.archives.webtools.ui.NewWARAction" - icon="icons/war.gif" + icon="$nl$/icons/war.gif" id="org.jboss.ide.eclipse.packages.ui.newWARAction" label="%newPackageAction.label.war"/> <newPackageAction class="org.jboss.ide.eclipse.archives.webtools.ui.NewEJBJARAction" - icon="icons/EJBJar.gif" + icon="$nl$/icons/EJBJar.gif" id="org.jboss.ide.eclipse.packages.ui.newEJBJarAction" label="%newPackageAction.label.ejbJar"/> <newPackageAction class="org.jboss.ide.eclipse.archives.webtools.ui.NewEARAction" - icon="icons/ear.gif" + icon="$nl$/icons/ear.gif" id="org.jboss.ide.eclipse.packages.ui.newEARAction" label="%newPackageAction.label.ear"/> </extension> @@ -104,7 +104,7 @@ <navigatorContent id="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets" activeByDefault="true" - icon="icons/multiple_files.gif" + icon="$nl$/icons/multiple_files.gif" contentProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetContentProvider" labelProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetLabelProvider" name="%NavigatorContent_Filesets"