Fix : Compilation errors when building against Oxygen
ListenerList now only exists in the core.runtime bundle.
diff --git a/plugins/org.eclipse.datatools.sqltools.data.ui/.classpath b/plugins/org.eclipse.datatools.sqltools.data.ui/.classpath
index e721d0c..f17aee0 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.ui/.classpath
+++ b/plugins/org.eclipse.datatools.sqltools.data.ui/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.datatools.sqltools.data.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.datatools.sqltools.data.ui/.settings/org.eclipse.jdt.core.prefs
index a78839e..0c68a61 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.datatools.sqltools.data.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue Feb 17 17:42:07 PST 2009
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditorSelectionProvider.java b/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditorSelectionProvider.java
index ef5a139..1715bda 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditorSelectionProvider.java
+++ b/plugins/org.eclipse.datatools.sqltools.data.ui/src/org/eclipse/datatools/sqltools/data/internal/ui/editor/TableDataEditorSelectionProvider.java
@@ -6,8 +6,8 @@
*/
package org.eclipse.datatools.sqltools.data.internal.ui.editor;
+import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -17,12 +17,10 @@
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-
public class TableDataEditorSelectionProvider implements ISelectionProvider
{
protected ITableDataEditor editor;
-
- protected ListenerList selectionChangedListeners = new ListenerList();
+ protected ListenerList<ISelectionChangedListener> selectionChangedListeners = new ListenerList<>();
public TableDataEditorSelectionProvider(ITableDataEditor editor)
{
@@ -61,12 +59,10 @@
}
public void selectionChanged() {
- Object[] listeners = selectionChangedListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener)listeners[i];
+ for (ISelectionChangedListener listener : this.selectionChangedListeners) {
Platform.run(new SafeRunnable() {
public void run() {
- l.selectionChanged(new SelectionChangedEvent(TableDataEditorSelectionProvider.this, getSelection()));
+ listener.selectionChanged(new SelectionChangedEvent(TableDataEditorSelectionProvider.this, getSelection()));
}
});
}
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/src/org/eclipse/datatools/sqltools/plan/internal/core/PlanManager.java b/plugins/org.eclipse.datatools.sqltools.plan/src/org/eclipse/datatools/sqltools/plan/internal/core/PlanManager.java
index 5d908f4..1424d62 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/src/org/eclipse/datatools/sqltools/plan/internal/core/PlanManager.java
+++ b/plugins/org.eclipse.datatools.sqltools.plan/src/org/eclipse/datatools/sqltools/plan/internal/core/PlanManager.java
@@ -16,12 +16,11 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.ListenerList;
import org.eclipse.datatools.sqltools.plan.PlanRequest;
import org.eclipse.datatools.sqltools.plan.internal.IPlanInstance;
import org.eclipse.datatools.sqltools.plan.internal.IPlanManager;
import org.eclipse.datatools.sqltools.plan.internal.IPlanManagerListener;
-import org.eclipse.jface.util.ListenerList;
-
/**
* Implementation of <code>IPlanManager</code>
@@ -30,9 +29,9 @@
*/
public class PlanManager implements IPlanManager
{
- ListenerList _listeners = new ListenerList();
- List _plans = new ArrayList();
- Map _map = new HashMap();
+ ListenerList<IPlanManagerListener> _listeners = new ListenerList<>();
+ List _plans = new ArrayList();
+ Map _map = new HashMap();
/**
* Constructor
*
@@ -69,10 +68,9 @@
protected void fireAdded(IPlanInstance instance)
{
- Object[] listeners = this._listeners.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (IPlanManagerListener listener : this._listeners)
{
- ((IPlanManagerListener) listeners[i]).planInstanceCreated(instance);
+ listener.planInstanceCreated(instance);
}
}
@@ -83,28 +81,25 @@
*/
public void fireFinish(IPlanInstance instance)
{
- Object[] listeners = this._listeners.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (IPlanManagerListener listener : this._listeners)
{
- ((IPlanManagerListener) listeners[i]).planInstanceFinished(instance);
+ listener.planInstanceFinished(instance);
}
}
protected void fireRemoved()
{
- Object[] listeners = this._listeners.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (IPlanManagerListener listener : this._listeners)
{
- ((IPlanManagerListener) listeners[i]).planInstancesRemoved();
+ listener.planInstancesRemoved();
}
}
protected void fireRemoved(IPlanInstance instance)
{
- Object[] listeners = this._listeners.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (IPlanManagerListener listener : this._listeners)
{
- ((IPlanManagerListener) listeners[i]).planInstanceRemoved(instance);
+ listener.planInstanceRemoved(instance);
}
}