Attachment 10108 Details for Bug 60418 – patch to remove jdt.core project

[patch] patch to remove jdt.core project

jdt-core-off-rt-compat-patch-20040429.txt (text/plain), 9.73 KB, created by Jim des Rivieres

on 2004-04-29 09:56:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jim des Rivieres

Created: 2004-04-29 09:56:03 EDT

Size: 9.73 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/plugin.xml,v
>retrieving revision 1.64
>diff -u -r1.64 plugin.xml
>--- plugin.xml	23 Apr 2004 11:40:55 -0000	1.64
>+++ plugin.xml	29 Apr 2004 13:36:41 -0000
>@@ -16,7 +16,7 @@
> 
> <requires>
> <import plugin="org.eclipse.core.resources"/>
>- <import plugin="org.eclipse.core.runtime.compatibility"/> 
>+ <import plugin="org.eclipse.core.runtime"/> 
> <import plugin="org.eclipse.text"/>
> <import plugin="org.apache.ant" optional="true"/>
> <import plugin="org.eclipse.team.core" optional="true"/>
>Index: model/org/eclipse/jdt/core/JavaCore.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
>retrieving revision 1.395
>diff -u -r1.395 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	28 Apr 2004 11:51:22 -0000	1.395
>+++ model/org/eclipse/jdt/core/JavaCore.java	29 Apr 2004 13:36:42 -0000
>@@ -70,6 +70,7 @@
> import org.eclipse.jdt.internal.core.search.processing.IJob;
> import org.eclipse.jdt.internal.core.util.MementoTokenizer;
> import org.eclipse.jdt.internal.core.util.Util;
>+import org.osgi.framework.BundleContext;
> 
> /**
> * The plug-in runtime class for the Java model plug-in containing the core
>@@ -880,11 +881,15 @@
> 	
> 	/**
> 	 * Creates the Java core plug-in.
>-	 * @param pluginDescriptor
>-	 * @since 2.1
>+	 * 
>+	 * The plug-in instance is created automatically by the 
>+	 * Eclipse platform. Clients must not call.
>+	 * 
>+	 * 
>+	 * @since 3.0
> 	 */
>-	public JavaCore(IPluginDescriptor pluginDescriptor) {
>-		super(pluginDescriptor);
>+	public JavaCore() {
>+		super();
> 		JAVA_CORE_PLUGIN = this;
> 	}
> 
>@@ -1294,7 +1299,7 @@
> 		Plugin jdtCorePlugin = JavaCore.getPlugin();
> 		if (jdtCorePlugin == null) return null;
> 
>-		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
>+		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(JavaCore.PLUGIN_ID, JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
> 		if (extension != null) {
> 			IExtension[] extensions = extension.getExtensions();
> 			for(int i = 0; i < extensions.length; i++){
>@@ -1422,7 +1427,7 @@
> 		Plugin jdtCorePlugin = JavaCore.getPlugin();
> 		if (jdtCorePlugin == null) return null;
> 
>-		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
>+		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(JavaCore.PLUGIN_ID, JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
> 		if (extension != null) {
> 			IExtension[] extensions = extension.getExtensions();
> 			for(int i = 0; i < extensions.length; i++){
>@@ -3657,21 +3662,25 @@
> 		getPlugin().savePluginPreferences();
> 	}
> 
>-	/**
>+	/* (non-Javadoc)
> 	 * Shutdown the JavaCore plug-in.
> 	 * 
> 	 * De-registers the JavaModelManager as a resource changed listener and save participant.
> 	 * 
>-	 * @see org.eclipse.core.runtime.Plugin#shutdown()
>+	 * @see org.eclipse.core.runtime.Plugin#stop(BundleContext)
> 	 */
>-	public void shutdown() {
>-
>-		savePluginPreferences();
>-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
>-		workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaState);
>-		workspace.removeSaveParticipant(this);
>-
>-		JavaModelManager.getJavaModelManager().shutdown();
>+	public void stop(BundleContext context) throws Exception {
>+		try {
>+			savePluginPreferences();
>+			IWorkspace workspace = ResourcesPlugin.getWorkspace();
>+			workspace.removeResourceChangeListener(JavaModelManager.getJavaModelManager().deltaState);
>+			workspace.removeSaveParticipant(this);
>+	
>+			JavaModelManager.getJavaModelManager().shutdown();
>+		} finally {
>+			// ensure we call super.stop as the last thing
>+			super.stop(context);
>+		}
> 	}
> 
> 	/**
>@@ -3683,16 +3692,17 @@
> 		JavaModelManager.getJavaModelManager().getIndexManager().reset();
> 	}
> 
>-	/**
>-	 * Startup of the JavaCore plug-in.
>+	/* (non-Javadoc)
>+	 * Startup the JavaCore plug-in.
> 	 * 
> 	 * Registers the JavaModelManager as a resource changed listener and save participant.
> 	 * Starts the background indexing, and restore saved classpath variable values.
> 	 * 
>-	 * @throws CoreException
>-	 * @see org.eclipse.core.runtime.Plugin#startup()
>+	 * @throws Exception
>+	 * @see org.eclipse.core.runtime.Plugin#start(BundleContext)
> 	 */
>-	public void startup() throws CoreException {
>+	public void start(BundleContext context) throws Exception {
>+		super.start(context);
> 		
> 		final JavaModelManager manager = JavaModelManager.getJavaModelManager();
> 		try {
>@@ -3757,7 +3767,6 @@
> 			throw e;
> 		}
> 	}
>-
> 
> 	/*
> 	 * Internal updating of a variable values (null path meaning removal), allowing to change multiple variable values at once.
>Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
>retrieving revision 1.224
>diff -u -r1.224 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	21 Apr 2004 14:02:19 -0000	1.224
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	29 Apr 2004 13:36:43 -0000
>@@ -920,7 +920,7 @@
> 		if (jdtCorePlugin == null) return null;
> 
> 		ArrayList variableList = new ArrayList(5);
>-		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
>+		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(JavaCore.PLUGIN_ID, JavaModelManager.CPVARIABLE_INITIALIZER_EXTPOINT_ID);
> 		if (extension != null) {
> 			IExtension[] extensions = extension.getExtensions();
> 			for(int i = 0; i < extensions.length; i++){
>@@ -945,7 +945,7 @@
> 		if (jdtCorePlugin == null) return null;
> 
> 		ArrayList containerIDList = new ArrayList(5);
>-		IExtensionPoint extension = jdtCorePlugin.getDescriptor().getExtensionPoint(JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
>+		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(JavaCore.PLUGIN_ID, JavaModelManager.CPCONTAINER_INITIALIZER_EXTPOINT_ID);
> 		if (extension != null) {
> 			IExtension[] extensions = extension.getExtensions();
> 			for(int i = 0; i < extensions.length; i++){
>@@ -966,9 +966,17 @@
> 	 */
> 	private File getSerializationFile(IProject project) {
> 		if (!project.exists()) return null;
>-		IPluginDescriptor descr= JavaCore.getJavaCore().getDescriptor();
>-		IPath workingLocation= project.getPluginWorkingLocation(descr);
>+		IPath workingLocation= getPluginWorkingLocation(project);
> 		return workingLocation.append("state.dat").toFile(); //$NON-NLS-1$
>+	}
>+	
>+	/**
>+	 * @deprecated to suppress deprecation warnings for references to
>+	 * IPluginDescriptor
>+	 */
>+	private IPath getPluginWorkingLocation(IProject project) {
>+		IPluginDescriptor descr= JavaCore.getJavaCore().getDescriptor();
>+		return project.getPluginWorkingLocation(descr);
> 	}
> 	
> 	/*
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.304
>diff -u -r1.304 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	19 Apr 2004 17:10:46 -0000	1.304
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	29 Apr 2004 13:36:43 -0000
>@@ -2098,6 +2098,13 @@
> 		return false;
> 	}
> 
>+	/**
>+	 * @deprecated to suppress deprecation warnings for references to
>+	 * IPluginDescriptor
>+	 */
>+	private IPath getPluginWorkingLocation() {
>+		return this.project.getPluginWorkingLocation(JavaCore.getJavaCore().getDescriptor());
>+	}	
> 
> 	/*
> 	 * load preferences from a shareable format (VCM-wise)
>@@ -2107,7 +2114,7 @@
> 	 	Preferences preferences = new Preferences();
> 	 	
> //		File prefFile = this.project.getLocation().append(PREF_FILENAME).toFile();
>-		IPath projectMetaLocation = this.project.getPluginWorkingLocation(JavaCore.getPlugin().getDescriptor());
>+		IPath projectMetaLocation = getPluginWorkingLocation();
> 		if (projectMetaLocation != null) {
> 			File prefFile = projectMetaLocation.append(PREF_FILENAME).toFile();
> 			if (prefFile.exists()) { // load preferences from file
>@@ -2414,7 +2421,7 @@
> 		// the preferences file is located in the plug-in's state area
> 		// at a well-known name (.jprefs)
> //		File prefFile = this.project.getLocation().append(PREF_FILENAME).toFile();
>-		File prefFile = this.project.getPluginWorkingLocation(JavaCore.getPlugin().getDescriptor()).append(PREF_FILENAME).toFile();
>+		File prefFile = getPluginWorkingLocation().append(PREF_FILENAME).toFile();
> 		if (preferences.propertyNames().length == 0) {
> 			// there are no preference settings
> 			// rather than write an empty file, just delete any existing file
>Index: model/org/eclipse/jdt/internal/core/util/Util.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java,v
>retrieving revision 1.25
>diff -u -r1.25 Util.java
>--- model/org/eclipse/jdt/internal/core/util/Util.java	28 Apr 2004 15:09:50 -0000	1.25
>+++ model/org/eclipse/jdt/internal/core/util/Util.java	29 Apr 2004 13:36:43 -0000
>@@ -1070,7 +1070,7 @@
> 		}
> 		IStatus status= new Status(
> 			IStatus.ERROR, 
>-			JavaCore.getPlugin().getDescriptor().getUniqueIdentifier(), 
>+			JavaCore.PLUGIN_ID, 
> 			IStatus.ERROR, 
> 			message, 
> 			e);

Actions: View | Diff

Attachments on bug 60418: 10108