[kune-commits] r778 - in trunk: . script src/main/java/org/ourproject/kune/platf/client/app src/main/java/org/ourproject/kune/platf/client/rpc

[vjrj]

Author: vjrj
Date: 2008-06-11 21:30:30 +0200 (Wed, 11 Jun 2008)
New Revision: 778

Modified:
   trunk/
   trunk/script/copy_deploy.sh
   trunk/script/css-update.sh
   trunk/script/deploy_gwt.sh
   trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationBuilder.java
   trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java
Log:



Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml

.gwt-tmp

   + client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml
.gwt-tmp
target-eclipse


Modified: trunk/script/copy_deploy.sh
===================================================================
--- trunk/script/copy_deploy.sh	2008-06-10 08:54:46 UTC (rev 777)
+++ trunk/script/copy_deploy.sh	2008-06-11 19:30:30 UTC (rev 778)
@@ -4,4 +4,4 @@
 script/css-update.sh
 
 rm src/main/webapp/gwt/org.ourproject.kune.app.Kune/ -R
-cp target/org.ourproject.kune-0.0.4/org.ourproject.kune.app.Kune/ src/main/webapp/gwt/ -R
+cp target/kune-0.0.4/org.ourproject.kune.app.Kune/ src/main/webapp/gwt/ -R

Modified: trunk/script/css-update.sh
===================================================================
--- trunk/script/css-update.sh	2008-06-10 08:54:46 UTC (rev 777)
+++ trunk/script/css-update.sh	2008-06-11 19:30:30 UTC (rev 778)
@@ -1,7 +1,7 @@
 #!/bin/bash
 APPPUB=src/main/java/org/ourproject/kune/app/public
 WEBAPP=src/main/webapp/gwt/org.ourproject.kune.app.Kune
-TARGET=target/org.ourproject.kune-0.0.4/org.ourproject.kune.app.Kune
+TARGET=target/kune-0.0.4/org.ourproject.kune.app.Kune
 
 $PWD/script/css-compact-and-tidy.css
 

Modified: trunk/script/deploy_gwt.sh
===================================================================
--- trunk/script/deploy_gwt.sh	2008-06-10 08:54:46 UTC (rev 777)
+++ trunk/script/deploy_gwt.sh	2008-06-11 19:30:30 UTC (rev 778)
@@ -1,7 +1,7 @@
 #!/bin/bash
-find target/org.ourproject.kune-0.0.4/org.ourproject.kune.app.Kune/ -name .DS_Store -exec rm {} \;
+find target/kune-0.0.4/org.ourproject.kune.app.Kune/ -name .DS_Store -exec rm {} \;
 
 #script/css-compact-and-tidy.css
 script/css-update.sh
 
-unison -silent -batch -auto -ui text target/org.ourproject.kune-0.0.4/org.ourproject.kune.app.Kune src/main/webapp/gwt/org.ourproject.kune.app.Kune
+unison -silent -batch -auto -ui text target/kune-0.0.4/org.ourproject.kune.app.Kune src/main/webapp/gwt/org.ourproject.kune.app.Kune

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationBuilder.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationBuilder.java	2008-06-10 08:54:46 UTC (rev 777)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationBuilder.java	2008-06-11 19:30:30 UTC (rev 778)
@@ -31,7 +31,9 @@
 import org.ourproject.kune.platf.client.dispatch.ActionEvent;
 import org.ourproject.kune.platf.client.dispatch.DefaultDispatcher;
 import org.ourproject.kune.platf.client.dto.I18nLanguageDTO;
+import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
 import org.ourproject.kune.platf.client.services.Kune;
+import org.ourproject.kune.platf.client.services.KuneErrorHandler;
 import org.ourproject.kune.platf.client.services.KuneModule;
 import org.ourproject.kune.platf.client.state.Session;
 import org.ourproject.kune.platf.client.state.StateManager;
