diff options
8 files changed, 8 insertions, 14 deletions
diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java index 2f4ce4df5..b912d7af8 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java +++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/src/org/eclipse/emf/example/databinding/project/ui/rcp/Activator.java @@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener // The shared instance
private static Activator plugin;
- private ServiceTracker<?, ?> tracker;
+ private ServiceTracker tracker;
private IModelLoadingService loadingService;
@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener this.context = context;
plugin = this;
- tracker = new ServiceTracker<Object, Object>(context, IModelLoadingService.class.getName(), null);
+ tracker = new ServiceTracker(context, IModelLoadingService.class.getName(), null);
tracker.open();
loadingService = (IModelLoadingService)tracker.getService();
@@ -119,7 +119,7 @@ public class Activator extends AbstractUIPlugin implements ServiceListener public void serviceChanged(ServiceEvent event)
{
- ServiceReference<?> sr = event.getServiceReference();
+ ServiceReference sr = event.getServiceReference();
switch (event.getType())
{
case ServiceEvent.REGISTERED: {
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java index e54067a68..e90b381b5 100644 --- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java +++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java @@ -1586,7 +1586,7 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl (Platform.PI_RUNTIME,
Platform.PREF_LINE_SEPARATOR,
System.getProperty(Platform.PREF_LINE_SEPARATOR),
- new IScopeContext[] { new ProjectScope(ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(workspacePath)).getProject()), InstanceScope.INSTANCE });
+ new IScopeContext[] { new ProjectScope(ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(workspacePath)).getProject()), new InstanceScope() });
}
public static boolean isReadOnly(String workspacePath)
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 f407979c2..469d30508 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 @@ -1025,7 +1025,7 @@ public class CodeGenUtil try
{
Bundle bundle = Platform.getBundle(pluginID);
- String requires = bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
+ String requires = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
if (requires == null)
{
requires = ".";
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 d0dba3842..714a385d2 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 @@ -132,7 +132,7 @@ public abstract class ModelConverterDescriptorSelectionPage extends WizardSelect {
if (descriptor != null)
{
- IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ConverterPlugin.ID);
+ IEclipsePreferences node = new InstanceScope().getNode(ConverterPlugin.ID); node.put(modelConverterManager.getClass().getName(), descriptor.getID());
try
{
diff --git a/plugins/org.eclipse.emf.databinding.edit/src/org/eclipse/emf/databinding/edit/internal/EMFEditValuePropertyDecorator.java b/plugins/org.eclipse.emf.databinding.edit/src/org/eclipse/emf/databinding/edit/internal/EMFEditValuePropertyDecorator.java index 6725bb39b..fdaf1510b 100644 --- a/plugins/org.eclipse.emf.databinding.edit/src/org/eclipse/emf/databinding/edit/internal/EMFEditValuePropertyDecorator.java +++ b/plugins/org.eclipse.emf.databinding.edit/src/org/eclipse/emf/databinding/edit/internal/EMFEditValuePropertyDecorator.java @@ -139,19 +139,16 @@ public class EMFEditValuePropertyDecorator extends ValueProperty implements IEMF return new EMFEditObservableValueDecorator(editingDomain, delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableList observeDetail(IObservableList master)
{
return new EMFEditObservableListDecorator(editingDomain, delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableMap observeDetail(IObservableSet master)
{
return new EMFEditObservableMapDecorator(editingDomain, delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableMap observeDetail(IObservableMap master)
{
return new EMFEditObservableMapDecorator(editingDomain, delegate.observeDetail(master), eStructuralFeature);
diff --git a/plugins/org.eclipse.emf.databinding/src/org/eclipse/emf/databinding/internal/EMFValuePropertyDecorator.java b/plugins/org.eclipse.emf.databinding/src/org/eclipse/emf/databinding/internal/EMFValuePropertyDecorator.java index f4f9f96e7..c4728a086 100644 --- a/plugins/org.eclipse.emf.databinding/src/org/eclipse/emf/databinding/internal/EMFValuePropertyDecorator.java +++ b/plugins/org.eclipse.emf.databinding/src/org/eclipse/emf/databinding/internal/EMFValuePropertyDecorator.java @@ -132,19 +132,16 @@ public class EMFValuePropertyDecorator extends ValueProperty implements IEMFValu return new EMFObservableValueDecorator(delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableList observeDetail(IObservableList master)
{
return new EMFObservableListDecorator(delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableMap observeDetail(IObservableSet master)
{
return new EMFObservableMapDecorator(delegate.observeDetail(master), eStructuralFeature);
}
- @Override
public IObservableMap observeDetail(IObservableMap master)
{
return new EMFObservableMapDecorator(delegate.observeDetail(master), eStructuralFeature);
diff --git a/plugins/org.eclipse.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java b/plugins/org.eclipse.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java index 06f65cb34..32920d5b8 100644 --- a/plugins/org.eclipse.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java +++ b/plugins/org.eclipse.emf.exporter/src/org/eclipse/emf/exporter/ui/contribution/base/ModelExporterWizard.java @@ -99,7 +99,7 @@ public abstract class ModelExporterWizard extends ModelConverterWizard protected void writePreferencesSettings()
{
- IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ExporterPlugin.ID);
+ IEclipsePreferences node = new InstanceScope().getNode(ExporterPlugin.ID); ModelExporter modelExporter = getModelExporter();
node.putBoolean(PREFERENCE_SAVE_PACKAGE_URI, modelExporter.isSaveEPackageArtifactURI());
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 c55e58218..5a0efd205 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 @@ -598,7 +598,7 @@ public class JavaEcoreBuilder Bundle bundle = Platform.getBundle(pluginID);
if (bundle != null)
{
- String requires = bundle.getHeaders().get(Constants.REQUIRE_BUNDLE);
+ String requires = (String)bundle.getHeaders().get(Constants.REQUIRE_BUNDLE); if (requires != null)
{
ManifestElement[] elements = ManifestElement.parseHeader(Constants.REQUIRE_BUNDLE, requires);
|