Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 245565 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/pde/ui/tests/imports/BaseImportTestCase.java (-13 / +14 lines)
Lines 11-24 Link Here
11
package org.eclipse.pde.ui.tests.imports;
11
package org.eclipse.pde.ui.tests.imports;
12
12
13
import org.eclipse.core.resources.*;
13
import org.eclipse.core.resources.*;
14
import org.eclipse.core.runtime.*;
14
import org.eclipse.core.runtime.CoreException;
15
import org.eclipse.core.runtime.IStatus;
15
import org.eclipse.jdt.core.*;
16
import org.eclipse.jdt.core.*;
16
import org.eclipse.pde.core.plugin.IPluginModelBase;
17
import org.eclipse.pde.core.plugin.IPluginModelBase;
17
import org.eclipse.pde.core.plugin.PluginRegistry;
18
import org.eclipse.pde.core.plugin.PluginRegistry;
18
import org.eclipse.pde.internal.core.PDECore;
19
import org.eclipse.pde.internal.core.PDECore;
19
import org.eclipse.pde.internal.ui.PDEPlugin;
20
import org.eclipse.pde.internal.ui.wizards.imports.PluginImportOperation;
20
import org.eclipse.pde.internal.ui.wizards.imports.PluginImportOperation;
21
import org.eclipse.pde.internal.ui.wizards.imports.PluginImportWizard.ImportQuery;
22
import org.eclipse.pde.ui.tests.PDETestCase;
21
import org.eclipse.pde.ui.tests.PDETestCase;
23
22
24
public abstract class BaseImportTestCase extends PDETestCase {
23
public abstract class BaseImportTestCase extends PDETestCase {
Lines 68-83 Link Here
68
	}
67
	}
69
	
68
	
70
	protected void runOperation(IPluginModelBase[] models, int type) {
69
	protected void runOperation(IPluginModelBase[] models, int type) {
71
		PluginImportOperation.IImportQuery query = new ImportQuery(getShell());
70
		PluginImportOperation job = new PluginImportOperation(models, type, false);
72
		PluginImportOperation.IImportQuery executionQuery = new ImportQuery(getShell());
71
		job.setRule(ResourcesPlugin.getWorkspace().getRoot());
73
		final PluginImportOperation op = new PluginImportOperation(models, type, query, executionQuery, false);
72
		job.setSystem(true);
74
73
		job.schedule();
75
		try {
74
		try{
76
			PDEPlugin.getWorkspace().run(op, new NullProgressMonitor());
75
			job.join();
77
		} catch (OperationCanceledException e) {
76
		} catch (InterruptedException e){
78
			fail("Import Operation failed: " + e);
77
			fail("Job interupted: " + e.getMessage());
79
		} catch (CoreException e) {
78
		}
80
			fail("Import Operation failed: " + e);
79
		IStatus status = job.getResult();
80
		if (!status.isOK()){
81
			fail("Import Operation failed: " + status.toString());
81
		}
82
		}
82
	}
83
	}
83
84
(-).settings/org.eclipse.jdt.core.prefs (-2 / +5 lines)
Lines 1-4 Link Here
1
#Mon Mar 24 11:13:46 CDT 2008
1
#Tue Nov 18 10:52:33 CST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
3
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
4
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
4
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
Lines 20-29 Link Here
20
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
20
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
22
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
22
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
23
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
23
org.eclipse.jdt.core.compiler.problem.deprecation=warning
24
org.eclipse.jdt.core.compiler.problem.deprecation=warning
24
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
25
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
25
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
26
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
26
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
27
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
27
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
28
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
28
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
29
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
29
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
30
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
Lines 41-46 Link Here
41
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
42
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
42
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
43
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
43
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
44
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
45
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
44
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
46
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
45
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
47
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
46
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
48
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
Lines 49-54 Link Here
49
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
51
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
50
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
52
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
51
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
53
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
54
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
52
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
55
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
53
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
56
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
54
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
57
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

Return to bug 245565