Remove public notify method on Model.java
No longer needed since change events are generated by Model.js
diff --git a/bundles/org.eclipse.rap.addons.dropdown.viewer/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer.java b/bundles/org.eclipse.rap.addons.dropdown.viewer/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer.java
index ea963ec..b891442 100644
--- a/bundles/org.eclipse.rap.addons.dropdown.viewer/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer.java
+++ b/bundles/org.eclipse.rap.addons.dropdown.viewer/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer.java
@@ -156,8 +156,7 @@
// TODO : Using a separate client object (e.g. "RemoteList") for the elements might allow
// sharing and incremental updates
model.set( ELEMENTS_KEY, JsonUtil.createJsonArray( elements ) );
- model.set( SELECTION_KEY, -1 );
- model.notify( "refresh" );
+ model.set( SELECTION_KEY, -1 ); // TODO : do on client
}
private void attachClientListener() {
diff --git a/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/Model.java b/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/Model.java
index c7d7b2c..12b02f7 100644
--- a/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/Model.java
+++ b/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/Model.java
@@ -77,21 +77,6 @@
}
}
- public void notify( String event ) {
- notify( event, null );
- }
-
- public void notify( String event, JsonObject properties ) {
- notifyInternal( event, properties );
- JsonObject callProperties = new JsonObject();
- callProperties.add( "event", event );
- if( properties != null ) {
- callProperties.add( "properties", properties );
- }
- callProperties.add( "nosync", true );
- remoteObject.call( "notify", callProperties );
- }
-
public void dispose() {
if( !isDisposed ) {
isDisposed = true;
diff --git a/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/internal/Model_Test.java b/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/internal/Model_Test.java
index 6f80284..f2eac5a 100644
--- a/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/internal/Model_Test.java
+++ b/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/internal/Model_Test.java
@@ -10,12 +10,15 @@
******************************************************************************/
package org.eclipse.rap.addons.dropdown.internal;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -305,50 +308,5 @@
verify( listener, times( 1 ) ).handleEvent( any( JsonObject.class ) );
}
- @Test
- public void testNotify_CallServerListenerHandleEvent() {
- ModelListener listener = mock( ModelListener.class );
- model.addListener( "foo", listener );
- JsonObject argument = mock( JsonObject.class );
-
- model.notify( "foo", argument );
-
- verify( listener ).handleEvent( eq( argument ) );
- }
-
- @Test
- public void testNotify_CallServerWithourProperties() {
- ModelListener listener = mock( ModelListener.class );
- model.addListener( "foo", listener );
-
- model.notify( "foo" );
-
- verify( listener ).handleEvent( isNull( JsonObject.class ) );
- }
-
- @Test
- public void testNotify_RenderCallNotify() {
- JsonObject argument = new JsonObject();
- argument.add( "arg", "value" );
-
- model.notify( "foo", argument );
-
- JsonObject expected = new JsonObject();
- expected.add( "event", "foo" );
- expected.add( "properties", argument );
- expected.add( "nosync", true );
- verify( remoteObject ).call( eq( "notify" ), eq( expected ) );
- }
-
- @Test
- public void testNotify_RenderCallNotifyWithoutProperties() {
- model.notify( "foo" );
-
- JsonObject expected = new JsonObject();
- expected.add( "event", "foo" );
- expected.add( "nosync", true );
- verify( remoteObject ).call( eq( "notify" ), eq( expected ) );
- }
-
}
diff --git a/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer_Test.java b/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer_Test.java
index 615ff91..e14e4c1 100644
--- a/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer_Test.java
+++ b/tests/org.eclipse.rap.addons.dropdown.test/src/org/eclipse/rap/addons/dropdown/viewer/DropDownViewer_Test.java
@@ -48,7 +48,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.*;
import org.junit.*;
-import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -242,18 +241,6 @@
}
@Test
- public void testSetInput_RendersNotifyRefresh() {
- createViewer();
- reset( remoteObject );
-
- viewer.setInput( INTEGER_LIST );
-
- ArgumentCaptor<JsonObject> capture = ArgumentCaptor.forClass( JsonObject.class );
- verify( remoteObject ).call( eq( "notify" ), capture.capture() );
- assertEquals( "refresh", capture.getValue().get( "event" ).asString() );
- }
-
- @Test
public void testSetLabelProvide_UpdatesElements() {
createViewer();
