[541257] TableNavigator has references to TableTreeViewer
Signed-off-by: Keith Chong <kchong@ca.ibm.com>
diff --git a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
index 65e708e..c871f22 100644
--- a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.ui; singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.1.600.qualifier
Bundle-Activator: org.eclipse.wst.common.ui.internal.UIPlugin
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.ui/pom.xml b/plugins/org.eclipse.wst.common.ui/pom.xml
index 45d6571..eee9f5c 100644
--- a/plugins/org.eclipse.wst.common.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -21,6 +21,6 @@
<groupId>org.eclipse.webtools.common</groupId>
<artifactId>org.eclipse.wst.common.ui</artifactId>
- <version>1.1.500-SNAPSHOT</version>
+ <version>1.1.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java
index 1d037a0..649fae5 100644
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java
+++ b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/TableNavigator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -58,7 +58,7 @@
*/
public void widgetSelected(SelectionEvent e) {
super.widgetSelected(e);
- if (sViewer instanceof TableTreeViewer)
+ if (sViewer instanceof AbstractTreeViewer)
{
TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
@@ -79,7 +79,7 @@
{
if (currentTable.getItemCount() > 0 && currentTable.getSelectionCount() <= 0)
{
- if (sViewer instanceof TableTreeViewer)
+ if (sViewer instanceof AbstractTreeViewer)
{
TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
@@ -299,13 +299,13 @@
if (column == 0 && e.character == '+')
{
TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), true);
+ ((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), true);
refresh();
}
else if (column == 0 && e.character == '-')
{
TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), false);
+ ((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), false);
refresh();
}
}
@@ -316,10 +316,10 @@
{
((TableViewer)structuredViewer).editElement(row.getData(), column);
}
- else if (structuredViewer instanceof TableTreeViewer)
+ else if (structuredViewer instanceof AbstractTreeViewer)
{
TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
+ ((AbstractTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
}
}
}
@@ -351,19 +351,19 @@
{
((TableViewer)structuredViewer).editElement(row.getData(), column);
}
- else if (structuredViewer instanceof TableTreeViewer && column == 1)
+ else if (structuredViewer instanceof AbstractTreeViewer && column == 1)
{
TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
+ ((AbstractTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
}
- if (structuredViewer instanceof TableTreeViewer && row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
+ if (structuredViewer instanceof AbstractTreeViewer && row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
{
if (column == 0)
{
TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
boolean expandState = tableTreeItem.getExpanded();
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), !expandState);
+ ((AbstractTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), !expandState);
refresh();
}
}
