Author: vjrj_ Date: 2010-12-08 16:21:36 +0100 (Wed, 08 Dec 2010) New Revision: 1160 Added: trunk/img/template-gen.svg trunk/src/main/java/cc/ trunk/src/main/java/cc/kune/ trunk/src/main/java/cc/kune/core/ trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/ws/ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreView.java trunk/src/main/java/cc/kune/core/public/ trunk/src/main/java/cc/kune/core/public/favicon.ico trunk/src/main/java/cc/kune/core/public/ws.html Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css trunk/src/main/java/org/ourproject/kune/app/public/ws.html trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java trunk/war/WEB-INF/web.xml Log: CLOSED - # 5: Guin and MVC4p integration http://kune.ourproject.org/issues/ticket/5 CLOSED - # 4: Gwt 2.1.0 and mvn cleanup http://kune.ourproject.org/issues/ticket/4 Added: trunk/img/template-gen.svg =================================================================== --- trunk/img/template-gen.svg (rev 0) +++ trunk/img/template-gen.svg 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1052.3622" + height="744.09448" + id="svg2" + version="1.1" + inkscape:version="0.48.0 r9654" + sodipodi:docname="template-gen.svg"> + <defs + id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient3262"> + <stop + style="stop-color:#b3b3b3;stop-opacity:1;" + offset="0" + id="stop3264" /> + <stop + style="stop-color:#b3b3b3;stop-opacity:0;" + offset="1" + id="stop3266" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3268" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3272" + gradientUnits="userSpaceOnUse" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" + gradientTransform="translate(0,358.2677)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3276" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,408.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3280" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,458.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3284" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,508.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="554.16978" + inkscape:cy="358.47397" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1280" + inkscape:window-height="975" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-308.2677)"> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3192" + width="621.91388" + height="676.81635" + x="209.6339" + y="336.8118" + ry="0" /> + <rect + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3198" + width="621" + height="31" + x="210" + y="29.094482" + transform="translate(0,308.2677)" /> + <text + xml:space="preserve" + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold" + x="220" + y="358.36218" + id="text3194" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3196" + x="220" + y="358.36218">Preview</tspan></text> + <rect + y="-1013.2306" + x="-187.341" + height="676.41876" + width="174.69496" + id="rect3206" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3208" + width="6.9878192" + height="676.41876" + x="-209.63385" + y="-1013.2306" + transform="scale(-1,-1)" /> + <g + id="g3256"> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3210" + width="15.373183" + height="676.41876" + x="-202.0193" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3212" + width="9.7828979" + height="55.902386" + x="-199.04945" + y="-402.49713" + ry="4.891449" /> + </g> + <path + transform="matrix(-1,0,0,-1,1040.28,1041.7747)" + d="m 836,353.09448 a 1.5,7 0 1 1 -3,0 1.5,7 0 1 1 3,0 z" + sodipodi:ry="7" + sodipodi:rx="1.5" + sodipodi:cy="353.09448" + sodipodi:cx="834.5" + id="path3214" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3228" + width="15.373183" + height="644.41876" + x="-831.01929" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3230" + width="9.7828979" + height="53.257759" + x="-828.04944" + y="-431.38968" + ry="4.891449" /> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3232" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3234" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3236" + width="15.373183" + height="644.41876" + x="-831.01929" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3238" + width="9.7828979" + height="53.257759" + x="-828.04944" + y="-431.38968" + ry="4.891449" /> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3240" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3242" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + <g + id="g3248"> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3244" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3246" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + </g> + <rect + style="color:#000000;fill:url(#linearGradient3268);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3260" + width="168" + height="50" + x="16" + y="31.094482" + transform="translate(0,308.2677)" /> + <rect + y="389.36218" + x="16" + height="50" + width="168" + id="rect3270" + style="color:#000000;fill:url(#linearGradient3272);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:url(#linearGradient3276);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3274" + width="168" + height="50" + x="16" + y="439.36218" /> + <rect + y="489.36218" + x="16" + height="50" + width="168" + id="rect3278" + style="color:#000000;fill:url(#linearGradient3280);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:url(#linearGradient3284);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3282" + width="168" + height="50" + x="16" + y="539.36218" /> + </g> +</svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/pom.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -1,11 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.ourproject</groupId> + <groupId>cc</groupId> <artifactId>kune</artifactId> <packaging>jar</packaging> - <version>0.0.6</version> + <version>0.0.7</version> <description> kune free/open/libre collaboration platform </description> @@ -26,11 +25,15 @@ <version>2.0.1</version> </dependency> <dependency> + <groupId>com.googlecode.gwt.inject</groupId> + <artifactId>gin</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice-servlet</artifactId> <version>2.0.1</version> </dependency> - <!-- GWT dependencies (from maven "central" repo) --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> @@ -43,9 +46,18 @@ <version>${gwtVersion}</version> <scope>provided</scope> </dependency> - <!-- <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> - <version>1.0-beta2</version> </dependency> --> <dependency> + <groupId>com.googlecode.mvp4g</groupId> + <artifactId>mvp4g</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>com.googlecode.mvc4g</groupId> + <artifactId>mvc4g</artifactId> + <version>1.0.0-jboss</version> + </dependency> + <!-- cc --> + <dependency> <groupId>org.cobogw</groupId> <artifactId>gwt</artifactId> <version>1.2.2</version> @@ -70,6 +82,11 @@ <artifactId>gwt-voices</artifactId> <version>1.6.0</version> </dependency> + <dependency> + <groupId>org.ourproject.kune.ws.armor</groupId> + <artifactId>ws-armor</artifactId> + <version>0.0.3</version> + </dependency> <!-- utilities --> <dependency> <groupId>log4j</groupId> @@ -244,22 +261,21 @@ <version>1.7.0.0</version> </dependency> <!-- jetty dependencies --> + <!-- <dependency> --> + <!-- <groupId>org.mortbay.jetty</groupId> --> + <!-- <artifactId>jetty-util</artifactId> --> + <!-- <version>6.1.11</version> --> + <!-- <version>7.0.0.pre5</version> --> + <!-- <scope>provided</scope> --> + <!-- </dependency> --> + <!-- <dependency> --> + <!-- <groupId>org.mortbay.jetty</groupId> --> + <!-- <artifactId>jetty-maven-plugin</artifactId> --> + <!-- <version>7.2.1.v20101111</version> --> + <!-- <artifactId>maven-jetty-plugin</artifactId> <version>6.1.11</version> --> + <!-- <scope>runtime</scope> --> + <!-- </dependency> --> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <!-- <version>6.1.11</version> --> - <version>7.0.0.pre5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.2.1.v20101111</version> - <!-- <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.11</version> --> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> @@ -295,6 +311,7 @@ <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> <version>1.0.3</version> + <!-- <version>0.9.4</version> --> </dependency> <!-- wave --> <dependency> @@ -383,8 +400,23 @@ <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> </repository> </distributionManagement> - <!-- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... --> <pluginRepositories> + <!-- cc --> + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + <!-- cc --> <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> </pluginRepository> --> <pluginRepository> @@ -420,12 +452,26 @@ </releases> </repository> <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.org/maven2</url> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> </repository> <repository> + <id>mvp4g.googlecode.releases</id> + <name>Releases Repository for Mvp4g</name> + <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url> + </repository> + <!-- cc --> + <repository> <id>dyndns-repo</id> <url>http://maven.dyndns.org/2</url> </repository> @@ -440,10 +486,6 @@ <url>http://kune.ourproject.org/mavenrepo/</url> </repository> <repository> - <id>gwtext</id> - <url>http://www.gwt-ext.com/maven2/</url> - </repository> - <repository> <id>google-maven-snapshot-repository</id> <name>Google Maven Snapshot Repository</name> <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> @@ -579,28 +621,15 @@ <wtpversion>2.0</wtpversion> </configuration> </plugin> -<!-- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>exploded</goal> - </goals> - </execution> - </executions> - <configuration> - <webappDirectory>/war</webappDirectory> - </configuration> - </plugin> --> + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>2.1</version> <executions> <execution> <phase>compile</phase> <goals> + <goal>exploded</goal> </goals> </execution> </executions> <configuration> + <webappDirectory>/war</webappDirectory> </configuration> </plugin> --> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <version>7.2.1.v20101111</version> - <!--<artifactId>maven-jetty-plugin</artifactId> - <version>6.1.14</version> --> + <!--<artifactId>maven-jetty-plugin</artifactId> <version>6.1.14</version> --> <configuration> <!-- <contextPath>/</contextPath> --> <!-- <webAppSourceDirectory>${basedir}/target/${project.artifactId}-${version}</webAppSourceDirectory> --> @@ -813,4 +842,4 @@ </dependencies> </profile> </profiles> -</project> +</project> \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> +<module rename-to="ws"> + <inherits name="com.google.gwt.user.User" /> + <!-- excluding test sources for this module workaround for open issue 4454 + see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 --> + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <public path="public" /> + <inherits name='com.mvp4g.Mvp4gModule' /> + <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> + <entry-point class="cc.kune.core.client.KuneEntryPoint" /> + <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> + <!-- <set-property name="user.agent" value="gecko1_8" /> --> + <set-property name="user.agent" value="safari" /> +</module> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/Core.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,20 @@ +package cc.kune.core.client; + +import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.CoreView; + +import com.mvp4g.client.annotation.Debug; +import com.mvp4g.client.annotation.Event; +import com.mvp4g.client.annotation.Events; +import com.mvp4g.client.annotation.Start; +import com.mvp4g.client.event.EventBus; + +@Events(startView = CoreView.class, ginModules = { CoreGinModule.class }) +@Debug +public interface CoreEventBus extends EventBus { + + @Start + @Event(handlers = CorePresenter.class) + void start(); + +} Property changes on: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +package cc.kune.core.client; + +import org.ourproject.kune.ws.armor.client.Body; +import org.ourproject.kune.ws.armor.client.IBody; + +import com.google.gwt.inject.client.AbstractGinModule; +import com.google.inject.Singleton; + +public class CoreGinModule extends AbstractGinModule { + + @Override + protected void configure() { + bind(IBody.class).to(Body.class).in(Singleton.class); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,18 @@ +package cc.kune.core.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.RootLayoutPanel; +import com.google.gwt.user.client.ui.Widget; +import com.mvp4g.client.Mvp4gModule; + +public class KuneEntryPoint implements EntryPoint { + + @Override + public void onModuleLoad() { + final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class); + module.createAndStartModule(); + RootLayoutPanel.get().add((Widget) module.getStartView()); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +package cc.kune.core.client.ws; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.ws.CorePresenter.ICoreView; + +import com.mvp4g.client.annotation.Presenter; +import com.mvp4g.client.presenter.BasePresenter; + +@Presenter(view = CoreView.class) +public class CorePresenter extends BasePresenter<ICoreView, CoreEventBus> { + public interface ICoreView { + } + + public void onStart() { + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,19 @@ +package cc.kune.core.client.ws; + +import org.ourproject.kune.ws.armor.client.Body; +import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; + +import cc.kune.core.client.ws.CorePresenter.ICoreView; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Composite; +import com.google.inject.Inject; + +public class CoreView extends Composite implements ICoreView { + + @Inject + public CoreView(final Body body) { + GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); + initWidget(body); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/public/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html (rev 0) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,13 @@ +<!doctype html> +<html> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<title>Kune</title> +<script type="text/javascript" language="javascript" + src="/ws/ws.nocache.js"></script> +</head> +<body> +<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> +<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> +</body> +</html> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/public/ws.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -1,5 +1,5 @@ <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> -<module rename-to="ws"> +<module rename-to="wsold"> <inherits name="com.google.gwt.i18n.I18N" /> <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.resources.Resources" /> @@ -42,6 +42,7 @@ <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> <set-property name="user.agent" value="gecko1_8" /> <inherits name="com.google.gwt.wave.Wave" /> + <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> <!-- Specify the app entry point class. --> <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> <!-- excluding test sources for this module workaround for open issue 4454 Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -19,29 +19,23 @@ */ package org.ourproject.kune.app.client; -import org.ourproject.kune.blogs.client.BlogClientModule; -import org.ourproject.kune.chat.client.ChatClientModule; -import org.ourproject.kune.docs.client.DocumentClientModule; -import org.ourproject.kune.gallery.client.GalleryClientModule; import org.ourproject.kune.platf.client.services.Loader; import org.ourproject.kune.platf.client.services.PlatformModule; -import org.ourproject.kune.wiki.client.WikiClientModule; -import org.ourproject.kune.workspace.client.RegistryModule; -import org.ourproject.kune.workspace.client.WorkspaceModule; -import org.ourproject.kune.workspace.client.hello.HelloWorldModule; +import org.ourproject.kune.ws.armor.client.Body; +import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.emiteuimodule.client.EmiteUIModule; import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.user.client.ui.RootLayoutPanel; public class KuneEntryPoint implements EntryPoint { public void onModuleLoad() { Log.setUncaughtExceptionHandler(); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { onModuleLoadCont(); } @@ -51,14 +45,20 @@ public void onModuleLoadCont() { // At the moment, in runtime: Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); + final WsArmorResources resources = WsArmorResources.INSTANCE; + resources.style().ensureInjected(); -// Loader.install(new RegistryModule(), new DocumentClientModule(), new BlogClientModule(), -// new WikiClientModule(), new GalleryClientModule(), new EmiteUIModule(), new ChatClientModule(), -// new WorkspaceModule(), new PlatformModule()); + final Body body = new Body(); + RootLayoutPanel.get().add(body); + // Loader.install(new RegistryModule(), new DocumentClientModule(), new + // BlogClientModule(), + // new WikiClientModule(), new GalleryClientModule(), new + // EmiteUIModule(), new ChatClientModule(), + // new WorkspaceModule(), new PlatformModule()); - Loader.install(new RegistryModule(), new PlatformModule()); + Loader.install(new PlatformModule()); // We install our HelloWorldModule - Loader.install(new HelloWorldModule()); + // Loader.install(new HelloWorldModule()); } } Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css 2010-12-08 15:21:36 UTC (rev 1160) @@ -1,7 +1,7 @@ .kunebody { background-color: #FFF; color: #000; - font-family: arial, sans; + font-family: 'Droid Sans', arial, sans; margin: 5px 5px 0 5px; } Modified: trunk/src/main/java/org/ourproject/kune/app/public/ws.html =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/ws.html 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/app/public/ws.html 2010-12-08 15:21:36 UTC (rev 1160) @@ -17,6 +17,8 @@ <link rel="stylesheet" type="text/css" href="css/docs.css"> --> +<link href="//fonts.googleapis.com/css?family=Droid+Sans:regular,bold" + rel="stylesheet" type="text/css"> <link rel="shortcut icon" href="images/favicon.ico" /> <title>Kune</title> <style type="text/css"> @@ -26,59 +28,64 @@ top: 0px; width: 100%; height: 100%; - background-color: #FFF; + background-color: #F2F2F2; z-index: 9999; } #kuneprogresspanel { - position: absolute; - top: 2px; - <!-- left: 2px; --> - z-index: 9998; + position: absolute; + top: 2px; + z-index: 9998; } .kune-Progress { - background: #E5FF80; - border: 1px solid #E5FF80; - white-space: nowrap; - height: 16px; - padding: 0 3px; + background: #E5FF80; + border: 1px solid #E5FF80; + white-space: nowrap; + height: 16px; + padding: 0 3px; } +#kuneprogresspanel { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} + #kuneprogresstext { - font-family: arial, helvetica, clean, sans-serif; - font-size-adjust: none; - font-style: normal; - font-variant: normal; - font-weight: normal; - line-height: 1.22; + font-family: 'Droid Sans', arial, helvetica, clean, sans-serif; + font-size-adjust: none; + font-style: normal; + font-variant: normal; + font-weight: normal; + line-height: 1.22; } #kuneloading { - position: absolute; - left: 45%; - top: 40%; - padding: 0px; - z-index: 20001; - height: auto; - border: 1px solid #ccc; + position: absolute; + left: 45%; + top: 40%; + padding: 0px; + z-index: 20001; + height: auto; + border: 1px solid #ccc; } #kuneloading a { - color: #225588; + color: #225588; } #kuneloading .kuneloading-indicator { - background: white; - color: #444; - font: bold 13px tahoma, arial, helvetica; - padding: 5px 5px 10px 5px; - margin: 0; - height: auto; + background: white; + color: #444; + font: bold 13px 'Droid Sans', tahoma, arial, helvetica; + padding: 5px 5px 10px 5px; + margin: 0; + height: auto; } #kuneloading-msg { - font: normal 10px arial, tahoma, sans-serif; + font: normal 10px 'Droid Sans', arial, tahoma, sans-serif; } </style> <!--[if lt IE 7.]> @@ -88,58 +95,46 @@ </head> <body> <script type="text/javascript" language="javascript" - src="/ws/ws.nocache.js"></script> + src="/ws/ws.nocache.js"></script> -<!-- Ext localization javascript --> -<script type="text/javascript" id="extlocale"></script> -<script type="text/javascript"> - - // decode language passed in url - var locale = window.location.search - ? Ext.urlDecode(window.location.search.substring(1)).locale - : '' - ; - // append locale script to the head - var head = Ext.fly(document.getElementsByTagName('head')[0]); - if(locale) { - Ext.fly('extlocale').set({src:'js/ext/source/locale/ext-lang-' + locale + '.js'}); - } -</script> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> <div id="kuneinitialcurtain"></div> <div class="" id="kuneprogresspanel" style=""> <table cellspacing="0" cellpadding="0" border="0" - style="margin-top: 5px; margin-left: 5px;" - summary="Starting"> - <tbody> - <tr> - <td height="16" align="left" class="kune-Progress" - style="vertical-align: top;"><img - style="height: 16px; width: 16px;" - src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> - <td align="left" class="kune-Progress" style="vertical-align: top;"> - <div id="kuneprogresstext" class="gwt-Label">Loading</div> - </td> - <td height="16" width="100%" align="left" - style="vertical-align: top;" /> - </tr> - </tbody> + style="margin-top: 5px; margin-left: 5px;" summary="Starting"> + <tbody> + <tr> + <td height="16" align="left" class="kune-Progress" + style="vertical-align: top;"><img + style="height: 16px; width: 16px;" + src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> + <td align="left" class="kune-Progress" style="vertical-align: top;"> + <div id="kuneprogresstext" class="gwt-Label">Loading</div> + </td> + <td height="16" width="100%" align="left" + style="vertical-align: top;" /> + </tr> + </tbody> </table> </div> <div id="kuneloading"> - <div class="kuneloading-indicator"> - <img src="images/kune-anim.gif" width="35" height="35" alt="kune-loading" - style="margin-right:3px;float:left;vertical-align:top;"/>kune <br/> - <span id="kuneloading-msg">Starting...</span></div> +<div class="kuneloading-indicator"><img src="images/kune-anim.gif" + width="35" height="35" alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune <br /> +<span id="kuneloading-msg">Starting...</span></div> </div> <!--include the Ext CSS, and use the gray theme--> -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Loading ...';</script> +<script type="text/javascript"> + document.getElementById('kuneloading-msg').innerHTML = 'Loading ...'; +</script> <!--include the application JS--> -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Starting...';</script> +<script type="text/javascript"> + document.getElementById('kuneloading-msg').innerHTML = 'Starting...'; +</script> <!--hide loading message--> <!-- <script type="text/javascript">Ext.get('loading').fadeOut({remove: true, duration:4});</script> --> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -52,8 +52,8 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; import com.gwtext.client.core.EventObject; @@ -171,7 +171,7 @@ + chatOptions.userOptions.getUserJid().getNode()); final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); if (subject != null) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); if (roomUI != null) { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -24,8 +24,8 @@ import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.form.Field; import com.gwtext.client.widgets.form.FormPanel; @@ -78,7 +78,7 @@ protected void doAddRoom() { roomName.validate(); if (formPanel.getForm().isValid()) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.addRoom(roomName.getValueAsString()); reset(); @@ -108,7 +108,7 @@ dialog.add(formPanel); roomName.addListener(new FieldListenerAdapter() { @Override - public void onSpecialKey(Field field, EventObject e) { + public void onSpecialKey(final Field field, final EventObject e) { if (e.getKey() == 13) { doAddRoom(); } Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -27,10 +27,10 @@ import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.FlowPanel; public class GalleryFolderContentPanel extends FoldableContentPanel implements GalleryFolderContentView { @@ -48,7 +48,7 @@ } public void addThumb(final StateToken token, final String title, final String imgUrl) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, new ClickHandler() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -22,8 +22,8 @@ import java.util.HashMap; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.menu.BaseItem; import com.gwtext.client.widgets.menu.Item; @@ -43,7 +43,7 @@ public void createItemMenu(final String id, final ActionItemCollection<T> actionCollection, final Listener<ActionItem<T>> listener) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { Menu menu = null; if (actionCollection != null) { @@ -69,7 +69,7 @@ }); } - public Menu get(String id) { + public Menu get(final String id) { return contextMenus.get(id); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -30,8 +30,8 @@ import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; @@ -90,7 +90,7 @@ public void onSuccess(final InitDataDTO initData) { session.setInitData(initData); session.setCurrentUserInfo(initData.getUserInfo()); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { RootPanel.get("kuneinitialcurtain").setVisible(false); RootPanel.get("kuneloading").setVisible(false); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -45,8 +45,8 @@ import org.ourproject.kune.platf.client.ui.MenuItem; import org.ourproject.kune.platf.client.ui.MenuItemCollection; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.menu.BaseItem; import com.gwtext.client.widgets.menu.Item; @@ -74,8 +74,9 @@ item.setIcon(menuItem.getIcon()); menu.addItem(item); item.addListener(new BaseItemListenerAdapter() { + @Override public void onClick(final BaseItem item, final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { menuItem.fire(param); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -26,6 +26,8 @@ import org.xwiki.gwt.dom.client.Selection; import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Node; import com.google.gwt.event.dom.client.BlurEvent; @@ -33,9 +35,7 @@ import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Composite; @@ -381,7 +381,7 @@ } public void showLinkCtxMenu() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(rta); if (selectedAnchor != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -15,36 +15,36 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; /** * Old Mozilla-specific implementation of rich-text editing. */ public class RichTextAreaImplOldMozilla extends RichTextAreaImplMozilla { - /** - * The content window cannot be focused immediately after the content window - * has been loaded, so we need to wait for an additional deferred command. - */ - @Override - protected void onElementInitialized() { - DeferredCommand.addCommand(new Command() { - public void execute() { - RichTextAreaImplOldMozilla.super.onElementInitialized(); - } - }); - } + /** + * The content window cannot be focused immediately after the content window + * has been loaded, so we need to wait for an additional deferred command. + */ + @Override + protected void onElementInitialized() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + public void execute() { + RichTextAreaImplOldMozilla.super.onElementInitialized(); + } + }); + } - @Override - protected void setFirstFocusImpl() { - setFocusImpl(true); - } + @Override + protected void setFirstFocusImpl() { + setFocusImpl(true); + } - @Override - protected void setFocusImpl(boolean focused) { - // Old Mozilla does not support blur on the content window of an iframe. - if (focused) { - super.setFocusImpl(focused); + @Override + protected void setFocusImpl(final boolean focused) { + // Old Mozilla does not support blur on the content window of an iframe. + if (focused) { + super.setFocusImpl(focused); + } } - } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -4,8 +4,8 @@ import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Label; import com.gwtext.client.core.EventCallback; @@ -71,7 +71,7 @@ } public void setPreviewUrl(final String url) { - Frame previewFrame = new Frame(url); + final Frame previewFrame = new Frame(url); previewPanel.clear(); previewPanel.add(previewFrame); previewPanel.doLayout(); @@ -83,7 +83,7 @@ } private void refreshPreview() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onPreview(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -5,8 +5,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogView; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventCallback; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Component; @@ -58,7 +58,7 @@ textField.addKeyPressListener(new EventCallback() { public void execute(final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onTextFieldChanged(textField.getRawValue()); } @@ -68,7 +68,7 @@ onOverField.addKeyPressListener(new EventCallback() { public void execute(final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onOverFieldChanged(onOverField.getRawValue()); } @@ -86,13 +86,13 @@ super.addListener(new FormPanelListenerAdapter() { @Override public void onActivate(final Panel panel) { - LinkInfo linkInfo = presenter.getLinkInfo(); + final LinkInfo linkInfo = presenter.getLinkInfo(); updateValues(linkInfo); presenter.onActivate(); } }); - FieldSet advanced = new FieldSet(Resources.i18n.t("More options")); + final FieldSet advanced = new FieldSet(Resources.i18n.t("More options")); advanced.setCollapsible(true); advanced.setCollapsed(true); advanced.setAutoHeight(true); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -7,8 +7,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView; import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventCallback; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Position; @@ -32,7 +32,7 @@ form.setAutoWidth(true); form.setHeight(InsertSpecialCharDialogView.HEIGHT - 10); - Label label = new Label(); + final Label label = new Label(); label.setHtml(i18n.t("If you know a special character's [%s] value, enter it below.", TextUtils.generateHtmlLink("http://unicode.org/charts/", "Unicode")) + "<br/><br/>"); @@ -65,7 +65,7 @@ form.add(inputUnicodeField); form.add(previewField); - Button insert = new Button(i18n.t("Insert character")); + final Button insert = new Button(i18n.t("Insert character")); insert.addListener(new ButtonListenerAdapter() { @Override @@ -84,14 +84,14 @@ private char getCharEntered() { try { return (char) Integer.valueOf(inputUnicodeField.getRawValue()).intValue(); - } catch (Exception except) { + } catch (final Exception except) { Log.debug("Not possible to cast utf8 int to char"); } return '?'; } private void refreshPreview() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { previewField.setValue("" + getCharEntered()); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -20,8 +20,8 @@ package org.ourproject.kune.platf.client.utils; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; /** * The Class DeferredCommandWrapper is a wrapper of the GWT DeferredCommand @@ -36,7 +36,7 @@ * the listener */ public void addCommand(final Listener0 command) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { command.onEvent(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.platf.client.utils; -import com.google.gwt.user.client.DeferredCommand; -import com.google.gwt.user.client.IncrementalCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.user.client.ui.Image; public class PrefetchUtilities { public static void doTasksDeferred() { - DeferredCommand.addCommand(new IncrementalCommand() { + Scheduler.get().scheduleIncremental(new RepeatingCommand() { int i = 0; int j = 0; @@ -66,7 +66,7 @@ j++; } - boolean notFinished = i + j < lic.length + ext.length; + final boolean notFinished = i + j < lic.length + ext.length; final boolean finished = !notFinished; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -5,8 +5,8 @@ import org.ourproject.kune.platf.client.services.SearcherConstants; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.Connection; import com.gwtext.client.core.Template; import com.gwtext.client.core.UrlParam; @@ -31,7 +31,7 @@ public AbstractLiveSearcherField(final I18nTranslationService i18n, final String templateText, final String dataProxyUrl, final Listener<LinkDTO> listener) { - DataProxy dataProxy = new HttpProxy(dataProxyUrl, Connection.POST); + final DataProxy dataProxy = new HttpProxy(dataProxyUrl, Connection.POST); final JsonReader reader = new JsonReader(new RecordDef( new FieldDef[] { new StringFieldDef(SHORT_NAME_FIELD), new StringFieldDef(LONG_NAME_FIELD), @@ -67,7 +67,7 @@ super.addListener(new ComboBoxListenerAdapter() { @Override public void onSelect(final ComboBox comboBox, final Record record, final int index) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final LinkDTO link = new LinkDTO(record.getAsString(SHORT_NAME_FIELD), record.getAsString(LONG_NAME_FIELD), record.getAsString(ICON_URL_FIELD), Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -28,8 +28,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.WindowListenerAdapter; @@ -80,7 +80,7 @@ } }); - Panel panel = new Panel(); + final Panel panel = new Panel(); panel.setBorder(false); registerForm = new RegisterForm(i18n, session); registerForm.setWidth(370); @@ -126,7 +126,7 @@ } public void reset() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { registerForm.reset(); } @@ -134,7 +134,8 @@ } public void showWelcolmeDialog() { - InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), i18n.t("Thanks for registering"), + final InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), + i18n.t("Thanks for registering"), i18n.t("Now you can participate more actively in this site with other people and groups. " + "You can also use your personal space to publish contents. " + "Your email is not verified, please follow the instructions you will receive by email."), @@ -143,7 +144,8 @@ } public void showWelcolmeDialogNoHomepage() { - InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), i18n.t("Thanks for registering"), + final InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), + i18n.t("Thanks for registering"), i18n.t("Now you can participate more actively in this site with other people and groups. " + "Your email is not verified, please follow the instructions you will receive by email."), i18n.t("Ok"), WELCOME_OK_BUTTON, true, true, 380, 210); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -22,9 +22,9 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.Command; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; @@ -54,7 +54,7 @@ public void hideProgress() { timeProgressMaxTime.cancel(); progressPanel.setVisible(false); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { publicLinkProvider.get().setVisible(true); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -24,8 +24,8 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.ExtElement; @@ -92,7 +92,7 @@ MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if ("yes".equals(btnID)) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { onConfirmed.onEvent(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -34,8 +34,8 @@ import com.calclab.emiteuimodule.client.users.UserGridPanel; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.BoxComponent; @@ -110,7 +110,7 @@ new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if (btnID.equals("yes")) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.addCollab(groupShortName); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -25,8 +25,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.core.client.JavaScriptObject; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.ToolbarButton; @@ -135,7 +135,7 @@ dialog.addListener(new UploadDialogListenerAdapter() { @Override public boolean onBeforeAdd(final UploadDialog source, final String filename) { - boolean mustAdd = presenter.checkFolderChange(); + final boolean mustAdd = presenter.checkFolderChange(); if (!mustAdd) { NotifyUser.important(i18n.t("Please, wait until current uploads are finished to upload new files into another location")); } @@ -181,7 +181,7 @@ } private void setPermittedExtensions(final String[] extensions) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { if (dialog == null) { createDialog(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -6,8 +6,8 @@ import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.form.Field; import com.gwtext.client.widgets.form.FormPanel; @@ -62,7 +62,7 @@ createForm(); } dialog.show(); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { waveId.focus(); } Modified: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/war/WEB-INF/web.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -85,83 +85,4 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> - - <!-- with the new gwt-log remove this --> -<!-- <servlet>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <servlet-class>--> -<!-- com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl</servlet-class>--> -<!-- </servlet>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/ws/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>--> -<!-- </servlet>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/ws/junithost</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/ws/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.blogs.KuneBlogs/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.blogs.KuneBlogs/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.chat.KuneChat/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.chat.KuneChat/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.docs.KuneDocs/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.docs.KuneDocs/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.gallery.KuneGallery/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.gallery.KuneGallery/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.platf.KunePlatform/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.platf.KunePlatform/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.wiki.KuneWiki/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.wiki.KuneWiki/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>jUnitHostImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.workspace.KuneWorkspace/junithost/*</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- <servlet-mapping>--> -<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> -<!-- <url-pattern>/org.ourproject.kune.workspace.KuneWorkspace/gwt-log</url-pattern>--> -<!-- </servlet-mapping>--> </web-app> \ No newline at end of file