Update to latest RWT and UI platform version

tmitter.admin.console/OSGI-INF/ConsoleTab.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="ConsoleTab">
-   <implementation class="tmitter.admin.console.ConsoleTab"/>
+   <implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
+   <property name="class" type="String" value="tmitter.admin.console.ConsoleTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.admin.user/OSGI-INF/ManageUsersTab.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="ManageUsersTab">
-   <implementation class="tmitter.admin.user.ManageUsersTab"/>
+  <implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
    <reference bind="setServiceProvider" cardinality="1..1" interface="com.codeaffine.example.rwt.osgi.ui.platform.ServiceProvider" name="ServiceProvider" policy="static"/>
+   <property name="class" type="String" value="tmitter.admin.user.ManageUsersTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.mobile.ui/src/tmitter/mobile/ui/UIEntryPoint.java

@@ -62,11 +62,6 @@ public void widgetDefaultSelected( SelectionEvent e ) {
       }
     } );
     shell.open();
-    while( !shell.isDisposed() ) {
-      if( !display.readAndDispatch() )
-        display.sleep();
-    }
-    display.dispose();
     return 0;
   }
 

tmitter.ui.add/OSGI-INF/AddTmeetTab.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="AddTmeetTab">
-   <implementation class="tmitter.ui.add.AddTmeetTab"/>
+<implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
    <reference bind="setServiceProvider" cardinality="1..1" interface="com.codeaffine.example.rwt.osgi.ui.platform.ServiceProvider" name="ServiceProvider" policy="static"/>
+   <property name="class" type="String" value="tmitter.ui.add.AddTmeetTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.ui.find/OSGI-INF/FindTab.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="FindTab">
-   <implementation class="tmitter.ui.find.FindTab"/>
+   <implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
    <reference bind="setServiceProvider" cardinality="1..1" interface="com.codeaffine.example.rwt.osgi.ui.platform.ServiceProvider" name="ServiceProvider" policy="static"/>
+   <property name="class" type="String" value="tmitter.ui.find.FindTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.ui.mentions/OSGI-INF/MentionsTab.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="MentionsTab">
-   <implementation class="tmitter.ui.mentions.MentionsTab"/>
+   <implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
    <reference bind="setServiceProvider" cardinality="1..1" interface="com.codeaffine.example.rwt.osgi.ui.platform.ServiceProvider" name="ServiceProvider" policy="static"/>
+   <property name="class" type="String" value="tmitter.ui.mentions.MentionsTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.ui/OSGI-INF/PublicTimeLineTab.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="PublicTimeLineTab">
-   <implementation class="tmitter.ui.PublicTimeLineTab"/>
+<implementation class="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    <service>
-      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributor"/>
+      <provide interface="com.codeaffine.example.rwt.osgi.ui.platform.UIContributorFactory"/>
    </service>
    <reference bind="setServiceProvider" cardinality="1..1" interface="com.codeaffine.example.rwt.osgi.ui.platform.ServiceProvider" name="ServiceProvider" policy="static"/>
+   <property name="class" type="String" value="tmitter.ui.PublicTimeLineTab"/>
    <property name="type" type="String" value="page"/>
 </scr:component>

tmitter.ui/TmitterUI OSGi.launch

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/TmitterUI OSGi"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=10050&#13;&#10;-Dorg.eclipse.equinox.http.jetty.autostart=false&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.google.gson@default:default,javax.servlet*2.5.0.v201103041518@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="com.codeaffine.example.rwt.osgi.configurationadmin@default:default,com.codeaffine.example.rwt.osgi.ui.platform@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,tmitter.admin.console@default:default,tmitter.admin.user@default:default,tmitter.mobile.ui@default:default,tmitter.model@default:default,tmitter.ui.add@default:default,tmitter.ui.find@default:default,tmitter.ui.mentions@default:default,tmitter.ui@default:default"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/TmitterUI OSGi"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<intAttribute key="default_start_level" value="4"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=10050&#13;&#10;-Dorg.eclipse.equinox.http.jetty.autostart=false&#13;&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="target_bundles" value="com.google.gson@default:default,javax.servlet@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<stringAttribute key="workspace_bundles" value="com.codeaffine.example.rwt.osgi.configurationadmin@default:default,com.codeaffine.example.rwt.osgi.ui.platform@default:default,tmitter.admin.console@default:default,tmitter.admin.user@default:default,tmitter.mobile.ui@default:default,tmitter.model@default:default,tmitter.ui.add@default:default,tmitter.ui.find@default:default,tmitter.ui.mentions@default:default,tmitter.ui@default:default"/>
+</launchConfiguration>

tmitter.ui/src/tmitter/ui/RegistrationPanel.java

@@ -1,6 +1,8 @@
 package tmitter.ui;
 
 import org.eclipse.rwt.lifecycle.WidgetUtil;
+import org.eclipse.rwt.widgets.DialogCallback;
+import org.eclipse.rwt.widgets.DialogUtil;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -117,7 +119,15 @@ private void signup() {
       MessageBox box = new MessageBox( signupShell, SWT.ICON_ERROR | SWT.OK );
       box.setText( "Error during sign up" );
       box.setMessage( "Groar, your name is allready taken. Try another one..." );
-      box.open();
+      DialogUtil.open( box, new DialogCallback() {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public void dialogClosed( int returnCode ) {
+          // TODO Auto-generated method stub
+        }
+      } );
     } else {
       MonsterUtil.saveMonster( monster );
       signupShell.close();

tmitter.ui/src/tmitter/ui/UIEntryPoint.java

@@ -23,7 +23,6 @@ public int createUI() {
     initializeServiceProvider();
     configureShell();
     openShell();
-    spinReadAndDispatch();
     return 0;
   }
 
@@ -57,13 +56,4 @@ private void getServiceProvider() {
   private void openShell() {
     shell.open();
   }
-
-  private void spinReadAndDispatch() {
-    Display display = shell.getDisplay();
-    while( !shell.isDisposed() ) {
-      if( !display.readAndDispatch() ) {
-        display.sleep();
-      }
-    }
-  }
 }