Skip to content
Commits on Source (6)
Expand all Show whitespace changes
Inline Side-by-side
debian/build.xml
View file @ bf3d8094
......@@ -26,6 +26,7 @@
<pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
<pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
<pathelement path="/usr/share/java/equinox-common.jar"/>
<pathelement path="/usr/share/java/equinox-preferences.jar"/>
<pathelement path="/usr/share/java/icu4j.jar"/>
<pathelement path="/usr/share/java/swt4.jar"/>
</make-bundle>
......@@ -58,7 +59,9 @@
<target name="org.eclipse.text">
<make-bundle name="org.eclipse.text" basedir=".">
<pathelement path="/usr/share/java/equinox-common.jar"/>
<pathelement path="/usr/share/java/equinox-preferences.jar"/>
<pathelement path="/usr/share/java/eclipse-core-commands.jar"/>
<pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
<pathelement path="/usr/share/java/icu4j.jar"/>
</make-bundle>
</target>
......
debian/changelog
View file @ bf3d8094
eclipse-platform-text (4.9-1) unstable; urgency=medium
* New upstream release
- Refreshed the patch
- Updated the bundle dependencies
- The license changed to EPL-2.0
-- Emmanuel Bourg <ebourg@apache.org> Mon, 03 Dec 2018 12:30:50 +0100
eclipse-platform-text (4.8-1) unstable; urgency=medium
* New upstream release
......
debian/control
View file @ bf3d8094
......@@ -39,7 +39,9 @@ Depends:
${misc:Depends},
${bundle:Depends},
libequinox-common-java,
libequinox-preferences-java,
libeclipse-core-commands-java,
libeclipse-core-runtime-java,
libicu4j-java
Description: Eclipse Text
Eclipse Platform Text is part of the Platform UI project and provides
......@@ -58,6 +60,7 @@ Depends:
libeclipse-core-jobs-java,
libeclipse-core-runtime-java,
libequinox-common-java,
libequinox-preferences-java,
libicu4j-java,
libswt-gtk-4-java (>= 4.8)
Description: Eclipse JFace Text
......
debian/copyright
View file @ bf3d8094
This diff is collapsed.
debian/patches/01-fix-compilation-error.patch
View file @ bf3d8094
......@@ -3,7 +3,7 @@ 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 @@
@@ -185,8 +185,10 @@
return 0;
}
});
......
org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF
View file @ bf3d8094
......@@ -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.200.qualifier
Bundle-Version: 3.11.300.qualifier
Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
......
org.eclipse.core.filebuffers.tests/about.html
View file @ bf3d8094
......@@ -8,21 +8,29 @@
<body lang="EN-US">
<h2>About This Content</h2>
<p>June 2, 2006</p>
<p>November 30, 2017</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>
The Eclipse Foundation makes available all content in this plug-in
(&quot;Content&quot;). Unless otherwise indicated below, the Content
is provided to you under the terms and conditions of the Eclipse
Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.
</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
<p>
If you did not receive this Content directly from the Eclipse
Foundation, the Content is being redistributed by another party
(&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the
Redistributor's license that was provided with the Content. If no such
license exists, contact the Redistributor. Unless otherwise indicated
below, the terms and conditions of the EPL still apply to any source
code in the Content and such source code may be obtained at <a
href="http://www.eclipse.org/">http://www.eclipse.org</a>.
</p>
</body>
</html>
\ No newline at end of file
org.eclipse.core.filebuffers.tests/build.properties
View file @ bf3d8094
###############################################################################
# Copyright (c) 2000, 2014 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
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/plugin.properties
View file @ bf3d8094
###############################################################################
# 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
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/pom.xml
View file @ bf3d8094
......@@ -14,12 +14,12 @@
<parent>
<artifactId>tests-pom</artifactId>
<groupId>eclipse.platform.text</groupId>
<version>4.8.0-SNAPSHOT</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../tests-pom/</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.filebuffers.tests</artifactId>
<version>3.11.200-SNAPSHOT</version>
<version>3.11.300-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<testSuite>${project.artifactId}</testSuite>
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/AbstractFileBufferDocCreationTests.java
View file @ bf3d8094
/*******************************************************************************
* Copyright (c) 2008 Symbian Software Systems, 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Andrew Ferguson (Symbian) - Initial implementation - [api] enable document setup participants to customize behaviour based on resource being opened - https://bugs.eclipse.org/bugs/show_bug.cgi?id=208881
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferCreation.java
View file @ bf3d8094
/*******************************************************************************
* Copyright (c) 2000, 2013 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
View file @ bf3d8094
/*******************************************************************************
* Copyright (c) 2000, 2015 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......@@ -23,14 +26,21 @@ import java.io.PrintWriter;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.resources.IProject;
......@@ -93,6 +103,28 @@ public abstract class FileBufferFunctions {
return fPath;
}
@Rule
public TestFailReporter failReporter= new TestFailReporter();
public class TestFailReporter extends TestWatcher {
private static final String BUNDLE_ID= "org.eclipse.core.filebuffers.tests";
ILog log= Platform.getLog(Platform.getBundle(BUNDLE_ID));
@Override
protected void failed(Throwable e, Description description) {
IStatus status= new Status(IStatus.ERROR, BUNDLE_ID, "FAIL in " + description.toString(), e);
log.log(status);
}
@Override
protected void succeeded(Description description) {
IStatus status= new Status(IStatus.INFO, BUNDLE_ID, "PASS in " + description.toString());
log.log(status);
}
}
/*
* Tests getLocation.
*/
......@@ -377,14 +409,14 @@ public abstract class FileBufferFunctions {
fManager.connect(fPath, LocationKind.NORMALIZE, null);
assertTrue(listener.count == 1);
assertEquals(1, listener.count);
assertNotNull(listener.buffer);
IFileBuffer fileBuffer= fManager.getFileBuffer(fPath, LocationKind.NORMALIZE);
assertTrue(listener.buffer == fileBuffer);
assertSame(fileBuffer, listener.buffer);
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
assertTrue(listener.count == 0);
assertTrue(listener.buffer == fileBuffer);
assertEquals(0, listener.count);
assertSame(fileBuffer, listener.buffer);
} finally {
try {
......@@ -428,14 +460,14 @@ public abstract class FileBufferFunctions {
IDocument document= fileBuffer.getDocument();
document.replace(0, 0, "prefix");
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isDirty);
fileBuffer.commit(null, true);
assertTrue(listener.count == 2);
assertTrue(listener.buffer == fileBuffer);
assertEquals(2, listener.count);
assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isDirty);
} finally {
......@@ -479,14 +511,14 @@ public abstract class FileBufferFunctions {
IDocument document= fileBuffer.getDocument();
document.replace(0, 0, "prefix");
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isDirty);
fileBuffer.revert(null);
assertTrue(listener.count == 2);
assertTrue(listener.buffer == fileBuffer);
assertEquals(2, listener.count);
assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isDirty);
} finally {
......@@ -536,10 +568,10 @@ public abstract class FileBufferFunctions {
fileBuffer.revert(null);
assertTrue(listener.preCount == 1);
assertTrue(listener.preBuffer == fileBuffer);
assertTrue(listener.postCount == 1);
assertTrue(listener.postBuffer == fileBuffer);
assertEquals(1, listener.preCount);
assertSame(fileBuffer, listener.preBuffer);
assertEquals(1, listener.postCount);
assertSame(fileBuffer, listener.postBuffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
......@@ -585,10 +617,10 @@ public abstract class FileBufferFunctions {
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (modifyUnderlyingFile()) {
assertTrue(listener.preCount == 1);
assertTrue(listener.preBuffer == fileBuffer);
assertTrue(listener.postCount == 1);
assertTrue(listener.postBuffer == fileBuffer);
assertEquals(1, listener.preCount);
assertSame(fileBuffer, listener.preBuffer);
assertEquals(1, listener.postCount);
assertSame(fileBuffer, listener.postBuffer);
}
} finally {
......@@ -632,8 +664,8 @@ public abstract class FileBufferFunctions {
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isStateValidated);
}
......@@ -679,8 +711,8 @@ public abstract class FileBufferFunctions {
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
assertTrue(listener.isStateValidated);
}
......@@ -726,8 +758,8 @@ public abstract class FileBufferFunctions {
fileBuffer.resetStateValidation();
if (isStateValidationSupported()) {
assertTrue(listener.count == 2);
assertTrue(listener.buffer == fileBuffer);
assertEquals(2, listener.count);
assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isStateValidated);
}
......@@ -774,8 +806,8 @@ public abstract class FileBufferFunctions {
fileBuffer.resetStateValidation();
if (isStateValidationSupported()) {
assertTrue(listener.count == 2);
assertTrue(listener.buffer == fileBuffer);
assertEquals(2, listener.count);
assertSame(fileBuffer, listener.buffer);
assertFalse(listener.isStateValidated);
}
......@@ -817,8 +849,8 @@ public abstract class FileBufferFunctions {
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (deleteUnderlyingFile()) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
}
} finally {
......@@ -954,8 +986,8 @@ public abstract class FileBufferFunctions {
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (deleteUnderlyingFile()) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
}
} finally {
......@@ -995,8 +1027,8 @@ public abstract class FileBufferFunctions {
fileBuffer= fManager.getTextFileBuffer(fPath, LocationKind.NORMALIZE);
if (moveUnderlyingFile() != null) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
}
} finally {
......@@ -1038,8 +1070,8 @@ public abstract class FileBufferFunctions {
fileBuffer.validateState(null, null);
if (isStateValidationSupported()) {
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
}
} finally {
......@@ -1081,8 +1113,8 @@ public abstract class FileBufferFunctions {
document.replace(0, 0, "prefix");
fileBuffer.revert(null);
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
......@@ -1124,8 +1156,8 @@ public abstract class FileBufferFunctions {
document.replace(0, 0, "prefix");
fileBuffer.commit(null, true);
assertTrue(listener.count == 1);
assertTrue(listener.buffer == fileBuffer);
assertEquals(1, listener.count);
assertSame(fileBuffer, listener.buffer);
} finally {
fManager.disconnect(fPath, LocationKind.NORMALIZE, null);
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferListener.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForExternalFiles.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java
View file @ bf3d8094
/*******************************************************************************
* 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
* Copyright (c) 2000, 2018 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......@@ -110,14 +113,11 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions {
protected boolean modifyUnderlyingFile() throws Exception {
IFileStore fileStore= FileBuffers.getFileStoreAtLocation(getPath());
assertTrue(fileStore.fetchInfo().exists());
OutputStream out= fileStore.openOutputStream(EFS.NONE, null);
try {
try (OutputStream out= fileStore.openOutputStream(EFS.NONE, null)) {
out.write("Changed content of file in linked folder".getBytes());
out.flush();
} catch (IOException x) {
fail();
} finally {
out.close();
}
IFileInfo fileInfo= fileStore.fetchInfo();
fileInfo.setLastModified(1000);
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonAccessibleWorkspaceFiles.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingExternalFiles.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......
org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForNonExistingWorkspaceFiles.java
View file @ bf3d8094
/*******************************************************************************
* 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
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
......