Migrated Sphinx codebase to latest API changes in Nebula XViewer widget
diff --git a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/factory/ParameterValuesXViewerFactory.java b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/factory/ParameterValuesXViewerFactory.java
index 484b95a..17fa66d 100644
--- a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/factory/ParameterValuesXViewerFactory.java
+++ b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/factory/ParameterValuesXViewerFactory.java
@@ -1,21 +1,22 @@
/**
* <copyright>
- *
+ *
* Copyright (c) 2012 itemis 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
* http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ *
+ * Contributors:
* itemis - Initial API and implementation
- *
+ *
* </copyright>
*/
package org.eclipse.sphinx.examples.hummingbird20.editors.nebula.factory;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
+import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
import org.eclipse.nebula.widgets.xviewer.edit.CellEditDescriptor;
import org.eclipse.nebula.widgets.xviewer.edit.ExtendedViewerColumn;
import org.eclipse.sphinx.examples.hummingbird20.instancemodel.impl.ParameterValueImpl;
@@ -28,22 +29,20 @@
public final static String PARAMETER_NAME_COLUMN_NAME = "Name"; //$NON-NLS-1$
public final static String PARAMETER_VALUE_COLUMN_NAME = "Value"; //$NON-NLS-1$
- public static ExtendedViewerColumn nameColumn = new ExtendedViewerColumn(
- COLUMN_NAMESPACE + ".name", PARAMETER_NAME_COLUMN_NAME, 200, SWT.LEFT, true, //$NON-NLS-1$
- SortDataType.String, true, null);
+ public static ExtendedViewerColumn nameColumn = new ExtendedViewerColumn(COLUMN_NAMESPACE + ".name", PARAMETER_NAME_COLUMN_NAME, 200, //$NON-NLS-1$
+ XViewerAlign.Left, true, SortDataType.String, true, null);
- public static ExtendedViewerColumn valueColumn = new ExtendedViewerColumn(
- COLUMN_NAMESPACE + ".value", PARAMETER_VALUE_COLUMN_NAME, 200, SWT.LEFT, true, //$NON-NLS-1$
- SortDataType.String, true, null);
+ public static ExtendedViewerColumn valueColumn = new ExtendedViewerColumn(COLUMN_NAMESPACE + ".value", PARAMETER_VALUE_COLUMN_NAME, 200, //$NON-NLS-1$
+ XViewerAlign.Left, true, SortDataType.String, true, null);
public ParameterValuesXViewerFactory() {
super(COLUMN_NAMESPACE);
registerColumns(nameColumn, valueColumn);
- nameColumn.addMapEntry(ParameterValueImpl.class, new CellEditDescriptor(Text.class, SWT.BORDER, PARAMETER_NAME_COLUMN_NAME,
- ParameterValueImpl.class));
- valueColumn.addMapEntry(ParameterValueImpl.class, new CellEditDescriptor(Text.class, SWT.BORDER, PARAMETER_VALUE_COLUMN_NAME,
- ParameterValueImpl.class));
+ nameColumn.addMapEntry(ParameterValueImpl.class,
+ new CellEditDescriptor(Text.class, SWT.BORDER, PARAMETER_NAME_COLUMN_NAME, ParameterValueImpl.class));
+ valueColumn.addMapEntry(ParameterValueImpl.class,
+ new CellEditDescriptor(Text.class, SWT.BORDER, PARAMETER_VALUE_COLUMN_NAME, ParameterValueImpl.class));
}
@Override
diff --git a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/providers/ParameterValuesXViewerLabelProvider.java b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/providers/ParameterValuesXViewerLabelProvider.java
index cf26db5..355087e 100644
--- a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/providers/ParameterValuesXViewerLabelProvider.java
+++ b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/providers/ParameterValuesXViewerLabelProvider.java
@@ -1,23 +1,23 @@
/**
* <copyright>
- *
+ *
* Copyright (c) 2012 itemis 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
* http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ *
+ * Contributors:
* itemis - Initial API and implementation
- *
+ *
* </copyright>
*/
package org.eclipse.sphinx.examples.hummingbird20.editors.nebula.providers;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.sphinx.examples.hummingbird20.editors.nebula.factory.ParameterValuesXViewerFactory;
import org.eclipse.sphinx.examples.hummingbird20.instancemodel.ParameterValue;
import org.eclipse.swt.graphics.Image;
diff --git a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/sections/GenericParameterValuesXViewerSection.java b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/sections/GenericParameterValuesXViewerSection.java
index fa8eada..b0b8884 100644
--- a/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/sections/GenericParameterValuesXViewerSection.java
+++ b/examples/org.eclipse.sphinx.examples.hummingbird20.editors.nebula/src/org/eclipse/sphinx/examples/hummingbird20/editors/nebula/sections/GenericParameterValuesXViewerSection.java
@@ -1,145 +1,145 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2012-2015 itemis 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * itemis - Initial API and implementation
- * itemis - [460260] Expanded paths are collapsed on resource reload
- *
- * </copyright>
- */
-package org.eclipse.sphinx.examples.hummingbird20.editors.nebula.sections;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.ui.provider.TransactionalAdapterFactoryContentProvider;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
-import org.eclipse.sphinx.emf.editors.forms.nebula.providers.BasicModelXViewerLabelProvider;
-import org.eclipse.sphinx.emf.editors.forms.nebula.sections.BasicXViewerSection;
-import org.eclipse.sphinx.emf.editors.forms.pages.AbstractFormPage;
-import org.eclipse.sphinx.examples.hummingbird20.editors.nebula.messages.Messages;
-import org.eclipse.sphinx.examples.hummingbird20.instancemodel.InstanceModel20Factory;
-import org.eclipse.sphinx.examples.hummingbird20.instancemodel.InstanceModel20Package;
-import org.eclipse.sphinx.examples.hummingbird20.instancemodel.ParameterValue;
-import org.eclipse.sphinx.examples.hummingbird20.instancemodel.edit.ComponentItemProvider;
-import org.eclipse.sphinx.examples.hummingbird20.instancemodel.edit.InstanceModel20ItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class GenericParameterValuesXViewerSection extends BasicXViewerSection {
-
- private static final String XCOL_ID_EXTRA_INFO = "ExtraInfo"; //$NON-NLS-1$
-
- public GenericParameterValuesXViewerSection(AbstractFormPage formPage, Object sectionInput) {
- this(formPage, sectionInput, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
- }
-
- public GenericParameterValuesXViewerSection(AbstractFormPage formPage, Object sectionInput, int style) {
- super(formPage, sectionInput, InstanceModel20Factory.eINSTANCE.createParameterValue(), style);
-
- title = Messages.title_ParameterValues_Section;
- description = Messages.desc_ParameterValues_Section;
- }
-
- /**
- * Strategy 1: Create Xviewer content through (optionally customized) AdapterFactoryContentProvider exposing
- * ItemProviderAdapters generated by EMF Edit. Convenient when all children EObjects owned by some parent EObject
- * are to be displayed.
- */
- @Override
- protected IContentProvider createContentProvider() {
- InstanceModel20ItemProviderAdapterFactory adapterFactory = new InstanceModel20ItemProviderAdapterFactory() {
- @Override
- public Adapter createComponentAdapter() {
- if (componentItemProvider == null) {
- componentItemProvider = new ComponentItemProvider(this) {
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- // Consider only parameter value children of component
- childrenFeatures.remove(InstanceModel20Package.Literals.COMPONENT__OUTGOING_CONNECTIONS);
- childrenFeatures.remove(InstanceModel20Package.Literals.COMPONENT__PARAMETER_EXPRESSIONS);
- }
- return childrenFeatures;
- };
- };
- }
- return componentItemProvider;
- }
- };
- TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain((EObject) sectionInput);
- return new TransactionalAdapterFactoryContentProvider(editingDomain, adapterFactory);
- }
-
- /**
- * Strategy 2: Create Xviewer content through own content provider implementation returning flat list of interesting
- * EObjects as children. Useful when not all but a filtered or calculated subset of children EObjects owned by some
- * parent EObject are to be displayed.
- */
- // @Override
- // protected IContentProvider createContentProvider() {
- // return new ITreeContentProvider() {
- //
- // public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // }
- //
- // public Object[] getElements(Object inputElement) {
- // return getChildren(inputElement);
- // }
- //
- // public boolean hasChildren(Object element) {
- // return getChildren(element).length > 0;
- // }
- //
- // public Object[] getChildren(Object parentElement) {
- // return viewedParameterValues.toArray(new ParameterValue[viewedParameterValues.size()]);
- // }
- //
- // public Object getParent(Object element) {
- // return null;
- // }
- //
- // public void dispose() {
- // }
- // };
- // }
-
- /**
- * Addition of an extra column which displaying some calculated information that not part of the model.
- */
- @Override
- protected void registerColumns(XViewerFactory xViewerFactory) {
- super.registerColumns(xViewerFactory);
- xViewerFactory.registerColumns(new XViewerColumn(XCOL_ID_EXTRA_INFO, Messages.xcol_ColumnName_Extra_INFO, 50, SWT.LEFT, true,
- SortDataType.Float, false, Messages.xcol_ColumnDesc_Extra_INFO));
- }
-
- @Override
- protected BasicModelXViewerLabelProvider createLabelProvider() {
- return new BasicModelXViewerLabelProvider((XViewer) getViewer(), formPage.getItemDelegator()) {
- @Override
- public String getColumnText(Object element, XViewerColumn xCol, int columnIndex) throws Exception {
- if (element instanceof ParameterValue && XCOL_ID_EXTRA_INFO.equals(xCol.getId())) {
- return "0.17"; //$NON-NLS-1$
- }
- return super.getColumnText(element, xCol, columnIndex);
- }
- };
- }
-}
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2012-2015 itemis 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * itemis - Initial API and implementation
+ * itemis - [460260] Expanded paths are collapsed on resource reload
+ *
+ * </copyright>
+ */
+package org.eclipse.sphinx.examples.hummingbird20.editors.nebula.sections;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.ui.provider.TransactionalAdapterFactoryContentProvider;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.nebula.widgets.xviewer.XViewer;
+import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
+import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
+import org.eclipse.sphinx.emf.editors.forms.nebula.providers.BasicModelXViewerLabelProvider;
+import org.eclipse.sphinx.emf.editors.forms.nebula.sections.BasicXViewerSection;
+import org.eclipse.sphinx.emf.editors.forms.pages.AbstractFormPage;
+import org.eclipse.sphinx.examples.hummingbird20.editors.nebula.messages.Messages;
+import org.eclipse.sphinx.examples.hummingbird20.instancemodel.InstanceModel20Factory;
+import org.eclipse.sphinx.examples.hummingbird20.instancemodel.InstanceModel20Package;
+import org.eclipse.sphinx.examples.hummingbird20.instancemodel.ParameterValue;
+import org.eclipse.sphinx.examples.hummingbird20.instancemodel.edit.ComponentItemProvider;
+import org.eclipse.sphinx.examples.hummingbird20.instancemodel.edit.InstanceModel20ItemProviderAdapterFactory;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
+
+public class GenericParameterValuesXViewerSection extends BasicXViewerSection {
+
+ private static final String XCOL_ID_EXTRA_INFO = "ExtraInfo"; //$NON-NLS-1$
+
+ public GenericParameterValuesXViewerSection(AbstractFormPage formPage, Object sectionInput) {
+ this(formPage, sectionInput, Section.DESCRIPTION | ExpandableComposite.TITLE_BAR);
+ }
+
+ public GenericParameterValuesXViewerSection(AbstractFormPage formPage, Object sectionInput, int style) {
+ super(formPage, sectionInput, InstanceModel20Factory.eINSTANCE.createParameterValue(), style);
+
+ title = Messages.title_ParameterValues_Section;
+ description = Messages.desc_ParameterValues_Section;
+ }
+
+ /**
+ * Strategy 1: Create Xviewer content through (optionally customized) AdapterFactoryContentProvider exposing
+ * ItemProviderAdapters generated by EMF Edit. Convenient when all children EObjects owned by some parent EObject
+ * are to be displayed.
+ */
+ @Override
+ protected IContentProvider createContentProvider() {
+ InstanceModel20ItemProviderAdapterFactory adapterFactory = new InstanceModel20ItemProviderAdapterFactory() {
+ @Override
+ public Adapter createComponentAdapter() {
+ if (componentItemProvider == null) {
+ componentItemProvider = new ComponentItemProvider(this) {
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ // Consider only parameter value children of component
+ childrenFeatures.remove(InstanceModel20Package.Literals.COMPONENT__OUTGOING_CONNECTIONS);
+ childrenFeatures.remove(InstanceModel20Package.Literals.COMPONENT__PARAMETER_EXPRESSIONS);
+ }
+ return childrenFeatures;
+ };
+ };
+ }
+ return componentItemProvider;
+ }
+ };
+ TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain((EObject) sectionInput);
+ return new TransactionalAdapterFactoryContentProvider(editingDomain, adapterFactory);
+ }
+
+ /**
+ * Strategy 2: Create Xviewer content through own content provider implementation returning flat list of interesting
+ * EObjects as children. Useful when not all but a filtered or calculated subset of children EObjects owned by some
+ * parent EObject are to be displayed.
+ */
+ // @Override
+ // protected IContentProvider createContentProvider() {
+ // return new ITreeContentProvider() {
+ //
+ // public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ // }
+ //
+ // public Object[] getElements(Object inputElement) {
+ // return getChildren(inputElement);
+ // }
+ //
+ // public boolean hasChildren(Object element) {
+ // return getChildren(element).length > 0;
+ // }
+ //
+ // public Object[] getChildren(Object parentElement) {
+ // return viewedParameterValues.toArray(new ParameterValue[viewedParameterValues.size()]);
+ // }
+ //
+ // public Object getParent(Object element) {
+ // return null;
+ // }
+ //
+ // public void dispose() {
+ // }
+ // };
+ // }
+
+ /**
+ * Addition of an extra column which displaying some calculated information that not part of the model.
+ */
+ @Override
+ protected void registerColumns(XViewerFactory xViewerFactory) {
+ super.registerColumns(xViewerFactory);
+ xViewerFactory.registerColumns(new XViewerColumn(XCOL_ID_EXTRA_INFO, Messages.xcol_ColumnName_Extra_INFO, 50, XViewerAlign.Left, true,
+ SortDataType.Float, false, Messages.xcol_ColumnDesc_Extra_INFO));
+ }
+
+ @Override
+ protected BasicModelXViewerLabelProvider createLabelProvider() {
+ return new BasicModelXViewerLabelProvider((XViewer) getViewer(), formPage.getItemDelegator()) {
+ @Override
+ public String getColumnText(Object element, XViewerColumn xCol, int columnIndex) throws Exception {
+ if (element instanceof ParameterValue && XCOL_ID_EXTRA_INFO.equals(xCol.getId())) {
+ return "0.17"; //$NON-NLS-1$
+ }
+ return super.getColumnText(element, xCol, columnIndex);
+ }
+ };
+ }
+}
diff --git a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/META-INF/MANIFEST.MF b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/META-INF/MANIFEST.MF
index 97de076..a028663 100644
--- a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.sphinx.emf.editors.forms;visibility:=reexport,
- org.eclipse.nebula.widgets.xviewer;visibility:=reexport
+ org.eclipse.nebula.widgets.xviewer;visibility:=reexport,
+ org.eclipse.nebula.widgets.xviewer.core;visibility:=reexport
Export-Package: org.eclipse.sphinx.emf.editors.forms.nebula.internal;x-internal:=true,
org.eclipse.sphinx.emf.editors.forms.nebula.providers,
org.eclipse.sphinx.emf.editors.forms.nebula.sections
diff --git a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/providers/BasicModelXViewerLabelProvider.java b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/providers/BasicModelXViewerLabelProvider.java
index 3518c37..9127d7f 100644
--- a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/providers/BasicModelXViewerLabelProvider.java
+++ b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/providers/BasicModelXViewerLabelProvider.java
@@ -1,16 +1,16 @@
/**
* <copyright>
- *
+ *
* Copyright (c) 2012-2014 itemis 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
* http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
+ *
+ * Contributors:
* itemis - Initial API and implementation
* itemis - [434230] ParseException when trying to sort BasicXViewerSection for columns displaying Date-typed EAttributes
- *
+ *
* </copyright>
*/
package org.eclipse.sphinx.emf.editors.forms.nebula.providers;
@@ -23,8 +23,8 @@
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableFontProvider;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/sections/BasicXViewerSection.java b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/sections/BasicXViewerSection.java
index 5006447..933c657 100644
--- a/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/sections/BasicXViewerSection.java
+++ b/plugins/org.eclipse.sphinx.emf.editors.forms.nebula/src/org/eclipse/sphinx/emf/editors/forms/nebula/sections/BasicXViewerSection.java
@@ -35,11 +35,12 @@
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
import org.eclipse.nebula.widgets.xviewer.XViewerFactory;
import org.eclipse.nebula.widgets.xviewer.XViewerSorter;
import org.eclipse.nebula.widgets.xviewer.XViewerTextFilter;
+import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.edit.XViewerEditAdapter;
import org.eclipse.sphinx.emf.editors.forms.BasicTransactionalFormEditor;
import org.eclipse.sphinx.emf.editors.forms.nebula.internal.Activator;
@@ -236,9 +237,9 @@
protected void registerColumns(XViewerFactory xViewerFactory) {
List<IItemPropertyDescriptor> propertyDescriptors = formPage.getItemDelegator().getPropertyDescriptors(exampleValue);
for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
- xViewerFactory.registerColumns(new XViewerColumn(propertyDescriptor.getId(exampleValue).toString(), propertyDescriptor
- .getDisplayName(exampleValue), 100, SWT.LEFT, true, getSortDataType(propertyDescriptor, exampleValue), false, propertyDescriptor
- .getDescription(exampleValue)));
+ xViewerFactory.registerColumns(new XViewerColumn(propertyDescriptor.getId(exampleValue).toString(),
+ propertyDescriptor.getDisplayName(exampleValue), 100, XViewerAlign.Left, true, getSortDataType(propertyDescriptor, exampleValue),
+ false, propertyDescriptor.getDescription(exampleValue)));
}
}
