Fix : Compilation errors when building against Oxygen
ListenerList now only exists in the core.runtime bundle.
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/core/tableviewer/AbstractTableData.java b/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/core/tableviewer/AbstractTableData.java
index e96583e..0431f6b 100644
--- a/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/core/tableviewer/AbstractTableData.java
+++ b/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/core/tableviewer/AbstractTableData.java
@@ -7,7 +7,7 @@
import java.util.Vector;
-import org.eclipse.jface.util.ListenerList;
+import org.eclipse.core.runtime.ListenerList;
/**
*
@@ -20,7 +20,7 @@
/** Vector for IRowData objects */
protected Vector _rows = new Vector();
- protected ListenerList _listenerList = new ListenerList();
+ protected ListenerList<ITableDataChangeListener> _listenerList = new ListenerList<>();
/**
* Set IRowData objects.
* Each member of rows is <code>IRowData</code> object.
@@ -42,10 +42,9 @@
((RowData) row).setState(RowData.STATE_DELETED);
}
- Object[] listeners = _listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (ITableDataChangeListener listener : _listenerList)
{
- ((ITableDataChangeListener) listeners[i]).rowDeleted(row);
+ listener.rowDeleted(row);
}
}
@@ -55,10 +54,9 @@
IRowData row = new RowData(this, RowData.STATE_INSERTED, data);
_rows.add(row);
- Object[] listeners = _listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (ITableDataChangeListener listener : _listenerList)
{
- ((ITableDataChangeListener) listeners[i]).rowAdded(row);
+ listener.rowAdded(row);
}
return row;
@@ -67,10 +65,9 @@
public void insertRow(IRowData rowData, int row)
{
_rows.insertElementAt(rowData, row);
- Object[] listeners = _listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (ITableDataChangeListener listener : _listenerList)
{
- ((ITableDataChangeListener) listeners[i]).rowAdded(rowData);
+ listener.rowAdded(rowData);
}
}
@@ -120,10 +117,9 @@
public void fireUpdated(IRowData row, int colIndex, Object oldVal, Object newVal)
{
- Object[] listeners = _listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++)
+ for (ITableDataChangeListener listener : _listenerList)
{
- ((ITableDataChangeListener) listeners[i]).rowDataUpdated(row, colIndex, oldVal, newVal);
+ listener.rowDataUpdated(row, colIndex, oldVal, newVal);
}
}
diff --git a/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/TableDataTableCursor.java b/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/TableDataTableCursor.java
index e14bcf4..b486bf3 100644
--- a/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/TableDataTableCursor.java
+++ b/plugins/org.eclipse.datatools.sqltools.common.ui/src/org/eclipse/datatools/sqltools/common/ui/tableviewer/TableDataTableCursor.java
@@ -5,10 +5,10 @@
*/
package org.eclipse.datatools.sqltools.common.ui.tableviewer;
+import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Platform;
import org.eclipse.datatools.sqltools.common.core.tableviewer.IRowData;
import org.eclipse.datatools.sqltools.common.core.tableviewer.ITableData;
-import org.eclipse.jface.util.ListenerList;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellEditorListener;
@@ -47,7 +47,7 @@
protected AccessibleTableViewer _tableViewer;
- protected ListenerList _selectionChangedListeners = new ListenerList();
+ protected ListenerList<ISelectionChangedListener> _selectionChangedListeners = new ListenerList<>();
public TableDataTableCursor(AccessibleTableViewer tableViewer)
{
@@ -441,10 +441,8 @@
public void selectionChanged()
{
- Object[] listeners = _selectionChangedListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i)
+ for (final ISelectionChangedListener l : _selectionChangedListeners)
{
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
Platform.run(new SafeRunnable()
{
public void run()