[releng] Clean up warnings.
This include removal of the direct use of SubProgressMonitor.
diff --git a/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF
index 8e21993..fd0ea38 100644
--- a/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cheatsheets;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.cheatsheets.CheatSheetsPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/BuildAllProjectsAction.java b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/BuildAllProjectsAction.java
index 4453239..0e48fd1 100644
--- a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/BuildAllProjectsAction.java
+++ b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/BuildAllProjectsAction.java
@@ -19,7 +19,6 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -29,6 +28,7 @@
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -99,7 +99,7 @@
monitor.beginTask(CheatSheetsPlugin.INSTANCE.getString("_UI_BuildProject_message"), projects.length);
for (int i = 0; i < projects.length; i++)
{
- projects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(monitor, 1));
+ projects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, BasicMonitor.subProgress(monitor, 1));
}
monitor.done();
}
diff --git a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/CopyFileFromPluginAction.java b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/CopyFileFromPluginAction.java
index 8763f50..38957ae 100644
--- a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/CopyFileFromPluginAction.java
+++ b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/CopyFileFromPluginAction.java
@@ -30,7 +30,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -40,6 +39,7 @@
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -127,12 +127,12 @@
if (isJavaProject)
{
NewJavaProjectAction newJavaProjectAction = new NewJavaProjectAction();
- project = newJavaProjectAction.createProject(projectName, new SubProgressMonitor(monitor, 1));
+ project = newJavaProjectAction.createProject(projectName, BasicMonitor.subProgress(monitor, 1));
}
else
{
NewProjectAction newProjectAction = new NewProjectAction();
- project = newProjectAction.createProject(projectName, new SubProgressMonitor(monitor, 1));
+ project = newProjectAction.createProject(projectName, BasicMonitor.subProgress(monitor, 1));
}
monitor.done();
return project;
@@ -161,7 +161,7 @@
try
{
InputStream in = FileLocator.openStream(bundle, new Path(sourceFilePath), false);
- targetFile.create(in, true, new SubProgressMonitor(monitor, 1));
+ targetFile.create(in, true, BasicMonitor.subProgress(monitor, 1));
in.close();
}
catch (IOException e)
@@ -226,7 +226,7 @@
folder = project.getFolder(folderPath);
if (!folder.exists())
{
- folder.create(true, true, new SubProgressMonitor(monitor, 1));
+ folder.create(true, true, BasicMonitor.subProgress(monitor, 1));
}
}
}
diff --git a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewJavaProjectAction.java b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewJavaProjectAction.java
index 2da95ce..280f3e3 100644
--- a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewJavaProjectAction.java
+++ b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewJavaProjectAction.java
@@ -16,12 +16,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -43,7 +43,7 @@
protected IProject createProject(String projectName, IProgressMonitor monitor) throws CoreException
{
monitor.beginTask(CheatSheetsPlugin.INSTANCE.getString("_UI_CreateJavaProject_message", new String []{ projectName }), 5);
- IProject project = super.createProject(projectName, new SubProgressMonitor(monitor, 1));
+ IProject project = super.createProject(projectName, BasicMonitor.subProgress(monitor, 1));
if (project != null)
{
IProjectDescription description = project.getDescription();
@@ -57,19 +57,19 @@
System.arraycopy(natures, 0, javaNatures, 0, natures.length);
javaNatures[natures.length] = JavaCore.NATURE_ID;
description.setNatureIds(javaNatures);
- project.setDescription(description, new SubProgressMonitor(monitor, 1));
+ project.setDescription(description, BasicMonitor.subProgress(monitor, 1));
IFolder sourceFolder = project.getFolder(SOURCE_FOLDER);
if (!sourceFolder.exists())
{
- sourceFolder.create(true, true, new SubProgressMonitor(monitor, 1));
+ sourceFolder.create(true, true, BasicMonitor.subProgress(monitor, 1));
}
- javaProject.setOutputLocation(project.getFolder(OUTPUT_FOLDER).getFullPath(), new SubProgressMonitor(monitor, 1));
+ javaProject.setOutputLocation(project.getFolder(OUTPUT_FOLDER).getFullPath(), BasicMonitor.subProgress(monitor, 1));
IClasspathEntry[] entries = new IClasspathEntry []{
JavaCore.newSourceEntry(sourceFolder.getFullPath()),
JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER")) };
- javaProject.setRawClasspath(entries, new SubProgressMonitor(monitor, 1));
+ javaProject.setRawClasspath(entries, BasicMonitor.subProgress(monitor, 1));
}
}
}
diff --git a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewProjectAction.java b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewProjectAction.java
index 9b07280..c39ba1c 100644
--- a/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewProjectAction.java
+++ b/doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewProjectAction.java
@@ -18,7 +18,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -28,6 +27,7 @@
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -106,9 +106,9 @@
IProject project = workspaceRoot.getProject(projectName);
if (!project.exists())
{
- project.create(new SubProgressMonitor(monitor, 1));
+ project.create(BasicMonitor.subProgress(monitor, 1));
}
- project.open(new SubProgressMonitor(monitor, 1));
+ project.open(BasicMonitor.subProgress(monitor, 1));
monitor.done();
return project;
}
diff --git a/doc/org.eclipse.emf.doc-feature/feature.xml b/doc/org.eclipse.emf.doc-feature/feature.xml
index 4ebc471..4cadd4d 100644
--- a/doc/org.eclipse.emf.doc-feature/feature.xml
+++ b/doc/org.eclipse.emf.doc-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.doc"
label="%featureName"
- version="2.11.0.qualifier"
+ version="2.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/doc/org.eclipse.emf.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.doc/META-INF/MANIFEST.MF
index 276e40e..2ba34e4 100644
--- a/doc/org.eclipse.emf.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.doc; singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help
diff --git a/doc/org.eclipse.emf.doc/tutorials/jet2/jet_tutorial2.html b/doc/org.eclipse.emf.doc/tutorials/jet2/jet_tutorial2.html
index 476ee68..2b02e38 100644
--- a/doc/org.eclipse.emf.doc/tutorials/jet2/jet_tutorial2.html
+++ b/doc/org.eclipse.emf.doc/tutorials/jet2/jet_tutorial2.html
@@ -613,7 +613,7 @@
<span><img src="images/tag_2.gif" width="24" height="13" alt=""/></span> emitter.addClasspathVariable("JET_TUTORIAL", pluginId);
TypesafeEnum model = mPage1.getTypesafeEnumModel();
- IProgressMonitor sub = new SubProgressMonitor(monitor, 1);
+ IProgressMonitor sub = BasicMonitor.subProgress(monitor, 1);
<span><img src="images/tag_3.gif" width="24" height="13" alt=""/></span> String result = emitter.generate(sub, new Object[] { model });
monitor.worked(1);
diff --git a/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF
index 1aa7627..a07485b 100644
--- a/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.examples.jet.article2; singleton:=true
-Bundle-Version: 2.4.0.qualifier
+Bundle-Version: 2.5.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.examples.jet.article2.TypesafeEnumPlugin
Bundle-Vendor: %providerName
diff --git a/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/codegen/JETGateway.java b/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/codegen/JETGateway.java
index 696b9bb..4e70db1 100644
--- a/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/codegen/JETGateway.java
+++ b/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/codegen/JETGateway.java
@@ -14,7 +14,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.emf.codegen.jet.JETEmitter;
import org.eclipse.emf.codegen.jet.JETException;
@@ -149,7 +148,7 @@
// The file may be read-only because it is checked out
// by a VCM component. Here we ask permission to change the file.
- if (targetFile.getWorkspace().validateEdit(new IFile []{ targetFile }, new SubProgressMonitor(monitor, 1)).isOK())
+ if (targetFile.getWorkspace().validateEdit(new IFile []{ targetFile }, BasicMonitor.subProgress(monitor, 1)).isOK())
{
jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(targetFile.getContents(true)));
@@ -195,11 +194,11 @@
InputStream newContents = new ByteArrayInputStream(contents);
if (result.exists())
{
- result.setContents(newContents, true, true, new SubProgressMonitor(monitor, 1));
+ result.setContents(newContents, true, true, BasicMonitor.subProgress(monitor, 1));
}
else
{
- result.create(newContents, true, new SubProgressMonitor(monitor, 1));
+ result.create(newContents, true, BasicMonitor.subProgress(monitor, 1));
}
return result;
}
@@ -227,7 +226,7 @@
IPath outputPath = new Path(targetDirectory + "/" + packageName.replace('.', '/'));
progressMonitor.beginTask("", 4);
- IProgressMonitor sub = new SubProgressMonitor(progressMonitor, 1);
+ IProgressMonitor sub = BasicMonitor.subProgress(progressMonitor, 1);
IPath localLocation = null; // use default
IContainer container = CodeGenUtil.EclipseUtil.findOrCreateContainer(outputPath, true, localLocation, sub);
return container;
diff --git a/examples/org.eclipse.emf.examples-feature/feature.xml b/examples/org.eclipse.emf.examples-feature/feature.xml
index e95bb27..4fdaaaa 100644
--- a/examples/org.eclipse.emf.examples-feature/feature.xml
+++ b/examples/org.eclipse.emf.examples-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.examples"
label="%featureName"
- version="2.11.0.qualifier"
+ version="2.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.settings/org.eclipse.jdt.core.prefs
index 1f4a256..1a44a3f 100644
--- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
#Tue May 26 21:06:05 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/features/org.eclipse.emf-feature/feature.xml b/features/org.eclipse.emf-feature/feature.xml
index c2c7814..61e1a4a 100644
--- a/features/org.eclipse.emf-feature/feature.xml
+++ b/features/org.eclipse.emf-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.all-feature/feature.xml b/features/org.eclipse.emf.all-feature/feature.xml
index 30b320e..769af47 100644
--- a/features/org.eclipse.emf.all-feature/feature.xml
+++ b/features/org.eclipse.emf.all-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.all"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.base-feature/feature.xml b/features/org.eclipse.emf.base-feature/feature.xml
index 97f5b6b..6124649 100644
--- a/features/org.eclipse.emf.base-feature/feature.xml
+++ b/features/org.eclipse.emf.base-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.base"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.codegen-feature/feature.xml b/features/org.eclipse.emf.codegen-feature/feature.xml
index ea0e1dc..f4adfb3 100644
--- a/features/org.eclipse.emf.codegen-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.codegen"
label="%featureName"
- version="2.11.0.qualifier"
+ version="2.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
index a88a2b6..a9b9a87 100644
--- a/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.codegen.ecore"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
index 95654f7..dd3e87e 100644
--- a/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.codegen.ecore.ui"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.common-feature/feature.xml b/features/org.eclipse.emf.common-feature/feature.xml
index 5a44571..cccdb02 100644
--- a/features/org.eclipse.emf.common-feature/feature.xml
+++ b/features/org.eclipse.emf.common-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.common"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.common.ui-feature/feature.xml b/features/org.eclipse.emf.common.ui-feature/feature.xml
index 4cd7f62..c6d478d 100644
--- a/features/org.eclipse.emf.common.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.common.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.common.ui"
label="%featureName"
- version="2.11.0.qualifier"
+ version="2.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.converter-feature/feature.xml b/features/org.eclipse.emf.converter-feature/feature.xml
index db3fea7..a3d4c24 100644
--- a/features/org.eclipse.emf.converter-feature/feature.xml
+++ b/features/org.eclipse.emf.converter-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.converter"
label="%featureName"
- version="2.11.0.qualifier"
+ version="2.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.ecore-feature/feature.xml b/features/org.eclipse.emf.ecore-feature/feature.xml
index 43cc491..71e4a8d 100644
--- a/features/org.eclipse.emf.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecore"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt-feature/feature.xml b/features/org.eclipse.emf.gwt-feature/feature.xml
index c4ff22d..cc0a74b 100644
--- a/features/org.eclipse.emf.gwt-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.gwt"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt.common-feature/feature.xml b/features/org.eclipse.emf.gwt.common-feature/feature.xml
index 09da34b..89dfd58 100644
--- a/features/org.eclipse.emf.gwt.common-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.common-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.gwt.common"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
index 781b439..a11dff7 100644
--- a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.gwt.ecore"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml b/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
index 9334f3a..a0eb374 100644
--- a/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.gwt.edit.ui"
label="%featureName"
- version="2.7.0.qualifier"
+ version="2.8.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
index 031b3b7..2c441bb 100644
--- a/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.gwt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.gwt.sdk"
label="%featureName"
- version="2.9.0.qualifier"
+ version="2.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.rap-feature/feature.xml b/features/org.eclipse.emf.rap-feature/feature.xml
index 13db56c..4fcfc5b 100755
--- a/features/org.eclipse.emf.rap-feature/feature.xml
+++ b/features/org.eclipse.emf.rap-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.rap"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.rap.sdk-feature/feature.xml b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
index 0a19d08..cda2032 100755
--- a/features/org.eclipse.emf.rap.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.rap.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.rap.sdk"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.emf.sdk-feature/feature.xml b/features/org.eclipse.emf.sdk-feature/feature.xml
index ebd8594..acacceb 100644
--- a/features/org.eclipse.emf.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.sdk"
label="%featureName"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
index ebdaeea..57be7ae 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen.ecore.ui; singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/GenerateHandler.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/GenerateHandler.java
index 713863c..f059a8c 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/GenerateHandler.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/GenerateHandler.java
@@ -24,7 +24,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.StatusLineManager;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -58,6 +57,7 @@
import org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil;
import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
@@ -258,8 +258,8 @@
IProgressMonitor progressMonitor = statusLineManager.getProgressMonitor();
progressMonitor.beginTask("", 10);
- List<URI> uris = getGenModelURIs(new SubProgressMonitor(progressMonitor, 3, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK), getResult());
- List<GenModel> genModels = GeneratorUIUtil.loadGenModels(new SubProgressMonitor(progressMonitor, 7), uris, getShell());
+ List<URI> uris = getGenModelURIs(BasicMonitor.subProgress(progressMonitor, 3), getResult());
+ List<GenModel> genModels = GeneratorUIUtil.loadGenModels(BasicMonitor.subProgress(progressMonitor, 7), uris, getShell());
progressMonitor.done();
if (!genModels.isEmpty())
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GeneratorUIUtil.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GeneratorUIUtil.java
index f2a3526..f927fc1 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GeneratorUIUtil.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GeneratorUIUtil.java
@@ -26,7 +26,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jface.operation.IRunnableContext;
@@ -179,7 +178,7 @@
generatorAndArguments[1],
generatorAndArguments[2],
(String)generatorAndArguments[3],
- BasicMonitor.toMonitor(new SubProgressMonitor(progressMonitor, 1))));
+ BasicMonitor.toMonitor(BasicMonitor.subProgress(progressMonitor, 1))));
if (!canContinue(diagnostic))
{
diff --git a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
index 6af740e..31b8709 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen.ecore; singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.ecore.CodeGenEcorePlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
index 865dec8..1ca4110 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
@@ -39,7 +39,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.jdt.core.IClasspathEntry;
@@ -365,7 +364,7 @@
true,
targetRootDirectory,
//DMS Why not this?
- //new SubProgressMonitor(progressMonitor, 1));
+ //BasicMonitor.subProgress(progressMonitor, 1));
BasicMonitor.toIProgressMonitor(CodeGenUtil.EclipseUtil.createMonitor(progressMonitor, 1)));
}
// This is to handle a genmodel produced by rose2genmodel.
@@ -725,13 +724,13 @@
{
projectDescription.setLocationURI(new java.net.URI(projectLocationURI.toString()));
}
- project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1));
- project.open(new SubProgressMonitor(progressMonitor, 1));
+ project.create(projectDescription, BasicMonitor.subProgress(progressMonitor, 1));
+ project.open(BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
projectDescription = project.getDescription();
- project.open(new SubProgressMonitor(progressMonitor, 1));
+ project.open(BasicMonitor.subProgress(progressMonitor, 1));
if (project.hasNature(JavaCore.NATURE_ID))
{
classpathEntries.addAll(Arrays.asList(javaProject.getRawClasspath()));
@@ -833,7 +832,7 @@
System.arraycopy(oldBuilders, enhancerBuilderIndex + 1, builders, enhancerBuilderIndex, oldBuilders.length - enhancerBuilderIndex - 1);
}
projectDescription.setBuildSpec(builders);
- project.setDescription(projectDescription, new SubProgressMonitor(progressMonitor, 1));
+ project.setDescription(projectDescription, BasicMonitor.subProgress(progressMonitor, 1));
IContainer sourceContainer = project;
if (javaSource.segmentCount() > 1)
@@ -847,7 +846,7 @@
sourceContainer = project.getFolder(sourceContainerPath.removeLastSegments(i));
if (!sourceContainer.exists())
{
- ((IFolder)sourceContainer).create(false, true, new SubProgressMonitor(progressMonitor, 1));
+ ((IFolder)sourceContainer).create(false, true, BasicMonitor.subProgress(progressMonitor, 1));
}
}
}
@@ -1003,14 +1002,14 @@
javaProject.setRawClasspath
(classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]),
- new SubProgressMonitor(progressMonitor, 1));
+ BasicMonitor.subProgress(progressMonitor, 1));
}
if (isInitiallyEmpty)
{
javaProject.setOutputLocation
(new Path("/" + javaSource.segment(0) + (((style & EMF_GWT_PROJECT_STYLE) != 0) && ((style & EMF_EDITOR_PROJECT_STYLE) != 0) ? "/war/WEB-INF/classes" : "/bin")),
- new SubProgressMonitor(progressMonitor, 1));
+ BasicMonitor.subProgress(progressMonitor, 1));
}
}
catch (Exception exception)
@@ -1042,7 +1041,7 @@
true,
modelProjectLocation,
//DMS Why not this?
- //new SubProgressMonitor(progressMonitor, 1));
+ //BasicMonitor.subProgress(progressMonitor, 1));
BasicMonitor.toIProgressMonitor(CodeGenUtil.createMonitor(progressMonitor, 1)));
return projectRelativePath.makeAbsolute().toString();
@@ -1073,7 +1072,7 @@
true,
modelProjectLocation,
//DMS Why not this?
- //new SubProgressMonitor(progressMonitor, 1));
+ //BasicMonitor.subProgress(progressMonitor, 1));
BasicMonitor.toIProgressMonitor(CodeGenUtil.createMonitor(progressMonitor, 1)));
return projectRelativePath.makeAbsolute().toString();
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelUtil.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelUtil.java
index 042edd5..98dd193 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelUtil.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelUtil.java
@@ -124,7 +124,6 @@
public static Map<String, String> getJavaOptions(GenModel genModel)
{
IJavaProject javaProject = getJavaProject(genModel);
- @SuppressWarnings("unchecked")
Map<String, String> options = javaProject != null ? javaProject.getOptions(true) : JavaCore.getOptions();
return options;
}
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/gwt/GWTBuilder.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/gwt/GWTBuilder.java
index 49796f7..65bc76a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/gwt/GWTBuilder.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/gwt/GWTBuilder.java
@@ -33,8 +33,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.emf.codegen.ecore.CodeGenEcorePlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.jdt.core.IClasspathContainer;
@@ -215,7 +215,7 @@
monitor.beginTask("", filesToDelete.size());
for (IFile file : filesToDelete)
{
- file.delete(true, new SubProgressMonitor(monitor, 1));
+ file.delete(true, BasicMonitor.subProgress(monitor, 1));
}
}
}
diff --git a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
index 01e1fc6..1084009 100644
--- a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.codegen; singleton:=true
-Bundle-Version: 2.11.0.qualifier
+Bundle-Version: 2.12.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.codegen.CodeGenPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
index a3310be..8779bf9 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
@@ -29,7 +29,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.emf.codegen.jet.JETCompiler;
@@ -37,6 +36,7 @@
import org.eclipse.emf.codegen.merge.java.JControlModel;
import org.eclipse.emf.codegen.merge.java.JMerger;
import org.eclipse.emf.codegen.util.CodeGenUtil;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.DiagnosticException;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
@@ -188,7 +188,7 @@
IPath projectTargetPath = new Path("/Result/" + jetCompiler.getSkeleton().getPackageName().replace('.','/'));
IContainer container =
- CodeGenUtil.EclipseUtil.findOrCreateContainer(projectTargetPath, true, targetPath, new SubProgressMonitor(progressMonitor, 1));
+ CodeGenUtil.EclipseUtil.findOrCreateContainer(projectTargetPath, true, targetPath, BasicMonitor.subProgress(progressMonitor, 1));
IFile targetFile = container.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java"));
progressMonitor.subTask
@@ -203,16 +203,16 @@
jMerger.merge();
InputStream mergedContents = new ByteArrayInputStream(jMerger.getTargetCompilationUnitContents().getBytes());
- targetFile.setContents(mergedContents, true, true, new SubProgressMonitor(progressMonitor, 1));
+ targetFile.setContents(mergedContents, true, true, BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
- targetFile.setContents(contents, true, true, new SubProgressMonitor(progressMonitor, 1));
+ targetFile.setContents(contents, true, true, BasicMonitor.subProgress(progressMonitor, 1));
}
}
else
{
- targetFile.create(contents, true, new SubProgressMonitor(progressMonitor, 1));
+ targetFile.create(contents, true, BasicMonitor.subProgress(progressMonitor, 1));
}
}
catch (JETException exception)
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETAddNatureOperation.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETAddNatureOperation.java
index 0b514b7..1e67937 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETAddNatureOperation.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETAddNatureOperation.java
@@ -20,9 +20,9 @@
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.emf.codegen.CodeGenPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
public class JETAddNatureOperation implements IWorkspaceRunnable
@@ -64,7 +64,7 @@
System.arraycopy(natures, 0, newNatures, 1, natures.length);
newNatures[0] = IJETNature.NATURE_ID;
description.setNatureIds(newNatures);
- project.setDescription(description, new SubProgressMonitor(monitor, 1));
+ project.setDescription(description, BasicMonitor.subProgress(monitor, 1));
}
monitor.done();
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETCompileTemplateOperation.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETCompileTemplateOperation.java
index f6dc3da..4a0f351 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETCompileTemplateOperation.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETCompileTemplateOperation.java
@@ -39,10 +39,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.emf.codegen.CodeGenPlugin;
import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.DiagnosticException;
import org.eclipse.emf.common.util.URI;
@@ -213,7 +213,7 @@
if(!directory.exists())
{
- project.getFolder(directory.getProjectRelativePath()).create(true, true, new SubProgressMonitor(progressMonitor, 1));
+ project.getFolder(directory.getProjectRelativePath()).create(true, true, BasicMonitor.subProgress(progressMonitor, 1));
}
IPath filePath = file instanceof IFile ? ((IFile)file).getFullPath() : new Path(file.toString());
@@ -255,7 +255,7 @@
}
if (skeleton.getPackageName() != null)
{
- directory = getPackageContainer(directory, skeleton.getPackageName(), new SubProgressMonitor(progressMonitor, 1));
+ directory = getPackageContainer(directory, skeleton.getPackageName(), BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
@@ -333,7 +333,7 @@
{
progressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETJavaCompileProject_message", new Object [] { project.getFullPath() }));
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(progressMonitor, 1));
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, BasicMonitor.subProgress(progressMonitor, 1));
}
}
}
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
index 49ae247..1e3520b 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java
@@ -55,7 +55,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaModel;
@@ -631,7 +630,7 @@
if (!javaModel.isOpen())
{
- javaModel.open(new SubProgressMonitor(progressMonitor, 1));
+ javaModel.open(BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
@@ -646,14 +645,14 @@
if (!project.exists())
{
progressMonitor.subTask("JET creating project " + project.getName());
- project.create(new SubProgressMonitor(progressMonitor, 1));
+ project.create(BasicMonitor.subProgress(progressMonitor, 1));
progressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", new Object [] { project.getName() }));
IProjectDescription description = workspace.newProjectDescription(project.getName());
description.setNatureIds(new String [] { JavaCore.NATURE_ID });
description.setLocation(null);
- project.open(new SubProgressMonitor(progressMonitor, 1));
- project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
+ project.open(BasicMonitor.subProgress(progressMonitor, 1));
+ project.setDescription(description, BasicMonitor.subProgress(progressMonitor, 1));
javaProject = JavaCore.create(project);
for (Map.Entry<String, String> option : jetEmitter.getJavaOptions().entrySet())
@@ -663,10 +662,10 @@
}
else
{
- project.open(new SubProgressMonitor(progressMonitor, 5));
+ project.open(BasicMonitor.subProgress(progressMonitor, 5));
IProjectDescription description = project.getDescription();
description.setNatureIds(new String [] { JavaCore.NATURE_ID });
- project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
+ project.setDescription(description, BasicMonitor.subProgress(progressMonitor, 1));
javaProject = JavaCore.create(project);
}
@@ -699,23 +698,23 @@
IFolder sourceFolder = project.getFolder(new Path("src"));
if (!sourceFolder.exists())
{
- sourceFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
+ sourceFolder.create(false, true, BasicMonitor.subProgress(progressMonitor, 1));
}
IFolder runtimeFolder = project.getFolder(new Path("bin"));
if (!runtimeFolder.exists())
{
- runtimeFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
+ runtimeFolder.create(false, true, BasicMonitor.subProgress(progressMonitor, 1));
}
- javaProject.setRawClasspath(classpath.toArray(new IClasspathEntry[classpath.size()]), new SubProgressMonitor(progressMonitor, 1));
+ javaProject.setRawClasspath(classpath.toArray(new IClasspathEntry[classpath.size()]), BasicMonitor.subProgress(progressMonitor, 1));
- javaProject.setOutputLocation(new Path("/" + project.getName() + "/bin"), new SubProgressMonitor(progressMonitor, 1));
+ javaProject.setOutputLocation(new Path("/" + project.getName() + "/bin"), BasicMonitor.subProgress(progressMonitor, 1));
javaProject.close();
progressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETOpeningJavaProject_message", new Object [] { project.getName() }));
- javaProject.open(new SubProgressMonitor(progressMonitor, 1));
+ javaProject.open(BasicMonitor.subProgress(progressMonitor, 1));
IPackageFragmentRoot [] packageFragmentRoots = javaProject.getPackageFragmentRoots();
IPackageFragmentRoot sourcePackageFragmentRoot = null;
@@ -730,7 +729,7 @@
}
StringTokenizer stringTokenizer = new StringTokenizer(packageName, ".");
- IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, 1);
+ IProgressMonitor subProgressMonitor = BasicMonitor.subProgress(progressMonitor, 1);
subProgressMonitor.beginTask("", stringTokenizer.countTokens() + 4);
subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_CreateTargetFile_message"));
IContainer sourceContainer = sourcePackageFragmentRoot == null ? project : (IContainer)sourcePackageFragmentRoot.getCorrespondingResource();
@@ -740,7 +739,7 @@
sourceContainer = sourceContainer.getFolder(new Path(folderName));
if (!sourceContainer.exists())
{
- ((IFolder)sourceContainer).create(false, true, new SubProgressMonitor(subProgressMonitor, 1));
+ ((IFolder)sourceContainer).create(false, true, BasicMonitor.subProgress(subProgressMonitor, 1));
}
}
IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java"));
@@ -748,18 +747,18 @@
{
subProgressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", new Object [] { targetFile.getFullPath() }));
- targetFile.create(contents, true, new SubProgressMonitor(subProgressMonitor, 1));
+ targetFile.create(contents, true, BasicMonitor.subProgress(subProgressMonitor, 1));
}
else
{
subProgressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", new Object [] { targetFile.getFullPath() }));
- targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
+ targetFile.setContents(contents, true, true, BasicMonitor.subProgress(subProgressMonitor, 1));
}
subProgressMonitor.subTask
(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", new Object [] { project.getName() }));
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, BasicMonitor.subProgress(subProgressMonitor, 1));
IMarker [] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
boolean errors = false;
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJCompilationUnit.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJCompilationUnit.java
index ebe5b5b..e279358 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJCompilationUnit.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJCompilationUnit.java
@@ -19,7 +19,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJCompilationUnit extends JDOMJNode implements JCompilationUnit
{
protected String originalContent;
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJField.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJField.java
index 36bbb28..02ed039 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJField.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJField.java
@@ -18,7 +18,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJField extends JDOMJMember implements JField
{
public JDOMJField(IDOMField field)
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJImport.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJImport.java
index a396cf4..169e69f 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJImport.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJImport.java
@@ -18,7 +18,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJImport extends JDOMJNode implements JImport
{
public JDOMJImport(IDOMImport imp)
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJInitializer.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJInitializer.java
index 06f1a6f..5d4ab59 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJInitializer.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJInitializer.java
@@ -20,7 +20,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJInitializer extends JDOMJMember implements JInitializer
{
/**
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMember.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMember.java
index cdb6bd0..938f70a 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMember.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMember.java
@@ -19,7 +19,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public abstract class JDOMJMember extends JDOMJNode implements JMember
{
/**
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMethod.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMethod.java
index a8b4045..cf0daf3 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMethod.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMethod.java
@@ -19,7 +19,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJMethod extends JDOMJMember implements JMethod
{
/**
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJPackage.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJPackage.java
index cfcc9ac..eb36b91 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJPackage.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJPackage.java
@@ -18,7 +18,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJPackage extends JDOMJNode implements JPackage
{
public JDOMJPackage(IDOMPackage pck)
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJType.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJType.java
index 91efa3d..40f1d3d 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJType.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJType.java
@@ -20,7 +20,7 @@
/**
* @since 2.2.0
*/
-@SuppressWarnings({"deprecation", "unchecked"})
+@SuppressWarnings("deprecation")
public class JDOMJType extends JDOMJMember implements JType
{
protected JPackage jPackage;
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/CodeGenUtil.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/CodeGenUtil.java
index 607203c..63fad50 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/CodeGenUtil.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/CodeGenUtil.java
@@ -44,7 +44,6 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
@@ -1264,7 +1263,7 @@
if (forceRefresh)
{
- project.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(progressMonitor, 1));
+ project.refreshLocal(IResource.DEPTH_INFINITE, BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
@@ -1273,12 +1272,12 @@
if (!project.exists())
{
- project.create(projectDescription, new SubProgressMonitor(progressMonitor, 1));
- project.open(new SubProgressMonitor(progressMonitor, 1));
+ project.create(projectDescription, BasicMonitor.subProgress(progressMonitor, 1));
+ project.open(BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
- project.open(new SubProgressMonitor(progressMonitor, 2));
+ project.open(BasicMonitor.subProgress(progressMonitor, 2));
}
IContainer container = project;
@@ -1287,7 +1286,7 @@
IFolder folder = container.getFolder(new Path(path.segment(i)));
if (!folder.exists())
{
- folder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
+ folder.create(false, true, BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
diff --git a/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
index 26396bd..1cdd326 100644
--- a/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.common.ui;singleton:=true
-Bundle-Version: 2.11.0.qualifier
+Bundle-Version: 2.12.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.common.ui.CommonUIPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/wizard/AbstractExampleInstallerWizard.java b/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/wizard/AbstractExampleInstallerWizard.java
index 490eb88..b3574db 100644
--- a/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/wizard/AbstractExampleInstallerWizard.java
+++ b/plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/wizard/AbstractExampleInstallerWizard.java
@@ -26,7 +26,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -62,6 +61,7 @@
import org.eclipse.emf.common.ui.CommonUIPlugin;
import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticException;
import org.eclipse.emf.common.util.URI;
@@ -428,7 +428,7 @@
@Override
protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException
{
- Diagnostic diagnostic = deleteExistingProjects(new SubProgressMonitor(monitor, 1));
+ Diagnostic diagnostic = deleteExistingProjects(BasicMonitor.subProgress(monitor, 1));
if (diagnostic.getSeverity() != Diagnostic.OK)
{
exceptionWrapper.initCause(new DiagnosticException(diagnostic));
@@ -446,9 +446,9 @@
}
}
};
- op.run(new SubProgressMonitor(monitor, 1));
+ op.run(BasicMonitor.subProgress(monitor, 1));
- openFiles(new SubProgressMonitor(monitor, 1));
+ openFiles(BasicMonitor.subProgress(monitor, 1));
monitor.done();
}
});
@@ -511,7 +511,7 @@
new DeleteResourcesOperation(projects.toArray(new IProject[projects.size()]), "deleteprojects", true);
try
{
- return BasicDiagnostic.toDiagnostic(op.execute(new SubProgressMonitor(monitor, 1), null));
+ return BasicDiagnostic.toDiagnostic(op.execute(BasicMonitor.subProgress(monitor, 1), null));
}
catch (ExecutionException e)
{
@@ -591,9 +591,9 @@
*/
protected void installProject(ProjectDescriptor projectDescriptor, ImportOperation importOperation, IProgressMonitor progressMonitor) throws Exception
{
- createProject(projectDescriptor, new SubProgressMonitor(progressMonitor, 1));
+ createProject(projectDescriptor, BasicMonitor.subProgress(progressMonitor, 1));
importOperation.setContext(getShell());
- importOperation.run(new SubProgressMonitor(progressMonitor, 1));
+ importOperation.run(BasicMonitor.subProgress(progressMonitor, 1));
}
protected void createProject(ProjectDescriptor projectDescriptor, IProgressMonitor monitor) throws CoreException
@@ -601,8 +601,8 @@
monitor.beginTask(CommonUIPlugin.INSTANCE.getString("_UI_CreateProject_message", new String []{ projectDescriptor.getName() }), 3);
IProject project = projectDescriptor.getProject();
- project.create(new SubProgressMonitor(monitor, 1));
- project.open(new SubProgressMonitor(monitor, 1));
+ project.create(BasicMonitor.subProgress(monitor, 1));
+ project.open(BasicMonitor.subProgress(monitor, 1));
monitor.done();
}
diff --git a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
index f8c8bc0..13c1830 100644
--- a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.common;singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.common.CommonPlugin$Implementation$Activator
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
index 8561071..a839219 100644
--- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
+++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
@@ -310,7 +310,7 @@
* @see #resolve
* @see #basicGet
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E get(int index)
{
@@ -330,7 +330,7 @@
* @see #resolve
* @see #get
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E basicGet(int index)
{
@@ -601,7 +601,6 @@
* @param collection the collection of objects to be removed.
* @return whether any object was actually contained by the list.
*/
- @SuppressWarnings("null")
@Override
public boolean removeAll(Collection<?> collection)
{
@@ -627,7 +626,6 @@
* @return the removed object.
* @exception IndexOutOfBoundsException if the index isn't within the size range.
*/
- @SuppressWarnings("null")
@Override
public E remove(int index)
{
@@ -669,7 +667,6 @@
* @param collection the collection of objects to be retained.
* @return whether any object was actually removed.
*/
- @SuppressWarnings("null")
@Override
public boolean retainAll(Collection<?> collection)
{
@@ -717,7 +714,6 @@
* @return the moved object.
* @exception IndexOutOfBoundsException if either index isn't within the size range.
*/
- @SuppressWarnings("null")
@Override
public E move(int targetIndex, int sourceIndex)
{
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicMonitor.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicMonitor.java
index b6450c5..84acf38 100644
--- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicMonitor.java
+++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicMonitor.java
@@ -15,7 +15,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IProgressMonitorWithBlocking;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
/**
@@ -218,6 +217,15 @@
}
/**
+ * Create a progress monitor that consumes the specified number of ticks.
+ * @since 2.13
+ */
+ public static IProgressMonitorWithBlocking subProgress(IProgressMonitor monitor, int ticks)
+ {
+ return new EclipseSubProgress(monitor, ticks);
+ }
+
+ /**
* A simple monitor that delegates to another Eclipse monitor.
*/
private static class EclipseDelegating implements Monitor
@@ -318,7 +326,8 @@
/**
* An Eclipse subprogress monitor that directly implements the monitor API.
*/
- public static class EclipseSubProgress extends SubProgressMonitor implements Monitor
+ @SuppressWarnings("deprecation")
+ public static class EclipseSubProgress extends org.eclipse.core.runtime.SubProgressMonitor implements Monitor
{
public EclipseSubProgress(IProgressMonitor monitor, int ticks)
{
diff --git a/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF
index 6788a52..60ddf97 100644
--- a/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.converter; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.converter.ConverterPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java b/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java
index 7fc0cdb..53ea520 100644
--- a/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java
+++ b/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java
@@ -25,7 +25,7 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardNode;
import org.eclipse.jface.wizard.IWizardPage;
@@ -254,7 +254,7 @@
descriptorTableViewer = new TableViewer(descriptorTable);
descriptorTableViewer.setContentProvider(new ArrayContentProvider());
descriptorTableViewer.setLabelProvider(new ModelConverterManager.ModelConverterDescriptorLabelProvider());
- descriptorTableViewer.setSorter(new ViewerSorter());
+ descriptorTableViewer.setComparator(new ViewerComparator());
descriptorTableViewer.addDoubleClickListener(new IDoubleClickListener()
{
diff --git a/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/contribution/base/ModelConverterPackagePage.java b/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/contribution/base/ModelConverterPackagePage.java
index a302c4f..2b6eb71 100644
--- a/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/contribution/base/ModelConverterPackagePage.java
+++ b/plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/contribution/base/ModelConverterPackagePage.java
@@ -36,8 +36,8 @@
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.ModifyEvent;
@@ -605,7 +605,7 @@
};
// Sorting only the genModels
- referencedGenModelsTreeViewer.setSorter(new ViewerSorter()
+ referencedGenModelsTreeViewer.setComparator(new ViewerComparator()
{
@Override
public void sort(Viewer viewer, Object[] elements)
diff --git a/plugins/org.eclipse.emf.databinding.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.databinding.edit/.settings/org.eclipse.jdt.core.prefs
index 6774d75..810b20f 100644
--- a/plugins/org.eclipse.emf.databinding.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.databinding.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
#Thu Mar 19 06:34:43 EDT 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/plugins/org.eclipse.emf.databinding/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.databinding/.settings/org.eclipse.jdt.core.prefs
index 96b5cad..2a9d23f 100644
--- a/plugins/org.eclipse.emf.databinding/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.databinding/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
#Mon May 04 17:54:25 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
index fcda0b9..1534d08 100644
--- a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecore;singleton:=true
-Bundle-Version: 2.12.0.qualifier
+Bundle-Version: 2.13.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation$Activator
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
index 6953adf..55214b9 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java
@@ -266,8 +266,7 @@
/**
* This implementation delegates to the {@link #getURIConverter(Map) URI converter}'s {@link URIConverter#getContentHandlers() content handlers}.
*/
- @SuppressWarnings("null")
-public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException
+ public Map<String, ?> contentDescription(URI uri, Map<?, ?> options) throws IOException
{
URIConverter uriConverter = (URIConverter)options.get(URIConverter.OPTION_URI_CONVERTER);
InputStream inputStream = null;
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
index 67b8fb6..c23a970 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
@@ -2312,7 +2312,6 @@
{
if (isNotificationRequired())
{
- @SuppressWarnings("null")
NotificationImpl notification =
feature.isMany() ?
createNotification
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
index f9bff09..7220386 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
@@ -2130,7 +2130,6 @@
{
if (isNotificationRequired())
{
- @SuppressWarnings("null")
NotificationImpl notification =
feature.isMany() ?
createNotification
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
index f9f71f0..d09e3ba 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
@@ -1503,7 +1503,6 @@
}
}.parseInstanceTypeName(instanceTypeName);
String formattedName = null;
- @SuppressWarnings("null")
boolean result =
instanceTypeName != null ?
typeBuilderDiagnostic.getSeverity() == Diagnostic.OK &&
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
index 575b9fc..b7209a6 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
@@ -1879,7 +1879,6 @@
// Check for scheme, which must be before '/', '?' or '#'. Also handle
// names with DOS drive letters ('D:'), so 1-character schemes are not
// allowed.
- @SuppressWarnings("null")
int colonIdx = uriSpec.indexOf(':');
if (colonIdx != -1) {
final int searchFrom = colonIdx - 1;
diff --git a/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF
index 25f40c5..8c3b354 100644
--- a/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.gwt.common;singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java b/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
index 9386472..f24d2d6 100644
--- a/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
+++ b/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java
@@ -306,7 +306,7 @@
* @see #resolve
* @see #basicGet
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E get(int index)
{
@@ -326,7 +326,7 @@
* @see #resolve
* @see #get
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E basicGet(int index)
{
@@ -593,7 +593,6 @@
* @param collection the collection of objects to be removed.
* @return whether any object was actually contained by the list.
*/
- @SuppressWarnings("null")
@Override
public boolean removeAll(Collection<?> collection)
{
@@ -619,7 +618,6 @@
* @return the removed object.
* @exception IndexOutOfBoundsException if the index isn't within the size range.
*/
- @SuppressWarnings("null")
@Override
public E remove(int index)
{
@@ -653,7 +651,6 @@
* @param collection the collection of objects to be retained.
* @return whether any object was actually removed.
*/
- @SuppressWarnings("null")
@Override
public boolean retainAll(Collection<?> collection)
{
@@ -699,7 +696,6 @@
* @return the moved object.
* @exception IndexOutOfBoundsException if either index isn't within the size range.
*/
- @SuppressWarnings("null")
@Override
public E move(int targetIndex, int sourceIndex)
{
diff --git a/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
index fcc3780..881a426 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.gwt.ecore;singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
index f4e9d97..76b8af7 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
@@ -2305,7 +2305,6 @@
{
if (isNotificationRequired())
{
- @SuppressWarnings("null")
NotificationImpl notification =
feature.isMany() ?
createNotification
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
index dead466..0a8b92b 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java
@@ -2121,7 +2121,6 @@
{
if (isNotificationRequired())
{
- @SuppressWarnings("null")
NotificationImpl notification =
feature.isMany() ?
createNotification
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/Diagnostician.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/Diagnostician.java
index f63a7e1..c0ecb1e 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/Diagnostician.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/Diagnostician.java
@@ -151,7 +151,6 @@
}
}
boolean circular = context.get(EObjectValidator.ROOT_OBJECT) == eObject;
- @SuppressWarnings("null")
boolean result = ((EValidator)eValidator).validate(eClass, eObject, diagnostics, context);
if ((result || diagnostics != null) && !circular)
{
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
index 1155657..cb4220a 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java
@@ -1495,7 +1495,6 @@
}
}.parseInstanceTypeName(instanceTypeName);
String formattedName = null;
- @SuppressWarnings("null")
boolean result =
instanceTypeName != null ?
typeBuilderDiagnostic.getSeverity() == Diagnostic.OK &&
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
index 39cef84..200b766 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java
@@ -1879,7 +1879,6 @@
// Check for scheme, which must be before '/', '?' or '#'. Also handle
// names with DOS drive letters ('D:'), so 1-character schemes are not
// allowed.
- @SuppressWarnings("null")
int colonIdx = uriSpec.indexOf(':');
if (colonIdx != -1) {
final int searchFrom = colonIdx - 1;
diff --git a/plugins/org.eclipse.emf.gwt.edit.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.edit.ui/META-INF/MANIFEST.MF
index 2be4349..3bf8a3e 100644
--- a/plugins/org.eclipse.emf.gwt.edit.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.gwt.edit.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.gwt.edit.ui;singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.gwt.edit.ui/src/org/eclipse/emf/edit/ui/EditorEntryPoint.java b/plugins/org.eclipse.emf.gwt.edit.ui/src/org/eclipse/emf/edit/ui/EditorEntryPoint.java
index 08fd712..3f5aae7 100644
--- a/plugins/org.eclipse.emf.gwt.edit.ui/src/org/eclipse/emf/edit/ui/EditorEntryPoint.java
+++ b/plugins/org.eclipse.emf.gwt.edit.ui/src/org/eclipse/emf/edit/ui/EditorEntryPoint.java
@@ -1673,7 +1673,8 @@
grid.getColumnFormatter().setWidth(2, "40%");
- valueBox = new ListBox(true);
+ valueBox = new ListBox();
+ valueBox.setMultipleSelect(true);
valueBox.setVisibleItemCount(4);
valueBox.setWidth("100%");
grid.setWidget(0, 0, valueBox);
@@ -1719,7 +1720,8 @@
}
else
{
- choiceBox = new ListBox(true);
+ choiceBox = new ListBox();
+ choiceBox.setMultipleSelect(true);
choiceBox.setVisibleItemCount(4);
choiceBox.setWidth("100%");
grid.setWidget(0, 2, choiceBox);
diff --git a/plugins/org.eclipse.emf.importer.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.importer.java/META-INF/MANIFEST.MF
index 82f8a43..b993099 100644
--- a/plugins/org.eclipse.emf.importer.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.importer.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.importer.java; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.importer.java.JavaImporterPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/builder/JavaEcoreBuilder.java b/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/builder/JavaEcoreBuilder.java
index ded0027..19ccb3a 100644
--- a/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/builder/JavaEcoreBuilder.java
+++ b/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/builder/JavaEcoreBuilder.java
@@ -950,7 +950,6 @@
//
ePackage = EcoreFactory.eINSTANCE.createEPackage();
int index = qualifiedPackageName == null ? -1 : qualifiedPackageName.lastIndexOf(".");
- @SuppressWarnings("null")
String packageName = index == -1 ? qualifiedPackageName : qualifiedPackageName.substring(index + 1);
ePackage.setName(packageName);
ePackage.setNsURI("http:///" + (qualifiedPackageName == null ? "null" : qualifiedPackageName.replace('.', '/')) + ".ecore");
@@ -1163,7 +1162,6 @@
}
int index = qualifiedPackageName == null ? -1 : qualifiedPackageName.lastIndexOf(".");
- @SuppressWarnings("null")
String name = index == -1 ? qualifiedPackageName : qualifiedPackageName.substring(index + 1);
String nsURI = "http:///" + (qualifiedPackageName == null ? "null" : qualifiedPackageName.replace('.', '/')) + ".ecore";
String nsPrefix = qualifiedPackageName == null ? "null" : qualifiedPackageName;
diff --git a/releng/org.eclipse.emf.base.build-feature/feature.xml b/releng/org.eclipse.emf.base.build-feature/feature.xml
index e776466..b06aa77 100644
--- a/releng/org.eclipse.emf.base.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.base.build-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.base.build"
label="Eclipse Modeling Framework (EMF) Base Build Site"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/releng/org.eclipse.emf.build-feature/feature.xml b/releng/org.eclipse.emf.build-feature/feature.xml
index e039925..b263293 100755
--- a/releng/org.eclipse.emf.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.build-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.build"
label="Eclipse Modeling Framework (EMF) Build Site"
- version="2.12.0.qualifier"
+ version="2.13.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
diff --git a/releng/org.eclipse.emf.releng/EMF.setup b/releng/org.eclipse.emf.releng/EMF.setup
index b61907f..87c4128 100644
--- a/releng/org.eclipse.emf.releng/EMF.setup
+++ b/releng/org.eclipse.emf.releng/EMF.setup
@@ -27,6 +27,65 @@
</detail>
</annotation>
<setupTask
+ xsi:type="setup:CompoundTask"
+ name="User Preferences">
+ <annotation
+ source="http://www.eclipse.org/oomph/setup/UserPreferences">
+ <detail
+ key="/instance/org.eclipse.jdt.ui/cleanup_settings_version">
+ <value>record</value>
+ </detail>
+ <detail
+ key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles">
+ <value>record</value>
+ </detail>
+ <detail
+ key="/instance/org.eclipse.jdt.ui/cleanup_profile">
+ <value>record</value>
+ </detail>
+ <detail
+ key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles.version">
+ <value>record</value>
+ </detail>
+ </annotation>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.jdt.launching">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
+ value="ignore"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.jdt.ui">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/cleanup_profile"
+ value="_EMFCleanup"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/cleanup_settings_version"
+ value="2"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles.version"
+ value="2"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles"
+ value="<?xml version="1.0" encoding="UTF-8"?>
<profiles version="2">
<profile kind="CleanUpProfile" name="EMFCleanup" version="2">
<setting id="cleanup.format_source_code" value="false"/>
<setting id="cleanup.convert_functional_interfaces" value="false"/>
<setting id="cleanup.add_missing_annotations" value="true"/>
<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
<setting id="cleanup.remove_unused_private_types" value="true"/>
<setting id="cleanup.insert_inferred_type_arguments" value="false"/>
<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
<setting id="cleanup.add_generated_serial_version_id" value="false"/>
<setting id="cleanup.make_variable_declarations_final" value="false"/>
<setting id="cleanup.add_missing_methods" value="false"/>
<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
<setting id="cleanup.correct_indentation" value="false"/>
<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
<setting id="cleanup.add_serial_version_id" value="false"/>
<setting id="cleanup.remove_unused_private_methods" value="true"/>
<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
<setting id="cleanup.remove_unused_private_members" value="false"/>
<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
<setting id="cleanup.format_source_code_changes_only" value="false"/>
<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
<setting id="cleanup.add_missing_nls_tags" value="false"/>
<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
<setting id="cleanup.remove_unnecessary_casts" value="true"/>
<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
<setting id="cleanup.remove_unused_private_fields" value="true"/>
<setting id="cleanup.make_parameters_final" value="false"/>
<setting id="cleanup.remove_redundant_type_arguments" value="false"/>
<setting id="cleanup.remove_trailing_whitespaces" value="false"/>
<setting id="cleanup.remove_unused_imports" value="true"/>
<setting id="cleanup.use_anonymous_class_creation" value="false"/>
<setting id="cleanup.organize_imports" value="false"/>
<setting id="cleanup.sort_members" value="false"/>
<setting id="cleanup.remove_private_constructors" value="true"/>
<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
<setting id="cleanup.always_use_blocks" value="true"/>
<setting id="cleanup.never_use_blocks" value="false"/>
<setting id="cleanup.use_lambda" value="true"/>
<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
<setting id="cleanup.remove_unused_local_variables" value="false"/>
<setting id="cleanup.make_private_fields_final" value="true"/>
<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
<setting id="cleanup.add_default_serial_version_id" value="true"/>
<setting id="cleanup.sort_members_all" value="false"/>
<setting id="cleanup.use_blocks" value="false"/>
<setting id="cleanup.add_missing_override_annotations" value="true"/>
<setting id="cleanup.make_local_variable_final" value="true"/>
</profile>
</profiles>
"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/formatter_profile"
+ value="_EMFCodeFormatter"/>
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles"
+ value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="12">
<profile kind="CodeFormatterProfile" name="EMFCodeFormatter" version="12">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line_shifted"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="36"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="180"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="36"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="84"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="68"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="84"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="52"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
</profile>
</profiles>
"/>
+ </setupTask>
+ </setupTask>
+ <setupTask
xsi:type="jdt:JRETask"
version="J2SE-1.5"
location="${jre.location-1.5}"/>
@@ -36,10 +95,6 @@
value="2048m"
vm="true"/>
<setupTask
- xsi:type="setup:PreferenceTask"
- key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE"
- value="ignore"/>
- <setupTask
xsi:type="setup:ResourceCreationTask"
excludedTriggers="STARTUP MANUAL"
content="<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
		<item value="true" key="group_libraries"/>
		<item value="false" key="linkWithEditor"/>
		<item value="2" key="layout"/>
		<item value="2" key="rootMode"/>
		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
	</section>
</section>
"
diff --git a/releng/org.eclipse.emf.xcore.build-feature/feature.xml b/releng/org.eclipse.emf.xcore.build-feature/feature.xml
index e7e6168..744b1f3 100644
--- a/releng/org.eclipse.emf.xcore.build-feature/feature.xml
+++ b/releng/org.eclipse.emf.xcore.build-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.xcore.build"
label="Xcore Build Site"
- version="1.4.0.qualifier"
+ version="1.5.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.8.0.qualifier">
@@ -20,15 +20,7 @@
</license>
<includes
- id="org.eclipse.emf.ecore.xcore"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.emf.ecore.xcore.sdk"
version="0.0.0"/>
- <includes
- id="org.eclipse.emf.ecore.xcore.ui"
- version="0.0.0"/>
-
</feature>
diff --git a/tests/org.eclipse.emf.test.databinding.edit/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.test.databinding.edit/.settings/org.eclipse.jdt.core.prefs
index 8d9e213..bc26cc6 100644
--- a/tests/org.eclipse.emf.test.databinding.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.test.databinding.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
#Sat Jul 11 12:25:21 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/tests/org.eclipse.emf.test.databinding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.test.databinding/.settings/org.eclipse.jdt.core.prefs
index 8b9bc61..b4c4965 100644
--- a/tests/org.eclipse.emf.test.databinding/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.test.databinding/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
#Sat Jul 11 12:36:50 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/tests/org.eclipse.emf.test.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.test.edit/META-INF/MANIFEST.MF
index 1dee164..6a2685a 100644
--- a/tests/org.eclipse.emf.test.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.test.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.test.edit;singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
Bundle-ClassPath: test.edit.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.emf.test.edit/src/org/eclipse/emf/test/edit/TestValidateAction.java b/tests/org.eclipse.emf.test.edit/src/org/eclipse/emf/test/edit/TestValidateAction.java
index b8b8fa0..6b8ec04 100644
--- a/tests/org.eclipse.emf.test.edit/src/org/eclipse/emf/test/edit/TestValidateAction.java
+++ b/tests/org.eclipse.emf.test.edit/src/org/eclipse/emf/test/edit/TestValidateAction.java
@@ -46,6 +46,8 @@
{
public static class MyValidateAction extends ValidateAction
{
+ private static final long serialVersionUID = 1L;
+
public MyValidateAction()
{
this.domain = new AdapterFactoryEditingDomain(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), new BasicCommandStack());
