csseditor-cvs

[Christopher L. <ce...@us...>]

Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750/src/net/sourceforge/csseditor

Modified Files:
	CssEditorPlugin.java 
Log Message:
Fixes for Eclipse 3.0

Index: CssEditorPlugin.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/CssEditorPlugin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssEditorPlugin.java	27 Dec 2003 18:46:56 -0000	1.2
--- CssEditorPlugin.java	25 Jun 2004 09:51:22 -0000	1.3
***************
*** 14,22 ****
  package net.sourceforge.csseditor;
  
- import java.net.MalformedURLException;
  import java.net.URL;
  
! import org.eclipse.core.runtime.CoreException;
! import org.eclipse.core.runtime.IPluginDescriptor;
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.Status;
--- 14,23 ----
  package net.sourceforge.csseditor;
  
  import java.net.URL;
  
! import net.sourceforge.csseditor.internal.CssEditorPreferences;
! import net.sourceforge.csseditor.internal.ProfileManager;
! import net.sourceforge.csseditor.text.CssTextTools;
! 
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.Status;
***************
*** 26,33 ****
  import org.eclipse.ui.editors.text.TextEditorPreferenceConstants;
  import org.eclipse.ui.plugin.AbstractUIPlugin;
! 
! import net.sourceforge.csseditor.internal.CssEditorPreferences;
! import net.sourceforge.csseditor.internal.ProfileManager;
! import net.sourceforge.csseditor.text.CssTextTools;
  
  /**
--- 27,31 ----
  import org.eclipse.ui.editors.text.TextEditorPreferenceConstants;
  import org.eclipse.ui.plugin.AbstractUIPlugin;
! import org.osgi.framework.BundleContext;
  
  /**
***************
*** 79,84 ****
       * @param descriptor the plugin descriptor.
       */
!     public CssEditorPlugin(IPluginDescriptor descriptor) {
!         super(descriptor);
          plugin = this;
      }
--- 77,81 ----
       * @param descriptor the plugin descriptor.
       */
!     public CssEditorPlugin() {
          plugin = this;
      }
***************
*** 101,105 ****
       */
      public static String getPluginId() {
!         return getDefault().getDescriptor().getUniqueIdentifier();
      }
  
--- 98,102 ----
       */
      public static String getPluginId() {
!         return getDefault().getBundle().getSymbolicName();
      }
  
***************
*** 139,145 ****
          URL url = null;
          try {
!             url = new URL(getDescriptor().getInstallURL(),
!                 "icons/" + key); //$NON-NLS-1$
!         } catch (MalformedURLException e) {
              // we'll just return null
          }
--- 136,142 ----
          URL url = null;
          try {
! 			url = getBundle().getEntry("/icons/" + key); //$NON-NLS-1$
! 			return ImageDescriptor.createFromURL(url);
! 		} catch (IllegalStateException e) {
              // we'll just return null
          }
***************
*** 173,184 ****
  
      /*
!      * @see org.eclipse.core.runtime.Plugin#shutdown()
       */
!     public void shutdown() throws CoreException {
          if (textTools != null) {
              textTools.dispose();
              textTools = null;
          }
!         super.shutdown();
      }
  
--- 170,181 ----
  
      /*
!      * @see org.eclipse.core.runtime.Plugin#stop(BundleContext)
       */
!     public void stop(BundleContext context) throws Exception {
          if (textTools != null) {
              textTools.dispose();
              textTools = null;
          }
!         super.stop(context);
      }