Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Furnadjiev2016-01-29 09:09:36 -0500
committerIvan Furnadjiev2016-01-29 09:09:36 -0500
commitbf256f8f5357dea4a702e6335fc19d6777157830 (patch)
tree6c4e8ec73b4ede55c82a3ab580d2b9dca5dd1004 /bundles
parente1ee03e0026c1cc3f57825ae03b7fe57560d0a6a (diff)
downloadorg.eclipse.rap-bf256f8f5357dea4a702e6335fc19d6777157830.tar.gz
org.eclipse.rap-bf256f8f5357dea4a702e6335fc19d6777157830.tar.xz
org.eclipse.rap-bf256f8f5357dea4a702e6335fc19d6777157830.zip
Enable commented code in GridColumnLabelProvider
Column span on GridItem has been implemented in RAP 3.1M4. Enable commented code in GridColumnLabelProvider related to column spanning. Change-Id: Id1b9be722f7518036095b0b10cb227b52d400f97
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.rap.nebula.jface.gridviewer/src/org/eclipse/nebula/jface/gridviewer/GridColumnLabelProvider.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/bundles/org.eclipse.rap.nebula.jface.gridviewer/src/org/eclipse/nebula/jface/gridviewer/GridColumnLabelProvider.java b/bundles/org.eclipse.rap.nebula.jface.gridviewer/src/org/eclipse/nebula/jface/gridviewer/GridColumnLabelProvider.java
index d8ddef3ff4..b22ce646e7 100644
--- a/bundles/org.eclipse.rap.nebula.jface.gridviewer/src/org/eclipse/nebula/jface/gridviewer/GridColumnLabelProvider.java
+++ b/bundles/org.eclipse.rap.nebula.jface.gridviewer/src/org/eclipse/nebula/jface/gridviewer/GridColumnLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Tom Schindl and others.
+ * Copyright (c) 2007, 2016 Tom Schindl 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
@@ -8,6 +8,7 @@
* Contributors:
* Tom Schindl - initial API and implementation
* Claes Rosell<claes.rosell@solme.se> - rowspan in bug 272384
+ * EclipseSource - ongoing development
*******************************************************************************/
package org.eclipse.nebula.jface.gridviewer;
@@ -15,6 +16,7 @@ package org.eclipse.nebula.jface.gridviewer;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.nebula.widgets.grid.Grid;
+import org.eclipse.nebula.widgets.grid.GridItem;
/**
* A label provider that provides hooks for extra functionality in the {@link Grid}. This is currently
@@ -70,19 +72,19 @@ public class GridColumnLabelProvider extends ColumnLabelProvider {
public void update(ViewerCell cell) {
super.update(cell);
-// RAP [if] Row/column span and row headers are not supported
-// Object element = cell.getElement();
-//
+// RAP [if] Row span and row headers are not supported
+ Object element = cell.getElement();
+
// String rowText = getRowHeaderText(element);
-// int colSpan = getColumnSpan(element);
+ int colSpan = getColumnSpan(element);
// int rowSpan = getRowSpan(element);
-//
-// GridItem gridItem = (GridItem)cell.getViewerRow().getItem();
+
+ GridItem gridItem = (GridItem)cell.getViewerRow().getItem();
// if (rowText != null) {
// gridItem.setHeaderText(rowText);
// }
-//
-// gridItem.setColumnSpan(cell.getColumnIndex(), colSpan);
+
+ gridItem.setColumnSpan(cell.getColumnIndex(), colSpan);
// gridItem.setRowSpan(cell.getColumnIndex(), rowSpan);
// ENDRAP
}

Back to the top