Attachment 87882 Details for Bug 216569 – Proposed patch

[patch] Proposed patch

v00.txt (text/plain), 9.34 KB, created by Frederic Fusier

on 2008-01-25 12:20:15 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2008-01-25 12:20:15 EST

Size: 9.34 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.17.4.9
>diff -u -r1.17.4.9 MANIFEST.MF
>--- META-INF/MANIFEST.MF	14 Jan 2008 09:50:02 -0000	1.17.4.9
>+++ META-INF/MANIFEST.MF	25 Jan 2008 16:50:11 -0000
>@@ -3,7 +3,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true
>-Bundle-Version: 3.2.6.qualifier
>+Bundle-Version: 3.2.7.qualifier
> Bundle-Activator: org.eclipse.jdt.core.JavaCore
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>Index: buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
>retrieving revision 1.5274.2.108
>diff -u -r1.5274.2.108 buildnotes_jdt-core.html
>--- buildnotes_jdt-core.html	14 Jan 2008 09:50:01 -0000	1.5274.2.108
>+++ buildnotes_jdt-core.html	25 Jan 2008 16:50:11 -0000
>@@ -37,6 +37,22 @@
> 	</td>
>   </tr>
> </table>
>+<a name="v_690_R32x"></a>
>+<hr><h1>
>+Eclipse Platform Build Notes<br>
>+Java Development Tooling Core</h1>
>+Eclipse SDK  - %date% - 
>+<br>Project org.eclipse.jdt.core v_690_R32x
>+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_690_R32x">cvs</a>).
>+<h2>What's new in this drop</h2>
>+<ul>
>+<li>Incremented plug-in version ID to &quot;3.2.7&quot;</li>
>+</ul>
>+
>+<h3>Problem Reports Fixed</h3>
>+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=216569">216569</a>
>+backport bug 178551 to R3_2
>+
> <a name="v_689_R32x"></a>
> <p><hr><h1>
> Eclipse Platform Build Notes<br>
>Index: scripts/META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF,v
>retrieving revision 1.2.2.4
>diff -u -r1.2.2.4 MANIFEST.MF
>--- scripts/META-INF/MANIFEST.MF	14 Jan 2008 09:50:02 -0000	1.2.2.4
>+++ scripts/META-INF/MANIFEST.MF	25 Jan 2008 16:50:12 -0000
>@@ -3,7 +3,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: Eclipse Compiler for Java
> Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
>-Bundle-Version: 3.2.6
>+Bundle-Version: 3.2.7
> Bundle-ClassPath: .
> Bundle-Vendor: Eclipse.org
> Bundle-Localization: plugin
>Index: search/org/eclipse/jdt/internal/core/index/DiskIndex.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/DiskIndex.java,v
>retrieving revision 1.49.4.4
>diff -u -r1.49.4.4 DiskIndex.java
>--- search/org/eclipse/jdt/internal/core/index/DiskIndex.java	3 May 2007 13:12:14 -0000	1.49.4.4
>+++ search/org/eclipse/jdt/internal/core/index/DiskIndex.java	25 Jan 2008 16:50:12 -0000
>@@ -848,7 +848,7 @@
> 		// how many characters can be decoded without refilling the buffer?
> 		int charsInBuffer = i + ((this.bufferEnd - this.bufferIndex) / 3);
> 		// all the characters must already be in the buffer if we're at the end of the stream
>-		if (charsInBuffer > length || this.bufferEnd != this.streamBuffer.length)
>+		if (charsInBuffer > length || this.bufferEnd != this.streamBuffer.length || stream == null)
> 			charsInBuffer = length;
> 		while (i < charsInBuffer) {
> 			byte b = this.streamBuffer[this.bufferIndex++];
>Index: scripts/exportplugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/scripts/exportplugin.xml,v
>retrieving revision 1.44.4.8
>diff -u -r1.44.4.8 exportplugin.xml
>--- scripts/exportplugin.xml	14 Jan 2008 09:50:02 -0000	1.44.4.8
>+++ scripts/exportplugin.xml	25 Jan 2008 16:50:12 -0000
>@@ -1,119 +1,27 @@
> <?xml version="1.0" encoding="UTF-8"?>
> 
> 
>-<project name="${plugin}" default="export plug-in [_3.2.6]" basedir="..">
>+<project name="${plugin}" default="export plug-in [_3.2.7]" basedir="..">
> 
>-<target name="export plug-in [_3.2.6]">
>+<target name="export plug-in [_3.2.7]">
>     <tstamp/>
> 	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.6"/>
>+		<param name="jdt_core_version" value="3.2.7"/>
> 	</antcall>
> </target>
>-<target name="export plug-in [_3.2.6.qualifier] (with sources)">
>+<target name="export plug-in [_3.2.7.qualifier] (with sources)">
>     <tstamp/>
> 	<property name="qualifier" value="${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export_structure">
>-		<param name="jdt_core_version" value="3.2.6.${qualifier}"/>
>+		<param name="jdt_core_version" value="3.2.7.${qualifier}"/>
> 	</antcall>
> </target>
>-<target name="export plug-in [_3.2.6.qualifier]">
>+<target name="export plug-in [_3.2.7.qualifier]">
>     <tstamp/>
> 	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
> 	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.6.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.5]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.5"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.5.qualifier] (with sources)">
>-    <tstamp/>
>-	<property name="qualifier" value="${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export_structure">
>-		<param name="jdt_core_version" value="3.2.5.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.5.qualifier]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.5.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.4]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.4"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.4.qualifier] (with sources)">
>-    <tstamp/>
>-	<property name="qualifier" value="${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export_structure">
>-		<param name="jdt_core_version" value="3.2.4.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.4.qualifier]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.4.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.3]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.3"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.3.qualifier] (with sources)">
>-    <tstamp/>
>-	<property name="qualifier" value="${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export_structure">
>-		<param name="jdt_core_version" value="3.2.3.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.3.qualifier]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.3.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.1]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.1"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.1.qualifier] (with sources)">
>-    <tstamp/>
>-	<property name="qualifier" value="${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export_structure">
>-		<param name="jdt_core_version" value="3.2.1.${qualifier}"/>
>-	</antcall>
>-</target>
>-<target name="export plug-in [_3.2.1.qualifier]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.1.${qualifier}"/>
>-	</antcall>
>-</target>
>-
>-<target name="export plug-in [_3.2.0]">
>-    <tstamp/>
>-	<property name="qualifier" value="z${DSTAMP}-${TSTAMP}" />
>-	<antcall target="zz_internal_export">
>-		<param name="jdt_core_version" value="3.2.0"/>
>+		<param name="jdt_core_version" value="3.2.7.${qualifier}"/>
> 	</antcall>
> </target>
> 
>Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
>retrieving revision 1.546.2.26
>diff -u -r1.546.2.26 messages.properties
>--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	14 Jan 2008 09:50:02 -0000	1.546.2.26
>+++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	25 Jan 2008 16:50:12 -0000
>@@ -14,7 +14,7 @@
> #Format: compiler.name = word1 word2 word3
> compiler.name = Eclipse Java Compiler
> #Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
>-compiler.version = v_689_R32x, pre-3.2.3 release
>+compiler.version = v_690_R32x, pre-3.2.3 release
> compiler.copyright = Copyright IBM Corp 2000, 2007. All rights reserved.
> 
> ### progress

Actions: View | Diff

Attachments on bug 216569: 87882