[Pydev-cvs] org.python.pydev/src/org/python/copiedfromeclipsesrc CopiedWorkbenchLabelProvider.java, 1.2, 1.3

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32280/src/org/python/copiedfromeclipsesrc

Modified Files:
	CopiedWorkbenchLabelProvider.java 
Log Message:
Removing some compile errors in eclipse 3.4

Index: CopiedWorkbenchLabelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/copiedfromeclipsesrc/CopiedWorkbenchLabelProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CopiedWorkbenchLabelProvider.java	21 Jan 2006 14:06:26 -0000	1.2
--- CopiedWorkbenchLabelProvider.java	28 Jun 2008 13:29:19 -0000	1.3
***************
*** 2,6 ****
  
  /*******************************************************************************
!  * Copyright (c) 2000, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 2,6 ----
  
  /*******************************************************************************
!  * Copyright (c) 2000, 2008 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
***************
*** 12,17 ****
   *******************************************************************************/
  
! import org.eclipse.core.runtime.IAdaptable;
  import org.eclipse.jface.resource.ImageDescriptor;
  import org.eclipse.jface.viewers.DecoratingLabelProvider;
  import org.eclipse.jface.viewers.IColorProvider;
--- 12,21 ----
   *******************************************************************************/
  
! import org.eclipse.jface.resource.ColorDescriptor;
! import org.eclipse.jface.resource.FontDescriptor;
  import org.eclipse.jface.resource.ImageDescriptor;
+ import org.eclipse.jface.resource.JFaceResources;
+ import org.eclipse.jface.resource.LocalResourceManager;
+ import org.eclipse.jface.resource.ResourceManager;
  import org.eclipse.jface.viewers.DecoratingLabelProvider;
  import org.eclipse.jface.viewers.IColorProvider;
***************
*** 25,33 ****
  import org.eclipse.swt.graphics.Image;
  import org.eclipse.swt.graphics.RGB;
- import org.eclipse.swt.widgets.Display;
  import org.eclipse.ui.IEditorRegistry;
  import org.eclipse.ui.IPropertyListener;
  import org.eclipse.ui.PlatformUI;
! import org.eclipse.ui.internal.util.SWTResourceUtil;
  import org.eclipse.ui.model.IWorkbenchAdapter;
  import org.eclipse.ui.model.IWorkbenchAdapter2;
--- 29,36 ----
  import org.eclipse.swt.graphics.Image;
  import org.eclipse.swt.graphics.RGB;
  import org.eclipse.ui.IEditorRegistry;
  import org.eclipse.ui.IPropertyListener;
  import org.eclipse.ui.PlatformUI;
! import org.eclipse.ui.internal.util.Util;
  import org.eclipse.ui.model.IWorkbenchAdapter;
  import org.eclipse.ui.model.IWorkbenchAdapter2;
***************
*** 40,44 ****
   * on the labels and icons of adaptable objects.
   * 
!  * NOTE: I JUST HATE WHEN THE SINGLE METHOD I WANT TO OVERRIDE IS DECLARED AS FINAL!!! (getText in this case)
   */
  public class CopiedWorkbenchLabelProvider extends LabelProvider implements
--- 43,47 ----
   * on the labels and icons of adaptable objects.
   * 
!  * Copied just so that we can have getText and getImage overridden.
   */
  public class CopiedWorkbenchLabelProvider extends LabelProvider implements
***************
*** 50,56 ****
       * 
       * @return a new <code>DecoratingLabelProvider</code> which wraps a <code>
!      *   new <code>WorkbenchLabelProvider</code>
       */
