GridColumnGroup expand/collapse events are not renamed yet on the client
diff --git a/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA.java b/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA.java
index 1c89874..617cdd0 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA.java
+++ b/bundles/org.eclipse.rap.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkit/GridColumnGroupLCA.java
@@ -20,7 +20,6 @@
import org.eclipse.nebula.widgets.grid.GridColumnGroup;
import org.eclipse.rap.rwt.internal.protocol.ClientObjectFactory;
import org.eclipse.rap.rwt.internal.protocol.IClientObject;
-import org.eclipse.rap.rwt.internal.protocol.ClientMessageConst;
import org.eclipse.rap.rwt.internal.protocol.ProtocolUtil;
import org.eclipse.rap.rwt.lifecycle.AbstractWidgetLCA;
import org.eclipse.rap.rwt.lifecycle.ProcessActionRunner;
@@ -59,8 +58,8 @@
public void readData( Widget widget ) {
GridColumnGroup group = ( GridColumnGroup )widget;
- processTreeEvent( group, ClientMessageConst.EVENT_EXPAND );
- processTreeEvent( group, ClientMessageConst.EVENT_COLLAPSE );
+ processTreeEvent( group, "treeExpanded" );
+ processTreeEvent( group, "treeCollapsed" );
}
@Override
@@ -99,7 +98,7 @@
private static void processTreeEvent( final GridColumnGroup group, String eventName ) {
if( WidgetLCAUtil.wasEventSent( group, eventName ) ) {
- final boolean expanded = eventName.equals( ClientMessageConst.EVENT_EXPAND );
+ final boolean expanded = eventName.equals( "treeExpanded" );
ProcessActionRunner.add( new Runnable() {
public void run() {
group.setExpanded( expanded );
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkip/GridColumnGroupLCA_Test.java b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkip/GridColumnGroupLCA_Test.java
index 88ccce4..02b9965 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkip/GridColumnGroupLCA_Test.java
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/src/org/eclipse/nebula/widgets/grid/internal/gridcolumngroupkip/GridColumnGroupLCA_Test.java
@@ -23,7 +23,6 @@
import org.eclipse.nebula.widgets.grid.GridColumnGroup;
import org.eclipse.nebula.widgets.grid.internal.gridcolumngroupkit.GridColumnGroupLCA;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.protocol.ClientMessageConst;
import org.eclipse.rap.rwt.lifecycle.WidgetUtil;
import org.eclipse.rap.rwt.testfixture.Fixture;
import org.eclipse.rap.rwt.testfixture.Message;
@@ -245,7 +244,7 @@
group.addListener( SWT.Expand, new LoggingTreeListener( events ) );
group.setExpanded( false );
- Fixture.fakeNotifyOperation( getId( group ), ClientMessageConst.EVENT_EXPAND, null );
+ Fixture.fakeNotifyOperation( getId( group ), "treeExpanded", null );
Fixture.readDataAndProcessAction( group );
assertEquals( 1, events.size() );
@@ -258,7 +257,7 @@
List<Event> events = new LinkedList<Event>();
group.addListener( SWT.Collapse, new LoggingTreeListener( events ) );
- Fixture.fakeNotifyOperation( getId( group ), ClientMessageConst.EVENT_COLLAPSE, null );
+ Fixture.fakeNotifyOperation( getId( group ), "treeCollapsed", null );
Fixture.readDataAndProcessAction( group );
assertEquals( 1, events.size() );
