Author: snjeza Date: 2008-05-22 21:32:22 -0400 (Thu, 22 May 2008) New Revision: 8295 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java Log: JBIDE-2253 Ganymede RC1 : SWTResourceUtil cannot be resolved Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2008-05-23 01:32:17 UTC (rev 8294) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2008-05-23 01:32:22 UTC (rev 8295) @@ -44,9 +44,10 @@ import org.eclipse.core.runtime.content.IContentTypeMatcher; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.resource.LocalResourceManager; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; @@ -78,7 +79,6 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.FileStoreEditorInput; -import org.eclipse.ui.internal.util.SWTResourceUtil; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore; @@ -98,7 +98,7 @@ * */ public class FilesetViewProvider extends SimplePropertiesViewExtension { - + private static final String FILESET_KEY = "org.jboss.ide.eclipse.as.ui.views.server.providers.FilesetViewProvider.PropertyKey"; private Action createFilter, deleteFilter, editFilter, deleteFileAction, editFileAction; @@ -470,7 +470,15 @@ } public class FilesetLabelProvider extends LabelProvider { - public Image getImage(Object element) { + + private LocalResourceManager resourceManager; + + public FilesetLabelProvider() { + super(); + this.resourceManager = new LocalResourceManager(JFaceResources.getResources()); + } + + public Image getImage(Object element) { if( element instanceof Fileset ) { return PlatformUI.getWorkbench().getSharedImages() .getImage(ISharedImages.IMG_OBJ_FOLDER); @@ -488,12 +496,7 @@ descriptor = PlatformUI.getWorkbench().getSharedImages() .getImageDescriptor(ISharedImages.IMG_OBJ_FILE); } - Image image = (Image)SWTResourceUtil.getImageTable().get(descriptor); - if (image == null) { - image = descriptor.createImage(); - SWTResourceUtil.getImageTable().put(descriptor, image); - } - return image; + return resourceManager.createImage(descriptor); } return null; } @@ -504,6 +507,13 @@ return element == null ? "" : element.toString();//$NON-NLS-1$ } + + public void dispose() { + resourceManager.dispose(); + resourceManager = null; + super.dispose(); + } + } public void fillContextMenu(Shell shell, IMenuManager menu, Object[] selection) {