Author: rob.stryker(a)jboss.com Date: 2009-08-05 18:31:56 -0400 (Wed, 05 Aug 2009) New Revision: 16970 Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/EclipseCreateNewProject.png trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBSharedImages.java Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportPage.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportWizard.java Log: JBIDE-4718 - removing a dependency Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2009-08-05 20:24:16 UTC (rev 16969) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2009-08-05 22:31:56 UTC (rev 16970) @@ -31,7 +31,6 @@ org.eclipse.jst.j2ee.ui;bundle-version="1.1.200", org.eclipse.jdt.core;bundle-version="3.4.0", org.jboss.tools.esb.project.core;bundle-version="1.0.0", - org.jboss.tools.common.model.ui;bundle-version="2.0.0", org.eclipse.jdt.ui;bundle-version="3.4.1", org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0" Eclipse-LazyStart: true Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/EclipseCreateNewProject.png =================================================================== (Binary files differ) Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/obj16/EclipseCreateNewProject.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBSharedImages.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBSharedImages.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/ESBSharedImages.java 2009-08-05 22:31:56 UTC (rev 16970) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.esb.project.ui; + +import java.util.Hashtable; +import java.util.Iterator; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.osgi.framework.Bundle; + +public class ESBSharedImages { + public static String WIZARD_NEW_PROJECT = "WIZARD_NEW_PROJECT"; + + private static ESBSharedImages instance() { + if (instance == null) + return new ESBSharedImages(); + return instance; + } + + public static Image getImage(String key) { + return instance().image(key); + } + + public static ImageDescriptor getImageDescriptor(String key) { + return instance().descriptor(key); + } + + + private static ESBSharedImages instance; + private Hashtable<String, Object> images, descriptors; + private ESBSharedImages() { + instance = this; + images = new Hashtable<String, Object>(); + descriptors = new Hashtable<String, Object>(); + Bundle pluginBundle = ESBProjectPlugin.getDefault().getBundle(); + + descriptors.put(WIZARD_NEW_PROJECT, createImageDescriptor(pluginBundle, "/icons/obj16/EclipseCreateNewProject.png")); //$NON-NLS-1$ + Iterator<String> iter = descriptors.keySet().iterator(); + while (iter.hasNext()) { + String key = iter.next(); + ImageDescriptor descriptor = descriptor(key); + images.put(key, descriptor.createImage()); + } + } + + public ImageDescriptor descriptor(String key) { + return (ImageDescriptor) descriptors.get(key); + } + + private ImageDescriptor createImageDescriptor (Bundle pluginBundle, String relativePath) { + return ImageDescriptor.createFromURL(pluginBundle.getEntry(relativePath)); + } + + public Image image(String key) { + return (Image) images.get(key); + } + + protected void finalize() throws Throwable { + Iterator<String> iter = images.keySet().iterator(); + while (iter.hasNext()) { + Image image = (Image) images.get(iter.next()); + image.dispose(); + } + super.finalize(); + } +} + Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2009-08-05 20:24:16 UTC (rev 16969) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2009-08-05 22:31:56 UTC (rev 16970) @@ -29,10 +29,10 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard; -import org.jboss.tools.common.model.ui.ModelUIImages; import org.jboss.tools.esb.core.ESBProjectConstant; import org.jboss.tools.esb.core.ESBProjectCorePlugin; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; +import org.jboss.tools.esb.project.ui.ESBSharedImages; import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages; import org.jboss.tools.esb.project.ui.wizards.pages.ESBProjectFirstPage; @@ -41,13 +41,13 @@ public ESBProjectWizard() { setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title); - setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT)); } public ESBProjectWizard(IDataModel model) { super(model); setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title); - setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT)); } @@ -63,7 +63,7 @@ @Override protected ImageDescriptor getDefaultPageImageDescriptor() { - return ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT); + return ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT); } @Override Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportPage.java 2009-08-05 20:24:16 UTC (rev 16969) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportPage.java 2009-08-05 22:31:56 UTC (rev 16970) @@ -13,7 +13,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.esb.project.ui.ESBSharedImages; import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages; public class ESBComponentExportPage extends J2EEModuleExportPage { @@ -21,7 +21,7 @@ super(model, pageName, selection); setTitle(JBossESBUIMessages.ESBExportWizard_Title); setDescription(JBossESBUIMessages.ESBExportWizard_Description); - setImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + setImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT)); } /* Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportWizard.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportWizard.java 2009-08-05 20:24:16 UTC (rev 16969) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/export/ESBComponentExportWizard.java 2009-08-05 22:31:56 UTC (rev 16970) @@ -14,7 +14,7 @@ import org.eclipse.ui.IExportWizard; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; -import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.esb.project.ui.ESBSharedImages; public class ESBComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard { @@ -36,6 +36,6 @@ } protected void doInit() { - setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT)); } }