[kune-commits] r1278 - in trunk: . img/icons src/main/java/cc/kune/core/client/resources src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/core/client/ws/entheader src/main/java/cc/kune/wave/client
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Tue Mar 15 21:08:35 CET 2011
Author: vjrj_
Date: 2011-03-15 21:08:34 +0100 (Tue, 15 Mar 2011)
New Revision: 1278
Added:
trunk/img/icons/wave-icon.png
trunk/img/icons/waveicon.svg
trunk/src/main/java/cc/kune/core/client/resources/wave-icon.png
Modified:
trunk/DEV-GUIDE
trunk/INSTALL
trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java
trunk/src/main/java/cc/kune/wave/client/WebClient.java
Log:
More WIAB integration
Modified: trunk/DEV-GUIDE
===================================================================
--- trunk/DEV-GUIDE 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/DEV-GUIDE 2011-03-15 20:08:34 UTC (rev 1278)
@@ -160,22 +160,19 @@
==Development Environment==
-===Prerequisite: Install maven===
+===Prerequisite: Install maven and Eclipse ===
-Install maven2.
+Install maven2. In debian system and derivatives "apt-get install maven2"
-From:
-http://google-web-toolkit.googlecode.com/svn/trunk/samples/expenses/README-MAVEN.txt
+http://www.eclipse.org/downloads/
-Eclipse users will need to install the following plugin components:
-- Google Plugin for Eclipse (instructions at http://code.google.com/eclipse/)
-- m2eclipse Core
-- Maven Integration for WTP (in m2eclipse extras)
- Instructions for installing the maven plugins can be found here:
- http://m2eclipse.sonatype.org/installing-m2eclipse.html
-
Ensure Eclipse is configured to use Java 1.6.
+===Optional maven-eclipse integration ===
+
+Check:
+http://google-web-toolkit.googlecode.com/svn/trunk/samples/expenses/README-MAVEN.txt
+
===Prerequisite: Install kune===
Install kune (see trunk/INSTALL file) and run kune for the first time.
@@ -212,7 +209,7 @@
-Xmx1024M
before run hosted mode compile once with:
- mvn gwt-maven:compile
+ mvn compile && mvn gwt:compile
and deploy with:
script/deploy_gwt.sh
and then we run jetty (with "script/server.sh" also you can run server in debug mode, see TROUBLESHOOT). This is quite useful to put breakpoints in the server code.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/INSTALL 2011-03-15 20:08:34 UTC (rev 1278)
@@ -57,8 +57,7 @@
- Compile with maven:
# (in the trunk directory)
- mvn compile -Dliquibase.should.run=false
- mvn gwt:compile
+ mvn compile -Dliquibase.should.run=false && mvn gwt:compile
- Copy the target to src directory (only for test):
./script/deploy_gwt.sh
Added: trunk/img/icons/wave-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/icons/wave-icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/icons/waveicon.svg
===================================================================
--- trunk/img/icons/waveicon.svg (rev 0)
+++ trunk/img/icons/waveicon.svg 2011-03-15 20:08:34 UTC (rev 1278)
@@ -0,0 +1,116 @@
+<?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="210mm"
+ height="297mm"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="waveicon.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="216"
+ inkscape:cy="960"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="748"
+ inkscape:window-x="0"
+ inkscape:window-y="1024"
+ 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">
+ <g
+ id="g3071"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/wave-icon.png"
+ inkscape:export-xdpi="28.799999"
+ inkscape:export-ydpi="28.799999">
+ <rect
+ ry="5"
+ rx="5"
+ y="17.362183"
+ x="24"
+ height="50"
+ width="50"
+ id="rect3069"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <image
+ width="49"
+ height="30"
+ xlink:href="data:image/png;base64,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
+"
+ id="image3066"
+ x="24.5"
+ y="27.362183" />
+ </g>
+ </g>
+</svg>
Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-03-15 20:08:34 UTC (rev 1278)
@@ -142,6 +142,9 @@
@Source("button15rblue.png")
ImageResource button15rblue();
+ @Source("wave-icon.png")
+ ImageResource waveIcon();
+
@Source("button15rdark.png")
ImageResource button15rdark();
Added: trunk/src/main/java/cc/kune/core/client/resources/wave-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/core/client/resources/wave-icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-03-15 20:08:34 UTC (rev 1278)
@@ -138,6 +138,13 @@
}
};
+ final AbstractExtendedAction wavePowered = new AbstractExtendedAction() {
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ KuneWindowUtils.open("http://incubator.apache.org/wave/");
+ }
+ };
+
final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, new AbstractAction() {
@Override
public void actionPerformed(final ActionEvent event) {
@@ -147,6 +154,8 @@
gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site"));
gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16());
+ wavePowered.putValue(Action.NAME, i18n.t("Apache Wave powered"));
+ wavePowered.putValue(Action.SMALL_ICON, res.waveIcon());
aboutAction.putValue(Action.NAME, i18n.t("About kune"));
aboutAction.putValue(Action.SMALL_ICON, res.info());
// aboutAction.setShortcut(shortcut);
@@ -161,6 +170,7 @@
right.addAction(reportBugs);
right.addAction(gotoKuneDevSite);
right.addAction(menuSeparator);
+ right.addAction(new MenuItemDescriptor(OPTIONS_MENU, wavePowered));
right.addAction(new MenuItemDescriptor(OPTIONS_MENU, aboutAction));
}
Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2011-03-15 20:08:34 UTC (rev 1278)
@@ -67,8 +67,7 @@
void showDefUserLogo();
}
- private static final int LARGE_NAME_LIMIT = 20;
-
+ private static final int LARGE_NAME_LIMIT = 17;
private static final int MEDIUM_NAME_LIMIT = 90;
private final Session session;
Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java
===================================================================
--- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-03-15 14:25:36 UTC (rev 1277)
+++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-03-15 20:08:34 UTC (rev 1278)
@@ -278,7 +278,9 @@
LOG.info("History token contains invalid path: " + encodedToken);
return;
}
- if (fromWaveRef.getWaveId().equals(waveRef.getWaveId())) {
+ // Kune patch
+ // if (fromWaveRef.getWaveId().equals(waveRef.getWaveId())) {
+ if (fromWaveRef == null || fromWaveRef.getWaveId().equals(waveRef.getWaveId())) {
// History change was caused by clicking on a link, it's already
// updated by browser.
return;
More information about the kune-commits
mailing list