Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoir2009-11-09 14:40:10 +0000
committerkmoir2009-11-09 14:40:10 +0000
commit9f1503323bcd68ddcef63b91e9770e5cd1b25430 (patch)
tree0af680011bd91464991d626c5f8f65a96ff5f1e2
parent1db11e83c86abf5921b65775b830ce668152fc52 (diff)
downloadeclipse.platform.text-9f1503323bcd68ddcef63b91e9770e5cd1b25430.tar.gz
eclipse.platform.text-9f1503323bcd68ddcef63b91e9770e5cd1b25430.tar.xz
eclipse.platform.text-9f1503323bcd68ddcef63b91e9770e5cd1b25430.zip
sync with head
-rw-r--r--org.eclipse.jface.text.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.search.tests/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java4
-rw-r--r--org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java15
-rw-r--r--org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF2
6 files changed, 14 insertions, 17 deletions
diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
index 7ba0896b8..56148f0a6 100644
--- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package:
Require-Bundle:
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
- org.junit,
+ org.junit;bundle-version="3.8.2",
org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.search.tests/META-INF/MANIFEST.MF b/org.eclipse.search.tests/META-INF/MANIFEST.MF
index 01ce799b8..f24ae9153 100644
--- a/org.eclipse.search.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.search.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.search.tests
-Bundle-Version: 3.5.0.qualifier
+Bundle-Version: 3.6.0.qualifier
Bundle-ClassPath: searchtests.jar
Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin
Bundle-Vendor: %providerName
@@ -13,10 +13,10 @@ Export-Package: org.eclipse.search.core.tests,
Require-Bundle:
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.5.100,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.junit,
+ org.junit;bundle-version="3.8.2",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)"
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
index d45a2d153..8f7697a3e 100644
--- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
+++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
* which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@ public class LongQuery extends NullQuery {
}
}
fIsRunning= false;
- return new Status(IStatus.OK, "some plugin", 0, "No message", null);
+ return Status.OK_STATUS;
}
public boolean isRunning() {
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java
index cd4195310..b4c29d9d5 100644
--- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java
+++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
* which accompanies this distribution, and is available at
@@ -28,17 +28,14 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.search.ui.text.FileTextSearchScope;
-
-import org.eclipse.search.internal.core.text.PatternConstructor;
-import org.eclipse.search.internal.ui.SearchPlugin;
-
import org.eclipse.search.core.text.TextSearchEngine;
import org.eclipse.search.core.text.TextSearchMatchAccess;
import org.eclipse.search.core.text.TextSearchRequestor;
import org.eclipse.search.core.text.TextSearchScope;
-
+import org.eclipse.search.internal.core.text.PatternConstructor;
+import org.eclipse.search.internal.ui.SearchPlugin;
import org.eclipse.search.tests.ResourceHelper;
+import org.eclipse.search.ui.text.FileTextSearchScope;
public class FileSearchTests extends TestCase {
@@ -242,10 +239,10 @@ public class FileSearchTests extends TestCase {
IFolder folder1= ResourceHelper.createFolder(fProject.getFolder("folder1"));
ResourceHelper.createFile(folder1, "file1", buf.toString());
IFile file2= ResourceHelper.createFile(folder1, "file2", buf.toString());
- file2.setDerived(true);
+ file2.setDerived(true, null);
IFolder folder2= ResourceHelper.createFolder(folder1.getFolder("folder2"));
- folder2.setDerived(true);
+ folder2.setDerived(true, null);
ResourceHelper.createFile(folder2, "file3", buf.toString());
IFolder folder3= ResourceHelper.createFolder(folder2.getFolder("folder3"));
diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
index fdc32bb7b..eab23ba77 100644
--- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
Export-Package: org.eclipse.ui.editors.tests
Require-Bundle:
org.eclipse.core.runtime,
- org.junit,
+ org.junit;bundle-version="3.8.2",
org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
org.eclipse.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
diff --git a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
index 723158df1..97b8a6368 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ Require-Bundle:
org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.junit,
+ org.junit;bundle-version="3.8.2",
org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4

Back to the top