Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/BuildAllProjectsAction.java4
-rw-r--r--doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/CopyFileFromPluginAction.java10
-rw-r--r--doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewJavaProjectAction.java12
-rw-r--r--doc/org.eclipse.emf.cheatsheets/src/org/eclipse/emf/cheatsheets/actions/NewProjectAction.java6
-rw-r--r--doc/org.eclipse.emf.doc-feature/feature.xml2
-rw-r--r--doc/org.eclipse.emf.doc/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.emf.doc/tutorials/jet2/jet_tutorial2.html2
-rw-r--r--doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/codegen/JETGateway.java9
-rw-r--r--examples/org.eclipse.emf.examples-feature/feature.xml2
-rw-r--r--examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--features/org.eclipse.emf-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.all-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.base-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.codegen.ecore.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.common-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.common.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.converter-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.ecore-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.gwt-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.gwt.common-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.gwt.ecore-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.gwt.edit.ui-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.gwt.sdk-feature/feature.xml2
-rwxr-xr-xfeatures/org.eclipse.emf.rap-feature/feature.xml2
-rwxr-xr-xfeatures/org.eclipse.emf.rap.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.sdk-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/handler/GenerateHandler.java6
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/presentation/GeneratorUIUtil.java3
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java21
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/util/GenModelUtil.java1
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/gwt/GWTBuilder.java4
-rw-r--r--plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java10
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETAddNatureOperation.java4
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETCompileTemplateOperation.java8
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jet/JETEmitter.java33
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJCompilationUnit.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJField.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJImport.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJInitializer.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMember.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJMethod.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJPackage.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/java/facade/jdom/JDOMJType.java2
-rw-r--r--plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/CodeGenUtil.java11
-rw-r--r--plugins/org.eclipse.emf.common.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.common.ui/src/org/eclipse/emf/common/ui/wizard/AbstractExampleInstallerWizard.java18
-rw-r--r--plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java8
-rw-r--r--plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicMonitor.java13
-rw-r--r--plugins/org.eclipse.emf.converter/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/ModelConverterDescriptorSelectionPage.java4
-rw-r--r--plugins/org.eclipse.emf.converter/src/org/eclipse/emf/converter/ui/contribution/base/ModelConverterPackagePage.java4
-rw-r--r--plugins/org.eclipse.emf.databinding.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.databinding/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/resource/impl/URIHandlerImpl.java3
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java1
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java1
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java1
-rw-r--r--plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/ArrayDelegatingEList.java8
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/DelegatingFeatureMap.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/Diagnostician.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/xml/type/internal/DataValue.java1
-rw-r--r--plugins/org.eclipse.emf.gwt.edit.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.gwt.edit.ui/src/org/eclipse/emf/edit/ui/EditorEntryPoint.java6
-rw-r--r--plugins/org.eclipse.emf.importer.java/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/builder/JavaEcoreBuilder.java2
-rw-r--r--releng/org.eclipse.emf.base.build-feature/feature.xml2
-rwxr-xr-xreleng/org.eclipse.emf.build-feature/feature.xml2
-rw-r--r--releng/org.eclipse.emf.releng/EMF.setup63
-rw-r--r--releng/org.eclipse.emf.xcore.build-feature/feature.xml10
-rw-r--r--tests/org.eclipse.emf.test.databinding.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--tests/org.eclipse.emf.test.databinding/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--tests/org.eclipse.emf.test.edit/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.test.edit/src/org/eclipse/emf/test/edit/TestValidateAction.java2
87 files changed, 219 insertions, 175 deletions
diff --git a/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.cheatsheets/META-INF/MANIFEST.MF
index 8e2199370..fd0ea3832 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 @@ Manifest-Version: 1.0
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 4453239d8..0e48fd1d9 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.IncrementalProjectBuilder;
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.ICheatSheetAction;
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -99,7 +99,7 @@ public class BuildAllProjectsAction extends Action implements ICheatSheetAction
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 8763f5047..38957ae0f 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.IPath;
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.ICheatSheetAction;
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -127,12 +127,12 @@ public class CopyFileFromPluginAction extends Action implements ICheatSheetActio
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 @@ public class CopyFileFromPluginAction extends Action implements ICheatSheetActio
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 @@ public class CopyFileFromPluginAction extends Action implements ICheatSheetActio
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 2da95ce3c..280f3e3f3 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.resources.IProjectDescription;
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 @@ public class NewJavaProjectAction extends NewProjectAction
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 @@ public class NewJavaProjectAction extends NewProjectAction
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 9b0728016..c39ba1cd6 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.resources.ResourcesPlugin;
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.ICheatSheetAction;
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.emf.cheatsheets.CheatSheetsPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
/**
@@ -106,9 +106,9 @@ public class NewProjectAction extends Action implements ICheatSheetAction
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 4ebc47123..4cadd4d57 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 276e40ef3..2ba34e488 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 @@ Manifest-Version: 1.0
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 476ee6817..2b02e38ef 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 @@ public String constructorValues() {
<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 1aa7627a1..a07485b5a 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 @@ Manifest-Version: 1.0
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 696b9bb1b..4e70db168 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.IStatus;
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 @@ public class JETGateway
// 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 @@ public class JETGateway
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 @@ public class JETGateway
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 e95bb27f9..4fdaaaafe 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 1f4a256da..1a44a3f0b 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 c2c781468..61e1a4aea 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 30b320e93..769af4710 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 97f5b6bbe..61246498a 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 ea0e1dc01..f4adfb3c8 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 a88a2b688..a9b9a87ac 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 95654f76e..dd3e87e85 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 5a44571d3..cccdb027e 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 4cd7f6255..c6d478d4e 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 db3fea7f4..a3d4c24ec 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 43cc4913e..71e4a8da7 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 c4ff22d2b..cc0a74ba2 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 09da34b48..89dfd58dd 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 781b43981..a11dff7bb 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 9334f3a94..a0eb374db 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 031b3b713..2c441bb86 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 13db56c1a..4fcfc5b13 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 0a19d08f8..cda203293 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 ebd8594f4..acaccebc5 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 ebdaeea3d..57be7ae5d 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 @@ Manifest-Version: 1.0
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 713863c5a..f059a8c8b 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.IAdaptable;
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.generator.GenBaseGeneratorAdapter;
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 @@ public class GenerateHandler extends AbstractHandler
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 f2a3526aa..f927fc1da 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.IProgressMonitor;
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 @@ public class GeneratorUIUtil
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 6af740e5c..31b870991 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 @@ Manifest-Version: 1.0
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 865dec8b3..1ca411060 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.IProgressMonitor;
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 @@ public class Generator extends CodeGen
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 @@ public class Generator extends CodeGen
{
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 @@ public class Generator extends CodeGen
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 @@ public class Generator extends CodeGen
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 @@ public class Generator extends CodeGen
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 @@ public class Generator extends CodeGen
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 @@ public class Generator extends CodeGen
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 042edd55a..98dd19393 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 class GenModelUtil
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 49796f72d..65bc76aea 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.CoreException;
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 @@ public class GWTBuilder extends IncrementalProjectBuilder
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 01e1fc67a..108400980 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 @@ Manifest-Version: 1.0
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 a3310be18..8779bf920 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.CoreException;
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.jet.JETException;
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 @@ public class CodeGen
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 @@ public class CodeGen
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 0b514b7f8..1e6793700 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.IProjectDescription;
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 @@ public class JETAddNatureOperation implements IWorkspaceRunnable
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 f6dc3dabd..4a0f35156 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.IPath;
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 @@ public class JETCompileTemplateOperation implements IWorkspaceRunnable
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 @@ public class JETCompileTemplateOperation implements IWorkspaceRunnable
}
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 @@ public class JETCompileTemplateOperation implements IWorkspaceRunnable
{
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 49ae247ef..1e3520be0 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.IProgressMonitor;
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 @@ public class JETEmitter
if (!javaModel.isOpen())
{
- javaModel.open(new SubProgressMonitor(progressMonitor, 1));
+ javaModel.open(BasicMonitor.subProgress(progressMonitor, 1));
}
else
{
@@ -646,14 +645,14 @@ public class JETEmitter
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 @@ public class JETEmitter
}
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 @@ public class JETEmitter
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 @@ public class JETEmitter
}
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 @@ public class JETEmitter
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 @@ public class JETEmitter
{
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 ebe5b5bd0..e2793587e 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JCompilationUnit;
/**
* @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 36bbb288d..02ed03987 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JField;
/**
* @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 a396cf497..169e69fdd 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JImport;
/**
* @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 06f1a6f9e..5d4ab5927 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JInitializer;
/**
* @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 cdb6bd09f..938f70af2 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JMember;
/**
* @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 a8b404528..cf0daf312 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JMethod;
/**
* @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 cfcc9ac52..eb36b9170 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JPackage;
/**
* @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 91efa3dc4..40f1d3d1f 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 @@ import org.eclipse.emf.codegen.merge.java.facade.JType;
/**
* @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 607203c79..63fad5036 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.IProgressMonitor;
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 @@ public class CodeGenUtil
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 @@ public class CodeGenUtil
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 @@ public class CodeGenUtil
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 26396bdc2..1cdd326b1 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 @@ Manifest-Version: 1.0
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 490eb8852..b3574dbcf 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.resources.ResourcesPlugin;
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.CommonPlugin;
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 @@ public abstract class AbstractExampleInstallerWizard extends Wizard implements I
@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 @@ public abstract class AbstractExampleInstallerWizard extends Wizard implements I
}
}
};
- 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 @@ public abstract class AbstractExampleInstallerWizard extends Wizard implements I
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 @@ public abstract class AbstractExampleInstallerWizard extends Wizard implements I
*/
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 @@ public abstract class AbstractExampleInstallerWizard extends Wizard implements I
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 f8c8bc0c3..13c183050 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 @@ Manifest-Version: 1.0
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 85610710e..a83921951 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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @see #resolve
* @see #basicGet
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E get(int index)
{
@@ -330,7 +330,7 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @see #resolve
* @see #get
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E basicGet(int index)
{
@@ -601,7 +601,6 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 b6450c597..84acf3867 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 java.io.PrintStream;
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 @@ public class BasicMonitor implements Monitor
}
/**
+ * 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 @@ public class BasicMonitor implements Monitor
/**
* 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 6788a52f5..60ddf976b 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 @@ Manifest-Version: 1.0
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 7fc0cdb99..53ea520e6 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.IStructuredSelection;
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 @@ public abstract class ModelConverterDescriptorSelectionPage extends WizardSelect
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 a302c4f00..2b6eb7113 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.ILabelProvider;
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 @@ public class ModelConverterPackagePage extends ModelConverterPage
};
// 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 6774d755a..810b20f47 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 96b5cad76..2a9d23f69 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 fcda0b972..1534d0856 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 @@ Manifest-Version: 1.0
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 6953adf28..55214b98e 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 @@ public class URIHandlerImpl implements URIHandler
/**
* 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 67b8fb6f3..c23a970b8 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 @@ public class BasicFeatureMap
{
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 f9bff0926..72203864e 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 @@ public abstract class DelegatingFeatureMap extends DelegatingEcoreEList<FeatureM
{
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 f9f71f07c..d09e3ba9d 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 @@ public class EcoreValidator extends EObjectValidator
}
}.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 575b9fcfa..b7209a603 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 @@ public static class EncodingMap {
// 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 25f40c566..8c3b354d2 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 @@ Manifest-Version: 1.0
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 9386472f8..f24d2d6dd 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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @see #resolve
* @see #basicGet
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E get(int index)
{
@@ -326,7 +326,7 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @see #resolve
* @see #get
*/
- @SuppressWarnings({"unchecked", "null"})
+ @SuppressWarnings("unchecked")
@Override
public E basicGet(int index)
{
@@ -593,7 +593,6 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 @@ public abstract class ArrayDelegatingEList<E> extends AbstractEList<E> implement
* @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 fcc3780b8..881a42683 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 @@ Manifest-Version: 1.0
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 f4e9d976a..76b8af7bc 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 @@ public class BasicFeatureMap
{
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 dead466ad..0a8b92b10 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 @@ public abstract class DelegatingFeatureMap extends DelegatingEcoreEList<FeatureM
{
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 f63a7e1fb..c0ecb1e3d 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 @@ public class Diagnostician implements EValidator.SubstitutionLabelProvider, EVal
}
}
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 115565723..cb4220a90 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 @@ public class EcoreValidator extends EObjectValidator
}
}.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 39cef84c5..200b76659 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 @@ public static class EncodingMap {
// 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 2be43498a..3bf8a3e07 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 @@ Manifest-Version: 1.0
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 08fd71223..3f5aae72a 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 @@ public abstract class EditorEntryPoint implements EntryPoint
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 @@ public abstract class EditorEntryPoint implements EntryPoint
}
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 82f8a43f1..b993099ff 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 @@ Manifest-Version: 1.0
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 ded002764..19ccb3a05 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 @@ public class JavaEcoreBuilder
//
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 @@ public class JavaEcoreBuilder
}
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 e776466f6..b06aa77ee 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 e0399250c..b26329304 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 b61907f09..87c4128d6 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="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xA;&lt;profiles version=&quot;2&quot;>&#xA;&lt;profile kind=&quot;CleanUpProfile&quot; name=&quot;EMFCleanup&quot; version=&quot;2&quot;>&#xD;&#xA;&lt;setting id=&quot;cleanup.format_source_code&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.convert_functional_interfaces&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_annotations&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_this_for_non_static_method_access_only_if_necessary&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_private_types&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.insert_inferred_type_arguments&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.qualify_static_member_accesses_through_instances_with_declaring_class&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.qualify_static_method_accesses_with_declaring_class&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_generated_serial_version_id&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.make_variable_declarations_final&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_methods&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.always_use_this_for_non_static_field_access&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_trailing_whitespaces_ignore_empty&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.correct_indentation&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.never_use_parentheses_in_expressions&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_serial_version_id&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_private_methods&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_this_for_non_static_field_access&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_blocks_only_for_return_and_throw&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_private_members&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_override_annotations_interface_methods&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_trailing_whitespaces_all&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.make_type_abstract_if_missing_method&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.always_use_this_for_non_static_method_access&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unnecessary_nls_tags&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.format_source_code_changes_only&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.qualify_static_field_accesses_with_declaring_class&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_nls_tags&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_this_for_non_static_field_access_only_if_necessary&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unnecessary_casts&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.qualify_static_member_accesses_with_declaring_class&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_parentheses_in_expressions&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_private_fields&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.make_parameters_final&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_redundant_type_arguments&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_trailing_whitespaces&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_imports&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_anonymous_class_creation&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.organize_imports&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.sort_members&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_private_constructors&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.convert_to_enhanced_for_loop&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.always_use_blocks&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.never_use_blocks&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_lambda&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.always_use_parentheses_in_expressions&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_this_for_non_static_method_access&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.remove_unused_local_variables&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.make_private_fields_final&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_deprecated_annotations&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_default_serial_version_id&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.sort_members_all&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.use_blocks&quot; value=&quot;false&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.add_missing_override_annotations&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;setting id=&quot;cleanup.make_local_variable_final&quot; value=&quot;true&quot;/>&#xD;&#xA;&lt;/profile>&#xA;&lt;/profiles>&#xA;"/>
+ <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="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?>&#xA;&lt;profiles version=&quot;12&quot;>&#xA;&lt;profile kind=&quot;CodeFormatterProfile&quot; name=&quot;EMFCodeFormatter&quot; version=&quot;12&quot;>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.disabling_tag&quot; value=&quot;@formatter:off&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration&quot; value=&quot;next_line_shifted&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_field&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.use_on_off_tags&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_ellipsis&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_multiple_fields&quot; value=&quot;16&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_conditional_expression&quot; value=&quot;36&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_binary_operator&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_array_initializer&quot; value=&quot;end_of_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_package&quot; value=&quot;2&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.continuation_indentation&quot; value=&quot;2&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_binary_operator&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_package&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.source&quot; value=&quot;1.7&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_line_comments&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.join_wrapped_lines&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_member_type&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.align_type_members_on_columns&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_unary_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.indent_parameter_description&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.lineSplit&quot; value=&quot;180&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indentation.size&quot; value=&quot;4&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.enabling_tag&quot; value=&quot;@formatter:on&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration&quot; value=&quot;36&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_assignment&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.problem.assertIdentifier&quot; value=&quot;error&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.tabulation.char&quot; value=&quot;space&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_body&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_method&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_method_declaration&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_switch&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.problem.enumIdentifier&quot; value=&quot;error&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_ellipsis&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_method_declaration&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.compact_else_if&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_constant&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.indent_root_tags&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch&quot; value=&quot;16&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.tabulation.size&quot; value=&quot;2&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration&quot; value=&quot;84&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_empty_lines&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_block_in_case&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.compliance&quot; value=&quot;1.7&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer&quot; value=&quot;2&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_unary_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration&quot; value=&quot;68&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_binary_expression&quot; value=&quot;20&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode&quot; value=&quot;enabled&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_label&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant&quot; value=&quot;16&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_javadoc_comments&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.line_length&quot; value=&quot;80&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_import_groups&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.wrap_before_binary_operator&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations&quot; value=&quot;1&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_statements_compare_to_block&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration&quot; value=&quot;16&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.join_lines_in_comments&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_compact_if&quot; value=&quot;20&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_before_imports&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_html&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration&quot; value=&quot;84&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_source_code&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration&quot; value=&quot;52&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.compiler.codegen.targetPlatform&quot; value=&quot;1.7&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_resources_in_try&quot; value=&quot;80&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_header&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.format_block_comments&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.alignment_for_enum_constants&quot; value=&quot;0&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.brace_position_for_type_declaration&quot; value=&quot;next_line&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.blank_lines_after_imports&quot; value=&quot;2&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header&quot; value=&quot;true&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for&quot; value=&quot;insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments&quot; value=&quot;do not insert&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column&quot; value=&quot;false&quot;/>&#xA;&lt;setting id=&quot;org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line&quot; value=&quot;false&quot;/>&#xA;&lt;/profile>&#xA;&lt;/profiles>&#xA;"/>
+ </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="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
diff --git a/releng/org.eclipse.emf.xcore.build-feature/feature.xml b/releng/org.eclipse.emf.xcore.build-feature/feature.xml
index e7e616875..744b1f39d 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 @@ http://www.eclipse.org/legal/epl-v10.html
</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 8d9e21364..bc26cc62e 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 8b9bc61ab..b4c4965c6 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 1dee1647b..6a2685a35 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 @@ Manifest-Version: 1.0
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 b8b8fa02e..6b8ec04ba 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 class TestValidateAction
{
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());

Back to the top