!     public static ILabelProvider getDecoratingWorkbenchLabelProvider() {
          return new DecoratingLabelProvider(new CopiedWorkbenchLabelProvider(),
                  PlatformUI.getWorkbench().getDecoratorManager()
--- 53,59 ----
       * 
       * @return a new <code>DecoratingLabelProvider</code> which wraps a <code>
!      *   new <code>CopiedWorkbenchLabelProvider</code>
       */
!     public static ILabelProvider getDecoratingCopiedWorkbenchLabelProvider() {
          return new DecoratingLabelProvider(new CopiedWorkbenchLabelProvider(),
                  PlatformUI.getWorkbench().getDecoratorManager()
***************
*** 64,73 ****
       */
      private IPropertyListener editorRegistryListener = new IPropertyListener() {
!         public void propertyChanged(Object source, int propId) {
!             if (propId == IEditorRegistry.PROP_CONTENTS) {
!                 fireLabelProviderChanged(new LabelProviderChangedEvent(CopiedWorkbenchLabelProvider.this));
!             }
!         }
!     };
  
      /**
--- 67,77 ----
       */
      private IPropertyListener editorRegistryListener = new IPropertyListener() {
! 		public void propertyChanged(Object source, int propId) {
! 			if (propId == IEditorRegistry.PROP_CONTENTS) {
! 				fireLabelProviderChanged(new LabelProviderChangedEvent(CopiedWorkbenchLabelProvider.this));
! 			}
! 		}
! 	};		
! 	private ResourceManager resourceManager;
  
      /**
***************
*** 75,79 ****
       */
      public CopiedWorkbenchLabelProvider() {
!         PlatformUI.getWorkbench().getEditorRegistry().addPropertyListener(editorRegistryListener);
      }
  
--- 79,84 ----
       */
      public CopiedWorkbenchLabelProvider() {
!     	PlatformUI.getWorkbench().getEditorRegistry().addPropertyListener(editorRegistryListener);
!     	this.resourceManager = new LocalResourceManager(JFaceResources.getResources());
      }
  
***************
*** 115,120 ****
       */
      public void dispose() {
!         PlatformUI.getWorkbench().getEditorRegistry().removePropertyListener(editorRegistryListener);
!         super.dispose();
      }
      
--- 120,127 ----
       */
      public void dispose() {
!     	PlatformUI.getWorkbench().getEditorRegistry().removePropertyListener(editorRegistryListener);
!     	resourceManager.dispose();
!     	resourceManager = null;
!     	super.dispose();
      }
      
***************
*** 127,135 ****
       */
      protected final IWorkbenchAdapter getAdapter(Object o) {
!         if (!(o instanceof IAdaptable)) {
!             return null;
!         }
!         return (IWorkbenchAdapter) ((IAdaptable) o)
!                 .getAdapter(IWorkbenchAdapter.class);
      }
  
--- 134,138 ----
       */
      protected final IWorkbenchAdapter getAdapter(Object o) {
!         return (IWorkbenchAdapter)Util.getAdapter(o, IWorkbenchAdapter.class);
      }
  
***************
*** 142,150 ****
       */
      protected final IWorkbenchAdapter2 getAdapter2(Object o) {
!         if (!(o instanceof IAdaptable)) {
!             return null;
!         }
!         return (IWorkbenchAdapter2) ((IAdaptable) o)
!                 .getAdapter(IWorkbenchAdapter2.class);
      }
  
--- 145,149 ----
       */
      protected final IWorkbenchAdapter2 getAdapter2(Object o) {
!         return (IWorkbenchAdapter2)Util.getAdapter(o, IWorkbenchAdapter2.class);
      }
  
***************
*** 166,175 ****
          descriptor = decorateImage(descriptor, element);
  
!         Image image = (Image) SWTResourceUtil.getImageTable().get(descriptor);
!         if (image == null) {
!             image = descriptor.createImage();
!             SWTResourceUtil.getImageTable().put(descriptor, image);
!         }
!         return image;
      }
  
--- 165,169 ----
          descriptor = decorateImage(descriptor, element);
  
!         return resourceManager.createImage(descriptor);
      }
  
***************
*** 217,226 ****
          }
  
!         Font font = (Font) SWTResourceUtil.getFontTable().get(descriptor);
!         if (font == null) {
!             font = new Font(Display.getCurrent(), descriptor);
!             SWTResourceUtil.getFontTable().put(descriptor, font);
!         }
!         return font;
      }
  
--- 211,215 ----
          }
  
!         return resourceManager.createFont(FontDescriptor.createFrom(descriptor));
      }
  
***************
*** 236,245 ****
          }
  
!         Color color = (Color) SWTResourceUtil.getColorTable().get(descriptor);
!         if (color == null) {
!             color = new Color(Display.getCurrent(), descriptor);
!             SWTResourceUtil.getColorTable().put(descriptor, color);
!         }
!         return color;
      }
  }
--- 225,229 ----
          }
  
!         return resourceManager.createColor(ColorDescriptor.createFrom(descriptor));
      }
  }