@@ -49,46 +51,50 @@
     }
 
     public void build(final I18nLanguageDTO initialLang, final HashMap<String, String> lexicon) {
-        final Kune kune = Kune.create(new KuneModule(initialLang, lexicon), new EmiteUIModule(),
-                new DocumentClientNewModule(), new ChatClientNewModule());
-        final Session session = kune.getSession();
+	final Kune kune = Kune.create(new KuneModule(initialLang, lexicon), new EmiteUIModule(),
+		new DocumentClientNewModule(), new ChatClientNewModule());
 
-        Site.showProgressLoading();
-        Site.mask();
+	KuneErrorHandler errorHandler = kune.getInstance(KuneErrorHandler.class);
+	AsyncCallbackSimple.init(errorHandler);
 
-        final KunePlatform platform = kune.getPlatform();
-        final StateManager stateManager = kune.getStateManager();
-        final Application application = kune.getInstance(Application.class);
-        I18nUITranslationService i18n = kune.getI18N();
+	final Session session = kune.getSession();
 
-        // Testing providers:
-        platform.install(new PlatformClientModule(session, kune.getProvider(StateManager.class)));
-        platform.install(new WorkspaceClientModule(session, stateManager, application.getWorkspace(), i18n));
+	Site.showProgressLoading();
+	Site.mask();
 
-        final DefaultDispatcher dispatcher = DefaultDispatcher.getInstance();
+	final KunePlatform platform = kune.getPlatform();
+	final StateManager stateManager = kune.getStateManager();
+	final Application application = kune.getInstance(Application.class);
+	I18nUITranslationService i18n = kune.getI18N();
 
-        application.init(dispatcher, stateManager, platform.getIndexedTools());
-        subscribeActions(dispatcher, platform.getActions());
+	// Testing providers:
+	platform.install(new PlatformClientModule(session, kune.getProvider(StateManager.class)));
+	platform.install(new WorkspaceClientModule(session, stateManager, application.getWorkspace(), i18n));
 
-        Window.addWindowCloseListener(new WindowCloseListener() {
-            public void onWindowClosed() {
-                application.stop();
-            }
+	final DefaultDispatcher dispatcher = DefaultDispatcher.getInstance();
 
-            public String onWindowClosing() {
-                return null;
-            }
-        });
-        application.start();
+	application.init(dispatcher, stateManager, platform.getIndexedTools());
+	subscribeActions(dispatcher, platform.getActions());
+
+	Window.addWindowCloseListener(new WindowCloseListener() {
+	    public void onWindowClosed() {
+		application.stop();
+	    }
+
+	    public String onWindowClosing() {
+		return null;
+	    }
+	});
+	application.start();
     }
 
     private void subscribeActions(final DefaultDispatcher dispatcher, final ArrayList<ActionEvent<?>> actions) {
-        ActionEvent<?> actionEvent;
+	ActionEvent<?> actionEvent;
 
-        for (final Iterator<ActionEvent<?>> it = actions.iterator(); it.hasNext();) {
-            actionEvent = it.next();
-            dispatcher.subscribe(actionEvent.event, actionEvent.action);
-        }
+	for (final Iterator<ActionEvent<?>> it = actions.iterator(); it.hasNext();) {
+	    actionEvent = it.next();
+	    dispatcher.subscribe(actionEvent.event, actionEvent.action);
+	}
     }
 
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java	2008-06-10 08:54:46 UTC (rev 777)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java	2008-06-11 19:30:30 UTC (rev 778)
@@ -25,8 +25,14 @@
 
 public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> {
 
+    private static KuneErrorHandler errorHandler;
+
+    public static void init(KuneErrorHandler kuneErrorHandler) {
+	errorHandler = kuneErrorHandler;
+    }
+
     public void onFailure(final Throwable caught) {
-        KuneErrorHandler.getInstance().process(caught);
+	errorHandler.process(caught);
     }
 
 }