From 6f9ee71f15244fac01a9a271481f1686ae545080 Mon Sep 17 00:00:00 2001 From: Ivan Furnadjiev Date: Wed, 15 Aug 2018 14:55:37 +0300 Subject: [PATCH] Add StartupParameters client service Change-Id: I8d739cdc71f3a3f0606fbb130bb35aab5181cfac --- .../tabris/internal/TabrisClientImplTest.java | 20 +++++++++++++++++++ .../tabris/internal/TabrisClientImpl.java | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/com.eclipsesource.tabris.test/src/com/eclipsesource/tabris/internal/TabrisClientImplTest.java b/com.eclipsesource.tabris.test/src/com/eclipsesource/tabris/internal/TabrisClientImplTest.java index 1bdd06d..f388cb8 100644 --- a/com.eclipsesource.tabris.test/src/com/eclipsesource/tabris/internal/TabrisClientImplTest.java +++ b/com.eclipsesource.tabris.test/src/com/eclipsesource/tabris/internal/TabrisClientImplTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertSame; import org.eclipse.rap.rwt.client.service.ClientInfo; +import org.eclipse.rap.rwt.client.service.StartupParameters; import org.junit.Rule; import org.junit.Test; @@ -219,4 +220,23 @@ public void testPrintServiceIsSingleton() { assertSame( print1, print2 ); } + @Test + public void testHasStartupParametersService() { + TabrisClient client = new TabrisClientImpl(); + + StartupParameters service = client.getService( StartupParameters.class ); + + assertNotNull( service ); + } + + @Test + public void testStartupParametersIsSingleton() { + TabrisClient client = new TabrisClientImpl(); + + StartupParameters service1 = client.getService( StartupParameters.class ); + StartupParameters service2 = client.getService( StartupParameters.class ); + + assertSame( service1, service2 ); + } + } diff --git a/com.eclipsesource.tabris/src/com/eclipsesource/tabris/internal/TabrisClientImpl.java b/com.eclipsesource.tabris/src/com/eclipsesource/tabris/internal/TabrisClientImpl.java index 3a7577f..658d5fe 100644 --- a/com.eclipsesource.tabris/src/com/eclipsesource/tabris/internal/TabrisClientImpl.java +++ b/com.eclipsesource.tabris/src/com/eclipsesource/tabris/internal/TabrisClientImpl.java @@ -14,6 +14,8 @@ import org.eclipse.rap.rwt.client.service.ClientInfo; import org.eclipse.rap.rwt.client.service.ClientService; +import org.eclipse.rap.rwt.client.service.StartupParameters; +import org.eclipse.rap.rwt.internal.client.StartupParametersImpl; import com.eclipsesource.tabris.ClientStore; import com.eclipsesource.tabris.TabrisClient; @@ -27,6 +29,7 @@ import com.eclipsesource.tabris.push.CloudPush; +@SuppressWarnings("restriction") public class TabrisClientImpl implements TabrisClient { public TabrisClientImpl() { @@ -38,6 +41,7 @@ private void initializeServices() { getService( App.class ); getService( ClientStore.class ); getService( CloudPush.class ); + getService( StartupParameters.class ); DataWhitelist.register(); } @@ -63,6 +67,8 @@ public T getService( Class type ) { result = ( T )getSessionInstance( GeolocationImpl.class ); } else if( type == Printer.class ) { result = ( T )getSessionInstance( PrinterImpl.class ); + } else if( type == StartupParameters.class ) { + result = ( T )getSessionInstance( StartupParametersImpl.class ); } return result; }