475761: simplified APIs for table viewer creation/setup
Change-Id: I9875738b9d4a3fa84e389be266898a363fbb43aa
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=475761
diff --git a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/ViewerFactory.java b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/ViewerFactory.java
index fb7689c..0e0b6ca 100644
--- a/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/ViewerFactory.java
+++ b/plugins/org.eclipse.emf.parsley.common/src/org/eclipse/emf/parsley/viewers/ViewerFactory.java
@@ -79,13 +79,8 @@
}
public TableViewer createTableViewer(Composite parent, int style, EClass type) {
- return createTableViewer(parent, style, type,
- tableViewerContentProviderFactory.createTableViewerContentProvider(type));
- }
-
- public TableViewer createTableViewer(Composite parent, int style, EClass type, IStructuredContentProvider contentProvider) {
TableViewer tableViewer = createTableViewer(parent, style);
- buildColumns(tableViewer, type, contentProvider);
+ buildColumns(tableViewer, type);
return tableViewer;
}
@@ -93,7 +88,7 @@
buildColumns(tableViewer, eClass, tableViewerContentProviderFactory.createTableViewerContentProvider(eClass));
}
- public void buildColumns(TableViewer tableViewer, EClass eClass,
+ private void buildColumns(TableViewer tableViewer, EClass eClass,
IStructuredContentProvider contentProvider) {
tableViewer.setContentProvider(contentProvider);
columnBuilder.buildTableViewer(tableViewer, eClass);
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractTableViewerTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractTableViewerTest.xtend
index 4918789..c6e6eed 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractTableViewerTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractTableViewerTest.xtend
@@ -11,12 +11,10 @@
package org.eclipse.emf.parsley.tests
import org.eclipse.emf.ecore.EClass
-import org.eclipse.emf.parsley.util.EmfParsleyUtil
import org.eclipse.emf.parsley.viewers.ViewerFactory
import org.eclipse.jface.viewers.TableViewer
import org.eclipse.swt.SWT
import org.junit.Before
-import org.eclipse.jface.viewers.ArrayContentProvider
abstract class AbstractTableViewerTest extends AbstractImageBasedTest {
@@ -35,10 +33,8 @@
def protected buildAndFill(Object contents, EClass eClass) {
syncExecVoid[
- viewerFactory.buildColumns(
- tableViewer, eClass, new ArrayContentProvider
- )
- tableViewer.input = EmfParsleyUtil.ensureCollection(contents)
+ viewerFactory.buildColumns(tableViewer, eClass)
+ tableViewer.input = contents
]
}
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerBuilderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerBuilderTest.xtend
index 700fa64..b2e5e8c 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerBuilderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/TableViewerBuilderTest.xtend
@@ -19,7 +19,7 @@
@Test
def void testTableRowSize() {
buildAndFill(
- testContainer.classesWithName, testPackage.classWithName
+ testContainer, testPackage.classWithName
)
syncExecVoid[
numOfElements.assertEquals(tableViewer.table.items.length)
@@ -29,7 +29,7 @@
@Test
def void testTableRowTextForString() {
buildAndFill(
- testContainer.classesWithName, testPackage.classWithName
+ testContainer, testPackage.classWithName
)
syncExecVoid[
"name 0".assertEquals(
@@ -41,7 +41,7 @@
@Test
def void testTableRowTextForEObject() {
buildAndFill(
- testContainer.classesForTable, testPackage.classForTable
+ testContainer, testPackage.classForTable
)
syncExecVoid[
"Class With Name name 0".assertEquals(
