.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eclipse.platform.text</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

debian/build.xml

@@ -90,6 +90,7 @@
     <make-bundle name="org.eclipse.ui.genericeditor" basedir="." depends="org.eclipse.jface.text,org.eclipse.text,org.eclipse.ui.editors,org.eclipse.ui.workbench.texteditor">
       <pathelement path="/usr/share/java/eclipse-core-commands.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-contenttype.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-expressions.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-filebuffers.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-resources.jar"/>
@@ -98,6 +99,7 @@
       <pathelement path="/usr/share/java/eclipse-ui-ide.jar"/>
       <pathelement path="/usr/share/java/eclipse-ui-workbench.jar"/>
       <pathelement path="/usr/share/java/equinox-common.jar"/>
+      <pathelement path="/usr/share/java/equinox-preferences.jar"/>
       <pathelement path="/usr/share/java/equinox-registry.jar"/>
       <pathelement path="/usr/share/java/swt4.jar"/>
     </make-bundle>

debian/changelog

+eclipse-platform-text (4.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - Fixed a compilation error in org.eclipse.jface.text
+    - Depend on libswt-gtk-4-java (>= 4.8)
+    - Updated the bundle dependencies
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Nov 2018 01:50:48 +0100
+
 eclipse-platform-text (4.7.3-5) unstable; urgency=medium
 
   * Build more bundles:

debian/control

@@ -26,7 +26,7 @@ Build-Depends:
  libequinox-preferences-java,
  libequinox-registry-java,
  libicu4j-java,
- libswt-gtk-4-java,
+ libswt-gtk-4-java (>= 4.8),
  eclipse-debian-helper
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-text.git
@@ -59,7 +59,7 @@ Depends:
  libeclipse-core-runtime-java,
  libequinox-common-java,
  libicu4j-java,
- libswt-gtk-4-java
+ libswt-gtk-4-java (>= 4.8)
 Description: Eclipse JFace Text
  Eclipse Platform Text is part of the Platform UI project and provides
  the basic building blocks for text and text editors within Eclipse and
@@ -152,6 +152,7 @@ Depends:
  ${bundle:Depends},
  libeclipse-core-commands-java,
  libeclipse-core-contenttype-java,
+ libeclipse-core-expressions-java,
  libeclipse-core-filebuffers-java,
  libeclipse-core-jobs-java,
  libeclipse-core-resources-java,
@@ -160,6 +161,7 @@ Depends:
  libeclipse-ui-ide-java,
  libeclipse-ui-workbench-java,
  libequinox-common-java,
+ libequinox-preferences-java,
  libequinox-registry-java,
  libswt-gtk-4-java
 Description: EEclipse Generic and Extensible Text Editor
@@ -186,7 +188,7 @@ Depends:
  libequinox-preferences-java,
  libequinox-registry-java,
  libicu4j-java,
- libswt-gtk-4-java
+ libswt-gtk-4-java (>= 4.8)
 Description: Eclipse Text Editor Framework
  Eclipse Platform Text is part of the Platform UI project and provides
  the basic building blocks for text and text editors within Eclipse and

debian/patches/01-fix-compilation-error.patch

+Description: Fixes a compilation error (maybe a difference between javac and ecj?)
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
++++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningManager.java
+@@ -182,8 +182,10 @@
+ 				return 0;
+ 			}
+ 		});
+-		return codeMinings.stream().collect(Collectors.groupingBy(ICodeMining::getPosition, LinkedHashMap::new,
+-				Collectors.mapping(Function.identity(), Collectors.toList())));
++
++		java.util.stream.Collector mappingCollector = Collectors.mapping(Function.identity(), Collectors.toList());
++		java.util.stream.Collector groupingCollector = Collectors.groupingBy(ICodeMining::getPosition, LinkedHashMap::new, mappingCollector);
++		return (Map) codeMinings.stream().collect(groupingCollector);
+ 	}
+ 
+ 	/**

debian/patches/series

+01-fix-compilation-error.patch

org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.core.filebuffers.tests;singleton:=true
-Bundle-Version: 3.11.100.qualifier
+Bundle-Version: 3.11.200.qualifier
 Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName
@@ -17,3 +17,4 @@ Require-Bundle:
  org.junit;bundle-version="4.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.core.filebuffers.tests

org.eclipse.core.filebuffers.tests/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>eclipse.platform.text</groupId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.filebuffers.tests</artifactId>
-  <version>3.11.100-SNAPSHOT</version>
+  <version>3.11.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
   	<testSuite>${project.artifactId}</testSuite>

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java

@@ -69,12 +69,12 @@ public class FileBufferCreation {
 
 	private IPath createLinkedFile(String linkedFileName, String linkedFileTarget) throws CoreException {
 		IFile linkedFile= ResourceHelper.createLinkedFile(fProject, new Path(linkedFileName), FileBuffersTestPlugin.getDefault(), new Path(linkedFileTarget));
-		return linkedFile != null ? linkedFile.getFullPath() : null;
+		return linkedFile.getFullPath();
 	}
 
 	private IPath createLinkedFolder(String linkedFolderName, String linkedFolderTarget) throws CoreException {
 		IFolder linkedFolder= ResourceHelper.createLinkedFolder(fProject, new Path(linkedFolderName), FileBuffersTestPlugin.getDefault(), new Path(linkedFolderTarget));
-		return linkedFolder != null ? linkedFolder.getFullPath() : null;
+		return linkedFolder.getFullPath();
 	}
 
 	/*

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java

@@ -862,7 +862,7 @@ public abstract class FileBufferFunctions {
 				IPath newLocation= moveUnderlyingFile();
 				if (newLocation != null) {
 					if (listener.count != 1 || listener.buffer != fileBuffer || !newLocation.equals(listener.newLocation)) {
-						StringBuffer buf= new StringBuffer();
+						StringBuilder buf= new StringBuilder();
 						buf.append("Wrong listener notifcation in " + getClass().getName() + ":\n");
 						buf.append("listener.count: " + listener.count + " (expected: 1)\n");
 						if (newLocation.equals(listener.newLocation))

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java

@@ -14,6 +14,8 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+
 import org.junit.After;
 import org.junit.Test;
 
@@ -68,7 +70,11 @@ public class FileBuffersForNonExistingWorkspaceFiles extends FileBufferFunctions
 
 	@Test
 	public void testBug118199_fixed() throws Exception {
-		IFile file= getProject().getWorkspace().getRoot().getFileForLocation(getPath());
+		IPath location= getPath();
+		IFile file= getProject().getWorkspace().getRoot().getFileForLocation(location);
+		if (file == null) {
+			throw new IOException("File '" + location + "' can not be found."); //$NON-NLS-1$ //$NON-NLS-2$
+		}
 		IPath path= file.getFullPath();
 		assertFalse(file.exists());
 		fManager.connect(path, LocationKind.IFILE, null);

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileStoreFileBuffersForNonExistingWorkspaceFiles.java

@@ -12,6 +12,8 @@ package org.eclipse.core.filebuffers.tests;
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
+
 import org.junit.After;
 import org.junit.Test;
 
@@ -66,7 +68,11 @@ public class FileStoreFileBuffersForNonExistingWorkspaceFiles extends FileStoreF
 
 	@Test
 	public void testBug118199_fixed() throws Exception {
-		IFile file= getProject().getWorkspace().getRoot().getFileForLocation(getPath());
+		IPath location= getPath();
+		IFile file= getProject().getWorkspace().getRoot().getFileForLocation(location);
+		if (file == null) {
+			throw new IOException("File '" + location + "' can not be found."); //$NON-NLS-1$ //$NON-NLS-2$
+		}
 		IPath path= file.getFullPath();
 		assertFalse(file.exists());
 		fManager.connect(path, LocationKind.IFILE, null);

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileTool.java

@@ -64,25 +64,8 @@ public class FileTool {
 				String entryName = entry.getName();
 				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
 				file.getParentFile().mkdirs();
-				InputStream src = null;
-				OutputStream dst = null;
-				try {
-					src = zipFile.getInputStream(entry);
-					dst = new FileOutputStream(file);
+				try (InputStream src= zipFile.getInputStream(entry); OutputStream dst= new FileOutputStream(file)) {
 					transferData(src, dst);
-				} finally {
-					if(dst != null){
-						try {
-							dst.close();
-						} catch(IOException e){
-						}
-					}
-					if(src != null){
-						try {
-							src.close();
-						} catch(IOException e){
-						}
-					}
 				}
 			}
 		} finally {
@@ -162,6 +145,9 @@ public class FileTool {
 	public static void copy(File src, File dst) throws IOException {
 		if(src.isDirectory()){
 			String[] srcChildren = src.list();
+			if (srcChildren == null) {
+				throw new IOException("Content from directory '" + src.getAbsolutePath() + "' can not be listed."); //$NON-NLS-1$ //$NON-NLS-2$
+			}
 			for(int i = 0; i < srcChildren.length; ++i){
 				File srcChild= new File(src, srcChildren[i]);
 				File dstChild= new File(dst, srcChildren[i]);

org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/MockDocumentSetupParticipants.java

@@ -58,7 +58,7 @@ public class MockDocumentSetupParticipants {
 		@Override
 		public void setup(IDocument document, IPath location, LocationKind locationKind) {
 			if (locationKind == LocationKind.IFILE)
-				append(document, new StringBuffer(location.toPortableString()).reverse().toString());
+				append(document, new StringBuilder(location.toPortableString()).reverse().toString());
 		}
 	}
 
@@ -66,7 +66,7 @@ public class MockDocumentSetupParticipants {
 		@Override
 		public void setup(IDocument document, IPath location, LocationKind locationKind) {
 			if (locationKind == LocationKind.LOCATION)
-				append(document, new StringBuffer(location.toPortableString()).reverse().toString());
+				append(document, new StringBuilder(location.toPortableString()).reverse().toString());
 		}
 	}
 
@@ -74,7 +74,7 @@ public class MockDocumentSetupParticipants {
 		@Override
 		public void setup(IDocument document, IPath location, LocationKind locationKind) {
 			if (locationKind == LocationKind.NORMALIZE)
-				append(document, new StringBuffer(location.toPortableString()).reverse().toString());
+				append(document, new StringBuilder(location.toPortableString()).reverse().toString());
 		}
 	}
 

org.eclipse.core.filebuffers/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.filebuffers; singleton:=true
-Bundle-Version: 3.6.100.qualifier
+Bundle-Version: 3.6.200.qualifier
 Bundle-Activator: org.eclipse.core.internal.filebuffers.FileBuffersPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
@@ -18,3 +18,4 @@ Require-Bundle:
  org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.ibm.icu.text
+Automatic-Module-Name: org.eclipse.core.filebuffers

org.eclipse.core.filebuffers/forceQualifierUpdate.txt

+Bug 534597 - Unanticipated comparator errors in I20180511-2000
\ No newline at end of file

org.eclipse.core.filebuffers/pom.xml

@@ -14,10 +14,10 @@
   <parent>
     <artifactId>eclipse.platform.text</artifactId>
     <groupId>eclipse.platform.text</groupId>
-    <version>4.7.3-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.filebuffers</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.6.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>

org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java

@@ -532,7 +532,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 			}
 
 			in= new BufferedReader(new InputStreamReader(contentStream, encoding), BUFFER_SIZE);
-			StringBuffer buffer= new StringBuffer(BUFFER_SIZE);
+			StringBuilder buffer= new StringBuilder(BUFFER_SIZE);
 			char[] readBuffer= new char[READER_CHUNK_SIZE];
 			int n= in.read(readBuffer);
 			while (n > 0) {

org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java

@@ -521,7 +521,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 			}
 
 			in= new BufferedReader(new InputStreamReader(contentStream, encoding), BUFFER_SIZE);
-			StringBuffer buffer= new StringBuffer(BUFFER_SIZE);
+			StringBuilder buffer= new StringBuilder(BUFFER_SIZE);
 			char[] readBuffer= new char[READER_CHUNK_SIZE];
 			int n= in.read(readBuffer);
 			while (n > 0) {

org.eclipse.jface.text.examples/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>