Bug 547183: Compilation errors since 2019-06.M2
- Limit Lucene < 8
- Fix TableTreeItem removal
Signed-off-by: Jeff MAURY <jmaury@redhat.com>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
index fbaa5f2..da581d8 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
@@ -9,10 +9,10 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.help,
- org.apache.lucene.core;bundle-version="7.5",
- org.apache.lucene.misc;bundle-version="7.5",
- org.apache.lucene.analyzers-common;bundle-version="7.5",
- org.apache.lucene.queryparser;bundle-version="7.5",
+ org.apache.lucene.core;bundle-version="[7.5,8)",
+ org.apache.lucene.misc;bundle-version="[7.5,8)",
+ org.apache.lucene.analyzers-common;bundle-version="[7.5,8)",
+ org.apache.lucene.queryparser;bundle-version="[7.5,8)",
org.eclipse.datatools.connectivity
Import-Package: com.ibm.icu.text;version="3.6.1",
com.ibm.icu.util;version="3.6.1"
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/Modifier.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/Modifier.java
index 5b75bbf..6505a88 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/Modifier.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/Modifier.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright © 2000, 2007 IBM Corporation and others.
+ * Copyright © 2000, 2019 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which is available at
@@ -17,7 +17,6 @@
import org.eclipse.datatools.sqltools.sqlbuilder.views.select.SelectTableElement;
import org.eclipse.datatools.sqltools.sqlbuilder.views.update.UpdateTreeElement;
import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.custom.TableTreeItem;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TableItem;
@@ -40,9 +39,6 @@
if (element instanceof TableItem) {
data = ((TableItem) element).getData();
}
- else if (element instanceof TableTreeItem) {
- data = ((TableTreeItem) element).getData();
- }
// appears that the table returns the table element as the value if there
// is no change to the cell contents - don't need to modify anything in this case
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/TableNavigator.java b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/TableNavigator.java
index 25960ea..ed61837 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/TableNavigator.java
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/src/org/eclipse/datatools/sqltools/sqlbuilder/views/TableNavigator.java
@@ -18,7 +18,6 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableCursor;
-import org.eclipse.swt.custom.TableTreeItem;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyAdapter;
@@ -36,6 +35,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.TreeItem;
/**
@@ -79,7 +79,7 @@
currentTable.setSelection(new TableItem[] {getRow()});
if (sViewer instanceof TableViewer)
{
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)getRow().getData(TABLETREEITEM_ID);
StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
sViewer.setSelection(selection, true);
}
@@ -100,7 +100,7 @@
{
if (sViewer instanceof TableViewer)
{
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)getRow().getData(TABLETREEITEM_ID);
StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
sViewer.setSelection(selection, true);
}
@@ -331,18 +331,18 @@
//jvh - look for + or - key
// column == 0
- if (row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
+ if (row.getData(TABLETREEITEM_ID) instanceof TreeItem)
{
if (column == 0 && e.character == '+')
{
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)row.getData(TABLETREEITEM_ID);
// TableViewer doesn't have this method, where TableTreeViewer did. Hope this doesn't break stuff. @nboldt
((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), true);
refresh();
}
else if (column == 0 && e.character == '-')
{
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)row.getData(TABLETREEITEM_ID);
// TableViewer doesn't have this method, where TableTreeViewer did. Hope this doesn't break stuff. @nboldt
((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), false);
refresh();
@@ -357,7 +357,7 @@
}
else if (structuredViewer instanceof TableViewer)
{
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)row.getData(TABLETREEITEM_ID);
((TableViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
}
}
@@ -392,15 +392,15 @@
}
else if (structuredViewer instanceof TableViewer && column == 1)
{
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)row.getData(TABLETREEITEM_ID);
((TableViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
}
- if (structuredViewer instanceof TableViewer && row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
+ if (structuredViewer instanceof TableViewer && row.getData(TABLETREEITEM_ID) instanceof TreeItem)
{
if (column == 0)
{
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
+ TreeItem tableTreeItem = (TreeItem)row.getData(TABLETREEITEM_ID);
boolean expandState = tableTreeItem.getExpanded();
// TableViewer doesn't have this method, where TableTreeViewer did. Hope this doesn't break stuff. @nboldt
((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), !expandState);
diff --git a/pom.xml b/pom.xml
index 8244b09..63a2770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<platform-repo.url>http://download.eclipse.org/eclipse/updates/I-builds/</platform-repo.url>
<!-- <orbit-repo.url>http://download.eclipse.org/tools/orbit/I-builds/I20180829144012/repository/</orbit-repo.url> -->
<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</orbit-repo.url>
- <emf-site>http://download.eclipse.org/modeling/emf/emf/updates/2.14milestones/</emf-site>
+ <emf-site>http://download.eclipse.org/modeling/emf/emf/builds/release/2.14/</emf-site>
<emf-query-site>http://download.eclipse.org/modeling/emf/query/updates/releases/R201706061326/</emf-query-site>
<mdt-ocl-site>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0/</mdt-ocl-site>
<gef-site>http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/</gef-site>
