Author: vjrj_ Date: 2011-01-10 05:43:49 +0100 (Mon, 10 Jan 2011) New Revision: 1179 Added: trunk/src/main/java/cc/kune/common/ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml trunk/src/main/java/cc/kune/common/client/ trunk/src/main/java/cc/kune/common/client/noti/ trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java trunk/src/main/java/cc/kune/common/client/noti/SimpleCallback.java trunk/src/main/java/cc/kune/common/client/ui/ trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java trunk/src/main/java/cc/kune/common/client/utils/ trunk/src/main/java/cc/kune/common/client/utils/Location.java trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java trunk/src/main/java/cc/kune/common/public/ trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java trunk/src/main/java/cc/kune/core/client/ui/ trunk/src/main/java/cc/kune/core/client/ui/dialogs/ trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.java trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.ui.xml trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsView.java trunk/src/main/java/cc/kune/msgs/client/CloseCallback.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java Removed: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java trunk/src/main/java/cc/kune/core/client/utils/ trunk/src/main/java/cc/kune/msgs/KuneMsgsTests.gwt.xml trunk/src/main/java/cc/kune/msgs/client/KuneMessagesSampleEntryPoint.java trunk/src/main/java/cc/kune/msgs/client/msgs/ trunk/src/main/java/cc/kune/msgs/client/panel/ Modified: trunk/img/webtemplate/web_template-2011.svg trunk/pom.xml trunk/script/css-update.sh trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/client/notify/alerts/AlertEvent.java trunk/src/main/java/cc/kune/core/client/notify/alerts/UserAlerterPresenter.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml trunk/src/main/java/cc/kune/msgs/public/kune-message.css trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.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/ext/InsertLinkExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.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/ui/rte/inserttable/InsertTableDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java Log: NEW - # 11: New messages widget http://kune.ourproject.org/issues/ticket/11 Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/img/webtemplate/web_template-2011.svg 2011-01-10 04:43:49 UTC (rev 1179) @@ -53,15 +53,15 @@ inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="475.0028" - inkscape:cy="695.87654" - inkscape:current-layer="layer1" + inkscape:cy="455.87654" + inkscape:current-layer="g8450" inkscape:document-units="px" showgrid="false" - inkscape:window-width="1280" - inkscape:window-height="745" + inkscape:window-width="1278" + inkscape:window-height="1007" inkscape:window-x="0" - inkscape:window-y="1024" - inkscape:window-maximized="1" + inkscape:window-y="0" + inkscape:window-maximized="0" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" @@ -2197,7 +2197,8 @@ id="layer1" inkscape:label="normal" inkscape:groupmode="layer" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> <rect style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5037" @@ -2305,7 +2306,7 @@ id="g5365"> <path transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2315,7 +2316,7 @@ sodipodi:type="arc" /> <path transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2640,7 +2641,7 @@ transform="translate(-751,-12)"> <path transform="translate(0,-3)" - d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z" + d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z" sodipodi:ry="11" sodipodi:rx="11" sodipodi:cy="232" @@ -4468,136 +4469,7 @@ height="3.7137473" x="130.07883" y="111.25339" /> - <rect - style="color:#000000;fill:#501616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4526" - width="13" - height="6" - x="17" - y="139" /> <g - id="g4532" - style="fill:#892c00;fill-opacity:1;opacity:0.85"> - <rect - rx="5" - ry="5" - y="110.34837" - x="4.9808998" - height="182.65163" - width="322.0191" - id="rect4520" - style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - y="110.5" - x="5" - height="45" - width="71" - id="rect4522" - style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4528" - width="71" - height="45" - x="5" - y="247.5" /> - <rect - y="110.5" - x="256" - height="45" - width="71" - id="rect4530" - style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - </g> - <rect - style="opacity:0.79000004999999984;color:#000000;fill:#fff0e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect4538" - width="294.9017" - height="42" - x="17" - y="141" - ry="3" - rx="3" /> - <use - x="0" - y="0" - xlink:href="#rect4538" - id="use4540" - transform="translate(0,49)" - width="1024" - height="768" /> - <use - x="0" - y="0" - xlink:href="#use4540" - id="use4542" - transform="translate(0,49)" - width="1024" - height="768" /> - <text - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" - xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffe9da;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" - x="15.226257" - y="133.22296" - id="text4548" - sodipodi:linespacing="100%"><tspan - id="tspan4550" - sodipodi:role="line" - x="15.226257" - y="133.22296">Messages</tspan></text> - <image - y="140" - x="17" - id="image5750" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAWpJREFU -OI3V07svw1EUB/Bv65FqtKrUY0A8QjQIaRCbgUZSoQkSiSYSj8mASEgHg8dfYDWRWjvUahAj0QRD -k9+AySAsIvq7j985tqYJ9UgtTnJyh5v7Od/hHhszI5+y5/X6L4DCXBf3p7NTTLTGxGNNQ7HHXyW4 -PYm4SamtsvrxflJq/asEnwKk1Iq7LtTuru2BFmo+FQ/3/hgwEpN+LdSyq9ID6yWB6q4FjyXk5k1s -pOhbIBUP27WQUZ9/xgszifPDI5R60tCmHNWmHPsWsIQMOiu6Iq7yN5C4A5hgvV6gcXDNpoXYOd8b -cOUErg6CxdqUu576btDbNZjSCEy0geQDHA4D1Z3T7VrI1ZyAJeSityUUcLqewPoZsBXgMm4AIJBp -wNfaAEuopbPtDn82kPkH2hRRn38csN/D7vYBYPTNhTNzCkqa0TS8UWUcb28BmPoICOlI7k+kmRhM -lNWcOUEEZq7JTmD7/8v0DkyzqBlaCormAAAAAElFTkSuQmCC -" - height="40" - width="40" /> - <flowRoot - xml:space="preserve" - id="flowRoot5765" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - transform="translate(4.170296,-7.003638)"><flowRegion - id="flowRegion5767"><rect - id="rect5769" - width="272.94324" - height="32.526917" - x="51.618793" - y="156.35263" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" /></flowRegion><flowPara - id="flowPara5771">Lorem ipsum dolor sit amet, consectetuer adipiscing elit</flowPara></flowRoot> <image - y="171.03604" - x="303.15076" - id="image8263" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAsNJREFU -OI1tk7tPk1EUwH/fow+0NRIjg48YGgOt4KOp4aWk2iBqYkLixmJw8T9w6cBgpHFwMHEwLsRBB/AB -MbiYUDSasIjBxA4OKLXUFkppsR/C1373uw6UCupNbm5ykt/vnHtOjsK28zgc1tNv344IuMp/jgaT -Ai5HobIVU/6Cnzb5fJcu3rjhVjQNACklCIG0LN49emR+mpt7I+BKFKyaoAo/9/t8vZHr192LU1OY -+fyO7E6vl4bOTt6NjpqJZHJSQF8ULG04FHJkp6dfBI4e7Y0MDGzCa2tgWTsEQlVZT6cJRCL62sLC -4ZVS6fRAOPxM68pkXh5rauo5f+2aOxuPYzU0oMdikEwis9nNvx8/zt5796gkEhifP3MsHNaNVOrI -t0QiqPWo6pP+mzf1zOvXlAsF1L4+1NZWlM5O+PoVdd8+9gwN4aqvR5GS0tQUvwoFWsJhfebjx4Cu -KApISblQ2Cx1eBhcLly9vbgHB9EVBafHgxmPk797FxvYMAykECiA+s+spEQ8eICcmcG5axdOrxdr -dpZcLIawbWzABmS1R/8KAK2lBXcohK7rOBwOdgeD1IVCyCosymXEwsIfgRSiBqutrXhv38bp9bIR -j7M2MYHT48F3/z6ejg7MXA7jyxfkz58A6FLKTZthICyLuvZ2XFV4eWgI2zTRgP39/dSdPMnGw4eg -adjVpNoFKbsrxeKhQHu7VkokKI2PU/n+naVbtyhnMpSXl8mNjbE+P0/yzh0UTcPn95NeWbG/ra7m -lRg4NXh1orGxuy0YdKXicdaLxVqztl/F4aCxuZl0oSDep9NLNnRpkyAiMJIrFs+ahnEw0NamlxYX -qZjmDlh1OGj0+5nP58X0jx8pGzqikKot01Yl/gMHus+cOuVShMC2LKRl1d5EMml9yGbnbDgbheUd -27hdIqDnf+NVYdaGc1FY3Yr9BsdNUva1UTzZAAAAAElFTkSuQmCC -" - height="16" - width="16" - style="fill:#cccccc;opacity:0.81" /> - <g transform="translate(804.21116,-270.59772)" inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -4656,7 +4528,7 @@ id="layer3" inkscape:label="overlay" sodipodi:insensitive="true" - style="display:none"> + style="display:inline"> <rect style="opacity:0.68399999;color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3865" @@ -4672,74 +4544,6 @@ inkscape:label="dialogs" style="display:none"> <rect - transform="matrix(0,1,1,0,0,0)" - ry="5" - rx="5.0000005" - y="138.96637" - x="375.22134" - height="343" - width="63" - id="rect3248" - style="opacity:0.5;color:#000000;fill:#666666;stroke:#808080;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3460" - width="60.841721" - height="341.04489" - x="376.37964" - y="139.96637" - rx="5" - ry="5" - transform="matrix(0,1,1,0,0,0)" /> - <image - style="display:inline" - y="383.22137" - x="148.96637" - id="image3210" - xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT /GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo 3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT 3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka 5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= " - height="44" - width="44" /> - <text - xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffe6d5;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="200.2027" - y="393.09833" - id="text3213" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3215" - x="200.2027" - y="393.09833" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffe6d5;font-family:Verdana;-inkscape-font-specification:Verdana Bold">Some notice/info/alert title</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3217" - y="411.09833" - x="200.2027" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Verdana;-inkscape-font-specification:Verdana" - xml:space="preserve"><tspan - sodipodi:role="line" - id="tspan3221" - x="200.2027" - y="411.09833">Lorem ipsum dolor sit amet, consectetuer</tspan><tspan - sodipodi:role="line" - x="200.2027" - y="427.34833" - id="tspan3223">adipiscing elit.</tspan></text> - <text - xml:space="preserve" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="480.7074" - y="377.68677" - id="text3213-2" - sodipodi:linespacing="125%" - transform="scale(0.96997425,1.0309552)"><tspan - sodipodi:role="line" - id="tspan3215-7" - x="480.7074" - y="377.68677" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff7f2a;font-family:Verdana;-inkscape-font-specification:Verdana Bold">x</tspan></text> - <rect style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect24748" width="646.41687" @@ -4883,5 +4687,242 @@ x="722.03516" id="tspan3972" sodipodi:role="line">Cancelar</tspan></text> + <path + style="opacity:0.81000001;color:#000000;fill:#ac9393;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 795,144 211,-25" + id="path8441" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#6c5353;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:transform-center-x="-5.9580116" + inkscape:transform-center-y="-0.62993359" + d="m 862.37995,145.60404 -26.67151,29.29513 -1.53827,-47.36987 z" + id="path8447" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> </g> + <g + style="display:inline" + inkscape:label="confirmation" + id="g8450" + inkscape:groupmode="layer"> + <rect + ry="10" + rx="10" + y="113.49999" + x="277.29156" + height="205.09827" + width="476.85486" + id="rect8452" + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#e7caba;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect8454" + width="371.33139" + height="100.00001" + x="324.55331" + y="148" /> + <rect + y="112.08939" + x="277.29156" + height="19.354607" + width="476.85486" + id="rect8456" + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="434.16895" + y="184.81694" + id="text8468" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan8470" + x="434.16895" + y="184.81694">Confirm please</tspan></text> + <rect + ry="7" + rx="6.9999995" + y="280" + x="299" + height="26" + width="103.29102" + id="rect8472" + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text8474" + y="298.10547" + x="312.03516" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="298.10547" + x="312.03516" + id="tspan8476" + sodipodi:role="line">Continuar</tspan></text> + <rect + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect8488" + width="103.29102" + height="26" + x="619" + y="280" + rx="6.9999995" + ry="7" /> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="636.03516" + y="298.10547" + id="text8490" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan8492" + x="636.03516" + y="298.10547">Cancelar</tspan></text> + <path + inkscape:connector-curvature="0" + id="path8494" + d="m 795,144 211,-25" + style="opacity:0.81000001;color:#000000;fill:#ac9393;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text8498" + y="222.14001" + x="434.08438" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + sodipodi:role="line" + id="tspan8502" + x="434.08438" + y="222.14001">Are you sure?</tspan></text> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path8496" + d="m 819.54682,-91.528118 -26.67151,29.29513 -1.53827,-47.369872 z" + inkscape:transform-center-y="-0.62993359" + inkscape:transform-center-x="-5.9580116" + style="color:#000000;fill:#6c5353;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="notify" + style="display:none"> + <g + style="display:inline" + id="g8344" + transform="translate(0,323)"> + <g + transform="matrix(1,0,0,-0.84861,315.32544,35.16246)" + style="opacity:0.85;fill:#892c00;fill-opacity:1" + id="g4532"> + <rect + style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4520" + width="322.0191" + height="182.65163" + x="4.9808998" + y="110.34837" + ry="5.8919883" + rx="5" /> + <rect + style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4522" + width="71" + height="45" + x="5" + y="247.1942" /> + <rect + y="247.5" + x="5" + height="45" + width="71" + id="rect4528" + style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#892c00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4530" + width="71" + height="45" + x="256" + y="248.37251" /> + </g> + <rect + rx="3" + ry="3" + y="-206.48027" + x="332.32544" + height="42" + width="294.9017" + id="rect4538" + style="opacity:0.79000005;color:#000000;fill:#fff0e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <use + height="768" + width="1024" + transform="translate(0,49)" + id="use4540" + xlink:href="#rect4538" + y="0" + x="0" /> + <use + height="768" + width="1024" + transform="translate(0,49)" + id="use4542" + xlink:href="#use4540" + y="0" + x="0" /> + <image + width="40" + height="40" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAWpJREFU +OI3V07svw1EUB/Bv65FqtKrUY0A8QjQIaRCbgUZSoQkSiSYSj8mASEgHg8dfYDWRWjvUahAj0QRD +k9+AySAsIvq7j985tqYJ9UgtTnJyh5v7Od/hHhszI5+y5/X6L4DCXBf3p7NTTLTGxGNNQ7HHXyW4 +PYm4SamtsvrxflJq/asEnwKk1Iq7LtTuru2BFmo+FQ/3/hgwEpN+LdSyq9ID6yWB6q4FjyXk5k1s +pOhbIBUP27WQUZ9/xgszifPDI5R60tCmHNWmHPsWsIQMOiu6Iq7yN5C4A5hgvV6gcXDNpoXYOd8b +cOUErg6CxdqUu576btDbNZjSCEy0geQDHA4D1Z3T7VrI1ZyAJeSityUUcLqewPoZsBXgMm4AIJBp +wNfaAEuopbPtDn82kPkH2hRRn38csN/D7vYBYPTNhTNzCkqa0TS8UWUcb28BmPoICOlI7k+kmRhM +lNWcOUEEZq7JTmD7/8v0DkyzqBlaCormAAAAAElFTkSuQmCC +" + id="image5750" + x="332.32544" + y="-207.48027" /> + <flowRoot + transform="translate(319.49574,-354.48391)" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + id="flowRoot5765" + xml:space="preserve"><flowRegion + id="flowRegion5767"><rect + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + y="156.35263" + x="51.618793" + height="32.526917" + width="272.94324" + id="rect5769" /></flowRegion><flowPara + id="flowPara5771">Lorem ipsum dolor sit amet, consectetuer adipiscing elit</flowPara></flowRoot> <image + style="opacity:0.81000001;fill:#cccccc" + width="16" + height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAsNJREFU +OI1tk7tPk1EUwH/fow+0NRIjg48YGgOt4KOp4aWk2iBqYkLixmJw8T9w6cBgpHFwMHEwLsRBB/AB +MbiYUDSasIjBxA4OKLXUFkppsR/C1373uw6UCupNbm5ykt/vnHtOjsK28zgc1tNv344IuMp/jgaT +Ai5HobIVU/6Cnzb5fJcu3rjhVjQNACklCIG0LN49emR+mpt7I+BKFKyaoAo/9/t8vZHr192LU1OY ++fyO7E6vl4bOTt6NjpqJZHJSQF8ULG04FHJkp6dfBI4e7Y0MDGzCa2tgWTsEQlVZT6cJRCL62sLC +4ZVS6fRAOPxM68pkXh5rauo5f+2aOxuPYzU0oMdikEwis9nNvx8/zt5796gkEhifP3MsHNaNVOrI +t0QiqPWo6pP+mzf1zOvXlAsF1L4+1NZWlM5O+PoVdd8+9gwN4aqvR5GS0tQUvwoFWsJhfebjx4Cu +KApISblQ2Cx1eBhcLly9vbgHB9EVBafHgxmPk797FxvYMAykECiA+s+spEQ8eICcmcG5axdOrxdr +dpZcLIawbWzABmS1R/8KAK2lBXcohK7rOBwOdgeD1IVCyCosymXEwsIfgRSiBqutrXhv38bp9bIR +j7M2MYHT48F3/z6ejg7MXA7jyxfkz58A6FLKTZthICyLuvZ2XFV4eWgI2zTRgP39/dSdPMnGw4eg +adjVpNoFKbsrxeKhQHu7VkokKI2PU/n+naVbtyhnMpSXl8mNjbE+P0/yzh0UTcPn95NeWbG/ra7m +lRg4NXh1orGxuy0YdKXicdaLxVqztl/F4aCxuZl0oSDep9NLNnRpkyAiMJIrFs+ahnEw0NamlxYX +qZjmDlh1OGj0+5nP58X0jx8pGzqikKot01Yl/gMHus+cOuVShMC2LKRl1d5EMml9yGbnbDgbheUd +27hdIqDnf+NVYdaGc1FY3Yr9BsdNUva1UTzZAAAAAElFTkSuQmCC +" + id="image8263" + x="618.4762" + y="-176.44423" /> + </g> + </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/pom.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -224,7 +224,7 @@ <dependency> <groupId>org.ourproject.common</groupId> <artifactId>gwt-common</artifactId> - <version>0.0.3</version> + <version>0.0.4</version> <scope>compile</scope> </dependency> <dependency> @@ -246,7 +246,7 @@ <dependency> <groupId>com.gwtplatform</groupId> <artifactId>gwtp</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.adamtacy</groupId> @@ -749,7 +749,8 @@ <goal>process</goal> </goals> <phase>generate-sources</phase> </execution> </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>apt-maven-plugin</artifactId> <version>1.0-alpha-4</version> <executions> <execution> <goals> <goal>process</goal> - <goal>test-process</goal> </goals> </execution> </executions> </plugin> --> + <goal>test-process</goal> </goals> </execution> </executions> </plugin> --> + <!-- BETTER user: http://code.google.com/p/acris/wiki/AnnotationProcessing --> <plugin> <!-- =roo --> <groupId>org.codehaus.mojo</groupId> @@ -936,4 +937,4 @@ </plugin> </plugins> </reporting> -</project> \ No newline at end of file +</project> Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/script/css-update.sh 2011-01-10 04:43:49 UTC (rev 1179) @@ -10,3 +10,5 @@ #rsync -aC $APPPUB/images/ $WEBAPP/images cp src/main/java/cc/kune/msgs/public/kune-message.css target/kune-0.0.7/ws/ +cp src/main/java/cc/kune/common/public/kune-common.css target/kune-0.0.7/ws/ +cp src/main/java/cc/kune/core/public/ws.css target/kune-0.0.7/ws/ \ No newline at end of file Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -5,7 +5,7 @@ <inherits name='com.google.gwt.logging.Logging' /> <inherits name="cc.kune.core.Core" /> <inherits name="com.calclab.suco.Suco" /> - <inherits name="org.adamtacy.GWTEffects"></inherits> + <inherits name="org.adamtacy.GWTEffects"></inherits> <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <!-- <source path='shared'/> --> @@ -30,4 +30,6 @@ <!--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,gecko1_8" /> + <!-- Entrypoint =============================================== --> + <entry-point class="cc.kune.core.client.KuneEntryPoint" /> </module> \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module> + <!-- Inherit the core Web Toolkit stuff. --> + <inherits name='com.google.gwt.user.User' /> + <!-- Inherit the default GWT style sheet. You can change --> + <!-- the theme of your GWT application by uncommenting --> + <!-- any one of the following lines. --> + <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> --> + <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> --> + <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> + <!-- Other module inherits --> + <!-- Specify the app entry point class. --> +<!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint' />--> + <!-- Specify the paths for translatable code --> + <source path='client' /> + <public path="public" /> + <stylesheet src="kune-common.css" /> +</module> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/common/KuneCommon.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,119 @@ +package cc.kune.common.client.noti; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class AlertEvent extends GwtEvent<AlertEvent.AlertHandler> { + + public interface HasAlertHandlers extends HasHandlers { + HandlerRegistration addAlertHandler(AlertHandler handler); + } + + public interface AlertHandler extends EventHandler { + public void onAlert(AlertEvent event); + } + + private static final Type<AlertHandler> TYPE = new Type<AlertHandler>(); + + public static void fire(HasHandlers source, java.lang.String title, java.lang.String message, cc.kune.common.client.noti.SimpleCallback onOk) { + source.fireEvent(new AlertEvent(title, message, onOk)); + } + + public static void fire(HasHandlers source, java.lang.String message) { + source.fireEvent(new AlertEvent(message)); + } + + public static Type<AlertHandler> getType() { + return TYPE; + } + + java.lang.String title; + java.lang.String message; + cc.kune.common.client.noti.SimpleCallback onOk; + + public AlertEvent(java.lang.String title, java.lang.String message, cc.kune.common.client.noti.SimpleCallback onOk) { + this.title = title; + this.message = message; + this.onOk = onOk; + } + + public AlertEvent(java.lang.String message) { + this.message = message; + } + + protected AlertEvent() { + // Possibly for serialization. + } + + @Override + public Type<AlertHandler> getAssociatedType() { + return TYPE; + } + + public java.lang.String getTitle() { + return title; + } + + public java.lang.String getMessage() { + return message; + } + + public cc.kune.common.client.noti.SimpleCallback getOnOk() { + return onOk; + } + + @Override + protected void dispatch(AlertHandler handler) { + handler.onAlert(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AlertEvent other = (AlertEvent) obj; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + if (message == null) { + if (other.message != null) + return false; + } else if (!message.equals(other.message)) + return false; + if (onOk == null) { + if (other.onOk != null) + return false; + } else if (!onOk.equals(other.onOk)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); + hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); + hashCode = (hashCode * 37) + (onOk == null ? 1 : onOk.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "AlertEvent[" + + title + + "," + + message + + "," + + onOk + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/noti/AlertEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,189 @@ +package cc.kune.common.client.noti; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; + +import com.google.gwt.event.shared.HasHandlers; + +public class ConfirmAskEvent extends GwtEvent<ConfirmAskEvent.ConfirmAskHandler> { + + public interface HasConfirmAskHandlers extends HasHandlers { + HandlerRegistration addConfirmAskHandler(ConfirmAskHandler handler); + } + + public interface ConfirmAskHandler extends EventHandler { + public void onConfirmAsk(ConfirmAskEvent event); + } + + private static final Type<ConfirmAskHandler> TYPE = new Type<ConfirmAskHandler>(); + + public static void fire(HasHandlers source, java.lang.String title, java.lang.String message, java.lang.String acceptBtnMsg, java.lang.String cancelBtnMsg, java.lang.String acceptBtnTooltip, java.lang.String cancelBtnTooltip, cc.kune.common.client.noti.SimpleCallback onAccept, cc.kune.common.client.noti.SimpleCallback onCancel) { + source.fireEvent(new ConfirmAskEvent(title, message, acceptBtnMsg, cancelBtnMsg, acceptBtnTooltip, cancelBtnTooltip, onAccept, onCancel)); + } + + public static void fire(HasHandlers source, java.lang.String message) { + source.fireEvent(new ConfirmAskEvent(message)); + } + + public static Type<ConfirmAskHandler> getType() { + return TYPE; + } + + java.lang.String title; + java.lang.String message; + java.lang.String acceptBtnMsg; + java.lang.String cancelBtnMsg; + java.lang.String acceptBtnTooltip; + java.lang.String cancelBtnTooltip; + cc.kune.common.client.noti.SimpleCallback onAccept; + cc.kune.common.client.noti.SimpleCallback onCancel; + + public ConfirmAskEvent(java.lang.String title, java.lang.String message, java.lang.String acceptBtnMsg, java.lang.String cancelBtnMsg, java.lang.String acceptBtnTooltip, java.lang.String cancelBtnTooltip, cc.kune.common.client.noti.SimpleCallback onAccept, cc.kune.common.client.noti.SimpleCallback onCancel) { + this.title = title; + this.message = message; + this.acceptBtnMsg = acceptBtnMsg; + this.cancelBtnMsg = cancelBtnMsg; + this.acceptBtnTooltip = acceptBtnTooltip; + this.cancelBtnTooltip = cancelBtnTooltip; + this.onAccept = onAccept; + this.onCancel = onCancel; + } + + public ConfirmAskEvent(java.lang.String message) { + this.message = message; + } + + protected ConfirmAskEvent() { + // Possibly for serialization. + } + + @Override + public Type<ConfirmAskHandler> getAssociatedType() { + return TYPE; + } + + public java.lang.String getTitle() { + return title; + } + + public java.lang.String getMessage() { + return message; + } + + public java.lang.String getAcceptBtnMsg() { + return acceptBtnMsg; + } + + public java.lang.String getCancelBtnMsg() { + return cancelBtnMsg; + } + + public java.lang.String getAcceptBtnTooltip() { + return acceptBtnTooltip; + } + + public java.lang.String getCancelBtnTooltip() { + return cancelBtnTooltip; + } + + public cc.kune.common.client.noti.SimpleCallback getOnAccept() { + return onAccept; + } + + public cc.kune.common.client.noti.SimpleCallback getOnCancel() { + return onCancel; + } + + @Override + protected void dispatch(ConfirmAskHandler handler) { + handler.onConfirmAsk(this); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ConfirmAskEvent other = (ConfirmAskEvent) obj; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + if (message == null) { + if (other.message != null) + return false; + } else if (!message.equals(other.message)) + return false; + if (acceptBtnMsg == null) { + if (other.acceptBtnMsg != null) + return false; + } else if (!acceptBtnMsg.equals(other.acceptBtnMsg)) + return false; + if (cancelBtnMsg == null) { + if (other.cancelBtnMsg != null) + return false; + } else if (!cancelBtnMsg.equals(other.cancelBtnMsg)) + return false; + if (acceptBtnTooltip == null) { + if (other.acceptBtnTooltip != null) + return false; + } else if (!acceptBtnTooltip.equals(other.acceptBtnTooltip)) + return false; + if (cancelBtnTooltip == null) { + if (other.cancelBtnTooltip != null) + return false; + } else if (!cancelBtnTooltip.equals(other.cancelBtnTooltip)) + return false; + if (onAccept == null) { + if (other.onAccept != null) + return false; + } else if (!onAccept.equals(other.onAccept)) + return false; + if (onCancel == null) { + if (other.onCancel != null) + return false; + } else if (!onCancel.equals(other.onCancel)) + return false; + return true; + } + + @Override + public int hashCode() { + int hashCode = 23; + hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); + hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnMsg == null ? 1 : acceptBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnMsg == null ? 1 : cancelBtnMsg.hashCode()); + hashCode = (hashCode * 37) + (acceptBtnTooltip == null ? 1 : acceptBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (cancelBtnTooltip == null ? 1 : cancelBtnTooltip.hashCode()); + hashCode = (hashCode * 37) + (onAccept == null ? 1 : onAccept.hashCode()); + hashCode = (hashCode * 37) + (onCancel == null ? 1 : onCancel.hashCode()); + return hashCode; + } + + @Override + public String toString() { + return "ConfirmAskEvent[" + + title + + "," + + message + + "," + + acceptBtnMsg + + "," + + cancelBtnMsg + + "," + + acceptBtnTooltip + + "," + + cancelBtnTooltip + + "," + + onAccept + + "," + + onCancel + + "]"; + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/noti/ConfirmAskEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,5 @@ +package cc.kune.common.client.noti; + +public enum NotifyLevel { + info, important, veryImportant, error +} Property changes on: trunk/src/main/java/cc/kune/common/client/noti/NotifyLevel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/noti/SimpleCallback.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/noti/SimpleCallback.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/noti/SimpleCallback.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,13 @@ +package cc.kune.common.client.noti; + +public interface SimpleCallback { + /** + * Notifies this callback of an accept response. + */ + void onSuccess(); + + /** + * Notifies this callback of a cancel. + */ + void onCancel(); +} Property changes on: trunk/src/main/java/cc/kune/common/client/noti/SimpleCallback.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,51 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.event.logical.shared.ResizeEvent; +import com.google.gwt.event.logical.shared.ResizeHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +public class PopupPanelBottomCentered extends PopupPanel { + + public PopupPanelBottomCentered() { + super(); + init(); + } + + public PopupPanelBottomCentered(boolean autohide, boolean modal) { + super(autohide, modal); + init(); + } + + public PopupPanelBottomCentered(boolean autohide) { + super(autohide); + init(); + } + + private void init() { + setStyleName("k-popup-bottom-centered"); + addStyleName("k-opacity80"); + addStyleName("k-box-10shadow"); + addStyleName("k-top-10corners"); + Window.addResizeHandler(new ResizeHandler() { + @Override + public void onResize(ResizeEvent event) { + setCenterPosition(); + } + }); + } + + public void setCenterPosition() { + Widget widget = getWidget(); + int x = (Window.getClientWidth() - (widget != null ? getWidget().getOffsetWidth() : 0)) / 2; + int y = Window.getClientHeight() - (widget != null ? getWidget().getOffsetHeight() : 0); + setPopupPosition(x, y); + } + + @Override + public void show() { + super.show(); + setCenterPosition(); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelBottomCentered.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,50 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.event.logical.shared.ResizeEvent; +import com.google.gwt.event.logical.shared.ResizeHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.Widget; + +public class PopupPanelTopCentered extends PopupPanel { + public PopupPanelTopCentered() { + super(); + init(); + } + + public PopupPanelTopCentered(boolean autohide, boolean modal) { + super(autohide, modal); + init(); + } + + public PopupPanelTopCentered(boolean autohide) { + super(autohide); + init(); + } + + private void init() { + setStyleName("k-popup-top-centered"); + addStyleName("k-opacity80"); + addStyleName("k-box-10shadow"); + addStyleName("k-bottom-10corners"); + Window.addResizeHandler(new ResizeHandler() { + @Override + public void onResize(ResizeEvent event) { + setCenterPosition(); + } + }); + } + + public void setCenterPosition() { + Widget widget = getWidget(); + int x = (Window.getClientWidth() - (widget != null ? getWidget().getOffsetWidth() : 0)) / 2; + int y = 0; + setPopupPosition(x, y); + } + + @Override + public void show() { + super.show(); + setCenterPosition(); + } +} Property changes on: trunk/src/main/java/cc/kune/common/client/ui/PopupPanelTopCentered.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/common/client/utils/Location.java (from rev 1176, trunk/src/main/java/cc/kune/core/client/utils/Location.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/Location.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/Location.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,148 @@ +/* + * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + \*/ +package cc.kune.common.client.utils; + +import java.util.HashMap; +import java.util.Map; + +public class Location { + private String hash; + private String host; + private String hostName; + private String href; + private String path; + private String port; + private String protocol; + private String queryString; + private HashMap<String, String> paramMap; + + /** + * sample: #site.docs.3.1 + **/ + public String getHash() { + return hash; + } + + /** + * sample: locahost:8080 + * + * @return + */ + public String getHost() { + return host; + } + + /** + * sample: locahost + * + * @return + */ + public String getHostName() { + return hostName; + } + + /** + * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO + **/ + public String getHref() { + return href; + } + + public String getParameter(final String name) { + return paramMap.get(name); + } + + public Map<String, String> getParameterMap() { + return paramMap; + } + + /** + * sample: /ws/ + * + * @return + */ + public String getPath() { + return path; + } + + public String getPort() { + return port; + } + + public String getProtocol() { + return protocol; + } + + /** + * sample: ?locale=en&log_level=INFO + * + * @return + */ + public String getQueryString() { + return queryString; + } + + protected void setHash(final String hash) { + this.hash = hash; + } + + protected void setHost(final String host) { + this.host = host; + } + + protected void setHostName(final String hostName) { + this.hostName = hostName; + } + + protected void setHref(final String href) { + this.href = href; + } + + protected void setPath(final String path) { + this.path = path; + } + + protected void setPort(final String port) { + this.port = port; + } + + protected void setProtocol(final String protocol) { + this.protocol = protocol; + } + + protected void setQueryString(final String queryString) { + this.queryString = queryString; + paramMap = new HashMap<String, String>(); + + if (queryString != null && queryString.length() > 1) { + String qs = queryString.substring(1); + String[] kvPairs = qs.split("&"); + for (String kvPair : kvPairs) { + String[] kv = kvPair.split("="); + if (kv.length > 1) { + paramMap.put(kv[0], unescape(kv[1])); + } else { + paramMap.put(kv[0], ""); + } + } + } + } + + private native String unescape(String val) /*-{ + return unescape(val); + }-*/; + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java (from rev 1176, trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,99 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.common.client.utils; + +import java.util.ArrayList; + +public class TextUtils { + + public static final String IN_DEVELOPMENT_P = " (in development)"; + public static final String IN_DEVELOPMENT = "In development"; + + // Original regexp from http://snippets.dzone.com/posts/show/452 + public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; + + // Original regexp from http://www.regular-expressions.info/email.html + public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?"; + + public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; + + public static final String NUM_REGEXP = "^[0-9]+$"; + + /* + * This method escape only some dangerous html chars + */ + public static String escapeHtmlLight(final String source) { + if (source == null) { + return null; + } + String result = source; + result = result.replaceAll("&", "&"); + result = result.replaceAll("\"", """); + // text = text.replaceAll("\'", "'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + return result; + } + + public static String generateHtmlLink(final String href, final String text) { + return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; + } + + public static ArrayList<String> splitTags(final String tagsString) { + final ArrayList<String> tagsList = new ArrayList<String>(); + String tagsCopy = tagsString; + // remove commas and quotes + if (tagsString == null) { + return tagsList; + } + tagsCopy = tagsCopy.replaceAll(",", " "); + tagsCopy = tagsCopy.replaceAll("\"", ""); + tagsCopy = tagsCopy.replaceAll("\'", ""); + final String[] splitted = tagsCopy.split("\\s+"); + for (String tag : splitted) { + tag = tag.replaceAll("\\s$", ""); + if (tag.length() > 0) { + tagsList.add(tag); + } + } + return tagsList; + } + + /* + * This method unescape only some dangerous html chars for use in GWT Html + * widget for instance + */ + public static String unescape(final String source) { + if (source == null) { + return null; + } + String result = source; + result = result.replaceAll("&", "&"); + result = result.replaceAll(""", "\""); + result = result.replaceAll("'", "\'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + return result; + } + + public TextUtils() { + } + +} Property changes on: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java (from rev 1176, trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/utils/WindowUtils.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,65 @@ +/* + * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cc.kune.common.client.utils; + +public class WindowUtils { + + public static Location getLocation() { + Location result = new Location(); + result.setHash(getHash()); + result.setHost(getHost()); + result.setHostName(getHostName()); + result.setHref(getHref()); + result.setPath(getPath()); + result.setPort(getPort()); + result.setProtocol(getProtocol()); + result.setQueryString(getQueryString()); + return result; + } + + private static native String getHash() /*-{ + return $wnd.location.hash; + }-*/; + + private static native String getHost() /*-{ + return $wnd.location.host; + }-*/; + + private static native String getHostName() /*-{ + return $wnd.location.hostname; + }-*/; + + private static native String getHref() /*-{ + return $wnd.location.href; + }-*/; + + private static native String getPath() /*-{ + return $wnd.location.pathname; + }-*/; + + private static native String getPort() /*-{ + return $wnd.location.port; + }-*/; + + private static native String getProtocol() /*-{ + return $wnd.location.protocol; + }-*/; + + private static native String getQueryString() /*-{ + return $wnd.location.search; + }-*/; + +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css (rev 0) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,130 @@ +.k-popup-top-centered { + +} + +.k-popup-bottom-centered { + +} + +.k-floatleft { + float: left; +} + +.k-floatright { + float: right; +} + +.k-pointer { + cursor: pointer; + cursor: hand; +} + +.k-opacity80 { + kfilter: alpha(opacity = 80); + -moz-opacity: 0.80; + -khtml-opacity: 0.80; + opacity: 0.80; +} + +.k-box-5shadow { + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); +} + +.k-box-10shadow { + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5); +} + +.k-bottom-5corners { + -webkit-border-bottom-right-radius: 5px; + -moz-border-radius-bottomright: 5px; + border-bottom-right-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; +} + +.k-bottom-10corners { + -webkit-border-bottom-right-radius: 10px; + -moz-border-radius-bottomright: 10px; + border-bottom-right-radius: 10px; + -webkit-border-bottom-left-radius: 10px; + -moz-border-radius-bottomleft: 10px; + border-bottom-left-radius: 10px; +} + +.k-top-5corners { + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; +} + +.k-top-10corners { + -webkit-border-top-right-radius: 10px; + -moz-border-radius-topright: 10px; + border-top-right-radius: 10px; + -webkit-border-top-left-radius: 10px; + -moz-border-radius-topleft: 10px; + border-top-left-radius: 10px; +} + +.k-2corners { + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} + +.k-3corners { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.k-5corners { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.k-10corners { + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; +} + +.k-dialog-outerp { + background-color: #552200; +} + +.k-dialog-title { + color: #552200; + font-size: 20px; + font-weight: bold; +} + +.k-dialog-innerp { + background-color: #e7caba; + border: solid 1px #F2F2F2; +} + +.k-dialog-firstBtn { + float: left; +} + +.k-dialog-secondBtn { + float: right; +} + +.k-z10000 { + z-index: 10000; +} + +.k-z1000 { + z-index: 1000; +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/common/public/kune-common.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,30 +1,29 @@ <?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"> - <!-- source / public / etc ==================================== --> - <!-- 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" /> - <source path="shared" /> - <public path="public" /> - <!-- Dependencies ============================================= --> - <inherits name="com.google.gwt.user.User" /> - <!-- <inherits name='com.mvp4g.Mvp4gModule' /> --> - <inherits name="cc.kune.core.ws.armor.WsArmor" /> - <inherits name="cc.kune.msgs.KuneMsgs" /> - <inherits name="org.ourproject.common.Common" /> - <inherits name="com.extjs.gxt.ui.GXT" /> - <inherits name="com.calclab.suco.Suco" /> - <!-- gwt-platform ============================================= --> - <inherits name='com.gwtplatform.mvp.Mvp' /> - <define-configuration-property name="gin.ginjector" - is-multi-valued="false" /> - <set-configuration-property name="gin.ginjector" - value="cc.kune.core.client.CoreGinjector" /> - <!-- Styles =================================================== --> - <stylesheet src="ws.css" /> - <stylesheet src="fontface/stylesheet.css" /> - <!-- Entrypoint =============================================== --> - <entry-point class="cc.kune.core.client.KuneEntryPoint" /> + <!-- source / public / etc ==================================== --> + <!-- 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" /> + <source path="shared" /> + <public path="public" /> + <!-- Dependencies ============================================= --> + <inherits name="com.google.gwt.user.User" /> + <!-- <inherits name='com.mvp4g.Mvp4gModule' /> --> + <inherits name="cc.kune.core.ws.armor.WsArmor" /> + <inherits name="cc.kune.msgs.KuneMsgs" /> + <inherits name="cc.kune.common.KuneCommon" /> + <inherits name="org.ourproject.common.Common" /> + <inherits name="com.extjs.gxt.ui.GXT" /> + <inherits name="com.calclab.suco.Suco" /> + <!-- gwt-platform ============================================= --> + <inherits name='com.gwtplatform.mvp.Mvp' /> + <define-configuration-property name="gin.ginjector" + is-multi-valued="false" /> + <set-configuration-property name="gin.ginjector" + value="cc.kune.core.client.CoreGinjector" /> + <!-- Styles =================================================== --> + <stylesheet src="ws.css" /> + <stylesheet src="fontface/stylesheet.css" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -28,13 +28,13 @@ import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.core.ws.armor.client.WsArmor; import cc.kune.core.ws.armor.client.WsArmorImpl; -import cc.kune.msgs.client.panel.UserMessagesPanel; -import cc.kune.msgs.client.panel.UserMessagesPresenter; +import cc.kune.msgs.client.UserMessagesPanel; +import cc.kune.msgs.client.UserMessagesPresenter; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.SimpleEventBus; import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.DefaultEventBus; import com.gwtplatform.mvp.client.DefaultProxyFailureHandler; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.RootPresenter; import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter; @@ -51,7 +51,7 @@ */ @Override protected void configure() { - bind(EventBus.class).to(DefaultEventBus.class).in(Singleton.class); + bind(EventBus.class).to(SimpleEventBus.class).in(Singleton.class); bind(PlaceManager.class).to(CorePlaceManager.class).in(Singleton.class); bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class); bind(RootPresenter.class).asEagerSingleton(); Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -9,10 +9,10 @@ import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.inject.client.AsyncProvider; import com.google.gwt.inject.client.GinModules; import com.google.gwt.inject.client.Ginjector; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.proxy.PlaceManager; import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,7 +1,7 @@ package cc.kune.core.client.cookies; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -19,8 +19,7 @@ */ package cc.kune.core.client.errors; -import org.ourproject.common.client.notify.NotifyLevel; - +import cc.kune.common.client.noti.NotifyLevel; import cc.kune.core.client.notify.alerts.AlertEvent; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; @@ -31,9 +30,9 @@ import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.proxy.PlaceManager; public class ErrorHandler { Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -19,7 +19,7 @@ */ package cc.kune.core.client.i18n; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; public class I18nTranslationServiceMocked extends I18nTranslationService { Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -22,20 +22,20 @@ import java.util.Date; import java.util.HashMap; +import cc.kune.common.client.utils.Location; +import cc.kune.common.client.utils.TextUtils; +import cc.kune.common.client.utils.WindowUtils; import cc.kune.core.client.rpcservices.I18nServiceAsync; import cc.kune.core.client.state.Session; -import cc.kune.core.client.utils.Location; -import cc.kune.core.client.utils.TextUtils; -import cc.kune.core.client.utils.WindowUtils; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; public class I18nUITranslationService extends I18nTranslationService { private HashMap<String, String> lexicon; Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -19,8 +19,11 @@ */ package cc.kune.core.client.init; -import org.ourproject.common.client.notify.NotifyLevel; +import org.adamtacy.client.ui.effects.events.EffectCompletedEvent; +import org.adamtacy.client.ui.effects.events.EffectCompletedHandler; +import org.adamtacy.client.ui.effects.examples.Fade; +import cc.kune.common.client.noti.NotifyLevel; import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.rpcservices.SiteServiceAsync; @@ -30,6 +33,7 @@ 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.event.shared.EventBus; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; @@ -37,7 +41,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; public class AppStarterDefault implements AppStarter { private final Session session; @@ -85,8 +88,18 @@ } private void hideInitialPanels() { - RootPanel.get("kuneinitialcurtain").setVisible(false); - RootPanel.get("kuneloading").setVisible(false); + final RootPanel curtain = RootPanel.get("kuneinitialcurtain"); + Fade anim = new Fade(curtain.getElement()); + anim.setDuration(3); + anim.addEffectCompletedHandler(new EffectCompletedHandler() { + @Override + public void onEffectCompleted(EffectCompletedEvent event) { + curtain.setVisible(false); + RootPanel.get("kuneloading").setVisible(false); + } + }); + anim.play(); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, "Starting")); } @Override @@ -98,9 +111,7 @@ @Override public void execute() { hideInitialPanels(); - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, "Started")); - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, - "Started closeable. Started closeable. Started closeable. Started closeable", true)); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, "Success", "App Started.", true)); } }); } Modified: trunk/src/main/java/cc/kune/core/client/notify/alerts/AlertEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/alerts/AlertEvent.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/alerts/AlertEvent.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -3,84 +3,79 @@ import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; - -import com.gwtplatform.mvp.client.HasEventBus; import com.google.gwt.event.shared.HasHandlers; -public class AlertEvent extends GwtEvent<AlertEvent.AlertHandler> { +@Deprecated +public class AlertEvent extends GwtEvent<AlertEvent.AlertHandler> { - public interface HasAlertHandlers extends HasHandlers { - HandlerRegistration addAlertHandler(AlertHandler handler); - } + public interface HasAlertHandlers extends HasHandlers { + HandlerRegistration addAlertHandler(AlertHandler handler); + } - public interface AlertHandler extends EventHandler { - public void onAlert(AlertEvent event); - } + public interface AlertHandler extends EventHandler { + public void onAlert(AlertEvent event); + } - private static final Type<AlertHandler> TYPE = new Type<AlertHandler>(); + private static final Type<AlertHandler> TYPE = new Type<AlertHandler>(); - public static void fire(HasEventBus source, java.lang.String title, java.lang.String message) { - source.fireEvent(new AlertEvent(title, message)); - } + public static void fire(HasHandlers source, java.lang.String title, java.lang.String message) { + source.fireEvent(new AlertEvent(title, message)); + } - public static Type<AlertHandler> getType() { - return TYPE; - } + public static Type<AlertHandler> getType() { + return TYPE; + } - private final java.lang.String title; - private final java.lang.String message; + private final java.lang.String title; + private final java.lang.String message; - public AlertEvent(java.lang.String title, java.lang.String message) { - this.title = title; - this.message = message; - } + public AlertEvent(java.lang.String title, java.lang.String message) { + this.title = title; + this.message = message; + } - @Override - public Type<AlertHandler> getAssociatedType() { - return TYPE; - } + @Override + public Type<AlertHandler> getAssociatedType() { + return TYPE; + } - public java.lang.String getTitle() { - return title; - } + public java.lang.String getTitle() { + return title; + } - public java.lang.String getMessage() { - return message; - } + public java.lang.String getMessage() { + return message; + } - @Override - protected void dispatch(AlertHandler handler) { - handler.onAlert(this); - } + @Override + protected void dispatch(AlertHandler handler) { + handler.onAlert(this); + } - @Override - public boolean equals(Object other) { - if (other != null && other.getClass().equals(this.getClass())) { - AlertEvent o = (AlertEvent) other; - return true - && ((o.title == null && this.title == null) || (o.title != null && o.title.equals(this.title))) - && ((o.message == null && this.message == null) || (o.message != null && o.message.equals(this.message))) - ; + @Override + public boolean equals(Object other) { + if (other != null && other.getClass().equals(this.getClass())) { + AlertEvent o = (AlertEvent) other; + return true + && (o.title == null && this.title == null || o.title != null && o.title.equals(this.title)) + && (o.message == null && this.message == null || o.message != null + && o.message.equals(this.message)); + } + return false; } - return false; - } - @Override - public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + getClass().hashCode(); - hashCode = (hashCode * 37) + (title == null ? 1 : title.hashCode()); - hashCode = (hashCode * 37) + (message == null ? 1 : message.hashCode()); - return hashCode; - } + @Override + public int hashCode() { + int hashCode = 23; + hashCode = hashCode * 37 + getClass().hashCode(); + hashCode = hashCode * 37 + (title == null ? 1 : title.hashCode()); + hashCode = hashCode * 37 + (message == null ? 1 : message.hashCode()); + return hashCode; + } - @Override - public String toString() { - return "AlertEvent[" - + title - + "," - + message - + "]"; - } + @Override + public String toString() { + return "AlertEvent[" + title + "," + message + "]"; + } } Modified: trunk/src/main/java/cc/kune/core/client/notify/alerts/UserAlerterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/alerts/UserAlerterPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/alerts/UserAlerterPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -3,9 +3,9 @@ import cc.kune.core.client.notify.alerts.UserAlerterPresenter.UserAlerterProxy; import cc.kune.core.client.notify.alerts.UserAlerterPresenter.UserAlerterView; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,16 +1,16 @@ package cc.kune.core.client.notify.confirm; -import org.ourproject.common.client.notify.ConfirmationAsk; - +import cc.kune.common.client.noti.ConfirmAskEvent; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmProxy; import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.annotations.ProxyEvent; import com.gwtplatform.mvp.client.proxy.Proxy; public class UserConfirmPresenter extends Presenter<UserConfirmView, UserConfirmProxy> { @@ -19,8 +19,7 @@ } public interface UserConfirmView extends View { - - public void confirmationAsk(ConfirmationAsk<?> ask); + public void confirmAsk(ConfirmAskEvent ask); } @Inject @@ -28,6 +27,11 @@ super(eventBus, view, proxy); } + @ProxyEvent + public void onConfirmAsk(ConfirmAskEvent event) { + getView().confirmAsk(event); + } + @Override protected void revealInParent() { RootPanel.get().add(getWidget()); Deleted: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,27 +0,0 @@ -package cc.kune.core.client.notify.confirm; - -import org.ourproject.common.client.notify.ConfirmationAsk; - -import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; - -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewImpl; - -public class UserConfirmViewImpl extends ViewImpl implements UserConfirmView { - @Inject - public UserConfirmViewImpl() { - } - - @Override - public Widget asWidget() { - return null; - } - - @Override - public void confirmationAsk(final ConfirmationAsk<?> ask) { - // TODO Auto-generated method stub - - } - -} Copied: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java (from rev 1178, trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,26 @@ +package cc.kune.core.client.notify.confirm; + +import cc.kune.common.client.noti.ConfirmAskEvent; +import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView; + +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class UserConfirmViewImpl2 extends ViewImpl implements UserConfirmView { + @Inject + public UserConfirmViewImpl2() { + } + + @Override + public Widget asWidget() { + return null; + } + + @Override + public void confirmAsk(final ConfirmAskEvent ask) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl2.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,12 +1,10 @@ package cc.kune.core.client.notify.msgs; -import org.ourproject.common.client.notify.NotifyLevel; - import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierProxy; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.PopupView; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; @@ -20,7 +18,7 @@ } public interface UserNotifierView extends PopupView { - public void notify(NotifyLevel level, String message, Boolean closeable); + public void notify(UserNotifyEvent event); } @Inject @@ -30,7 +28,7 @@ @ProxyEvent public void onUserNotify(UserNotifyEvent event) { - getView().notify(event.getLevel(), event.getMessage(), event.getCloseable()); + getView().notify(event); } @Override Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifierViewImpl.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,21 +1,19 @@ package cc.kune.core.client.notify.msgs; -import org.ourproject.common.client.notify.NotifyLevel; - +import cc.kune.common.client.ui.PopupPanelBottomCentered; import cc.kune.core.client.notify.msgs.UserNotifierPresenter.UserNotifierView; -import cc.kune.msgs.client.msgs.UserMessageLevel; -import cc.kune.msgs.client.panel.UserMessagesPanel; -import cc.kune.msgs.client.panel.UserMessagesPresenter; +import cc.kune.msgs.client.CloseCallback; +import cc.kune.msgs.client.UserMessagesPanel; +import cc.kune.msgs.client.UserMessagesPresenter; -import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.PopupViewImpl; public class UserNotifierViewImpl extends PopupViewImpl implements UserNotifierView { private final UserMessagesPresenter msgs; - private final PopupPanel popup; + private final PopupPanelBottomCentered popup; @Inject public UserNotifierViewImpl(EventBus eventBus, UserMessagesPresenter msgs, UserMessagesPanel panel) { @@ -23,10 +21,9 @@ this.msgs = msgs; msgs.init(panel); panel.setWidth("370px"); - popup = new PopupPanel(false, false); + popup = new PopupPanelBottomCentered(false, false); + popup.addStyleName("k-z10000"); popup.add(panel); - popup.setPopupPosition(0, 0); - popup.setStyleName("k-user-notif-popup"); popup.show(); } @@ -36,23 +33,14 @@ } @Override - public void notify(final NotifyLevel level, final String message, Boolean closeable) { - switch (level) { - case error: - msgs.add(UserMessageLevel.error, message, closeable); - break; - case important: - msgs.add(UserMessageLevel.important, message, closeable); - break; - case info: - msgs.add(UserMessageLevel.info, message, closeable); - break; - case veryImportant: - msgs.add(UserMessageLevel.veryImportant, message, false); - break; - default: - break; - } + public void notify(UserNotifyEvent event) { + msgs.add(event.getLevel(), event.getTitle(), event.getMessage(), event.getCloseable(), new CloseCallback() { + @Override + public void onClose() { + popup.setCenterPosition(); + } + }); + popup.setCenterPosition(); } } Modified: trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/msgs/UserNotifyEvent.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,5 +1,7 @@ package cc.kune.core.client.notify.msgs; +import cc.kune.common.client.noti.NotifyLevel; + import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; @@ -18,41 +20,57 @@ private static final Type<UserNotifyHandler> TYPE = new Type<UserNotifyHandler>(); - public static void fire(HasEventBus source, org.ourproject.common.client.notify.NotifyLevel level, - java.lang.String message, Boolean closeable) { - source.fireEvent(new UserNotifyEvent(level, message, closeable)); + public static void fire(HasEventBus source, NotifyLevel level, java.lang.String title, java.lang.String message, + Boolean closeable) { + source.fireEvent(new UserNotifyEvent(level, title, message, closeable)); } - public static void fire(HasEventBus source, org.ourproject.common.client.notify.NotifyLevel level, - java.lang.String message) { - source.fireEvent(new UserNotifyEvent(level, message)); + public static void fire(HasEventBus source, NotifyLevel level, java.lang.String title, java.lang.String message) { + source.fireEvent(new UserNotifyEvent(level, title, message)); } + public static void fire(HasEventBus source, NotifyLevel level, java.lang.String message, Boolean closeable) { + source.fireEvent(new UserNotifyEvent(level, "", message, closeable)); + } + + public static void fire(HasEventBus source, NotifyLevel level, java.lang.String message) { + source.fireEvent(new UserNotifyEvent(level, "", message)); + } + public static Type<UserNotifyHandler> getType() { return TYPE; } - private final org.ourproject.common.client.notify.NotifyLevel level; + private final NotifyLevel level; private final java.lang.String message; + private final java.lang.String title; private final Boolean closeable; - public UserNotifyEvent(org.ourproject.common.client.notify.NotifyLevel level, java.lang.String message, - Boolean closeable) { + public UserNotifyEvent(NotifyLevel level, java.lang.String title, java.lang.String message, Boolean closeable) { this.level = level; + this.title = title; this.message = message; this.closeable = closeable; } - public UserNotifyEvent(org.ourproject.common.client.notify.NotifyLevel level, java.lang.String message) { - this(level, message, false); + public UserNotifyEvent(NotifyLevel level, java.lang.String message) { + this(level, "", message, false); } + public UserNotifyEvent(NotifyLevel level, java.lang.String title, java.lang.String message) { + this(level, title, message, false); + } + + public UserNotifyEvent(NotifyLevel level, java.lang.String message, Boolean closeable) { + this(level, "", message, closeable); + } + @Override public Type<UserNotifyHandler> getAssociatedType() { return TYPE; } - public org.ourproject.common.client.notify.NotifyLevel getLevel() { + public NotifyLevel getLevel() { return level; } @@ -60,6 +78,10 @@ return message; } + public java.lang.String getTitle() { + return title; + } + @Override protected void dispatch(UserNotifyHandler handler) { handler.onUserNotify(this); @@ -69,51 +91,4 @@ return closeable; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (closeable == null ? 0 : closeable.hashCode()); - result = prime * result + (level == null ? 0 : level.hashCode()); - result = prime * result + (message == null ? 0 : message.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - UserNotifyEvent other = (UserNotifyEvent) obj; - if (closeable == null) { - if (other.closeable != null) { - return false; - } - } else if (!closeable.equals(other.closeable)) { - return false; - } - if (level != other.level) { - return false; - } - if (message == null) { - if (other.message != null) { - return false; - } - } else if (!message.equals(other.message)) { - return false; - } - return true; - } - - @Override - public String toString() { - return "UserNotifyEvent [level=" + level + ", message=" + message + ", closeable=" + closeable + "]"; - } - } Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -3,8 +3,8 @@ import cc.kune.core.client.i18n.I18nReadyEvent; import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.PopupView; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; Modified: trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/notify/spiner/SpinerViewImpl.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -4,6 +4,7 @@ import cc.kune.core.ws.armor.client.WsArmor; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -12,7 +13,6 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.PopupViewWithUiHandlers; import com.gwtplatform.mvp.client.UiHandlers; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -5,8 +5,8 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.HasUiHandlers; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -26,9 +26,9 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateAbstractDTO; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; public class ContentProviderDefault implements ContentProvider { private final ContentServiceAsync server; Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -44,9 +44,9 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.google.inject.Provider; -import com.gwtplatform.mvp.client.EventBus; public class SessionDefault implements Session { private String userHash; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -37,8 +37,8 @@ import com.calclab.suco.client.events.Listener2; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; Copied: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.java (from rev 1178, trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmViewImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,79 @@ +package cc.kune.core.client.ui.dialogs; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HasDirectionalText; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.HasWidgets.ForIsWidget; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +public class TwoButtonsDialog extends Composite implements TwoButtonsView { + + private static TwoButtonsDialogUiBinder uiBinder = GWT.create(TwoButtonsDialogUiBinder.class); + @UiField + InlineLabel title; + @UiField + Button firstBtn; + @UiField + Button secondBtn; + @UiField + VerticalPanel vp; + + interface TwoButtonsDialogUiBinder extends UiBinder<Widget, TwoButtonsDialog> { + } + + public TwoButtonsDialog() { + initWidget(uiBinder.createAndBindUi(this)); + title.ensureDebugId("k-ucvi-title"); + firstBtn.ensureDebugId("k-ucvi-accept-btn"); + secondBtn.ensureDebugId("k-ucvi-cancel-btn"); + } + + public void setTitleId(String id) { + title.ensureDebugId(id); + } + + public void setFirstBtnId(String id) { + firstBtn.ensureDebugId(id); + } + + public void setSecondBtnId(String id) { + secondBtn.ensureDebugId(id); + } + + @Override + public HasDirectionalText getTitleText() { + return title; + } + + @Override + public HasClickHandlers getSecondBtn() { + return secondBtn; + } + + @Override + public HasClickHandlers getFirstBtn() { + return firstBtn; + } + + @Override + public ForIsWidget getInnerPanel() { + return vp; + } + + @Override + public HasText getFirstBtnText() { + return firstBtn; + } + + @Override + public HasText getSecondBtnText() { + return secondBtn; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.ui.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,17 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:p1="urn:import:gxt.visual.ui.client.implementations"> + <g:VerticalPanel spacing="12" + addStyleNames="k-dialog-outerp, k-bottom-10corners"> + <g:SimplePanel> + <g:VerticalPanel ui:field="vp" + addStyleNames="k-dialog-innerp, k-3corners" spacing="10"> + <g:InlineLabel ui:field="title" addStyleNames="k-dialog-title" /> + </g:VerticalPanel> + </g:SimplePanel> + <g:FlowPanel> + <g:Button ui:field="firstBtn" addStyleNames="k-dialog-firstBtn" /> + <g:Button ui:field="secondBtn" addStyleNames="k-dialog-secondBtn" /> + </g:FlowPanel> + </g:VerticalPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsDialog.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsView.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,22 @@ +package cc.kune.core.client.ui.dialogs; + +import com.google.gwt.event.dom.client.HasClickHandlers; +import com.google.gwt.user.client.ui.HasDirectionalText; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.HasWidgets.ForIsWidget; + +public interface TwoButtonsView { + + HasText getFirstBtnText(); + + HasText getSecondBtnText(); + + HasClickHandlers getSecondBtn(); + + HasClickHandlers getFirstBtn(); + + HasDirectionalText getTitleText(); + + ForIsWidget getInnerPanel(); + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/ui/dialogs/TwoButtonsView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,7 +1,7 @@ package cc.kune.core.client.ws; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.proxy.PlaceManagerImpl; import com.gwtplatform.mvp.client.proxy.PlaceRequest; import com.gwtplatform.mvp.client.proxy.TokenFormatter; Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -3,8 +3,8 @@ import cc.kune.core.client.i18n.I18nReadyEvent; import cc.kune.core.client.init.AppStarter; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.gwtplatform.mvp.client.EventBus; import com.gwtplatform.mvp.client.Presenter; import com.gwtplatform.mvp.client.View; import com.gwtplatform.mvp.client.annotations.NameToken; Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-01-10 04:43:49 UTC (rev 1179) @@ -6,6 +6,7 @@ font-family: 'Inconsolata', Arial; font-size: small; margin: 5px; + overflow: hidden; } * { @@ -348,16 +349,3 @@ font-weight: bold; padding: 0 5px 0 5px; } - -.k-floatleft { - float: left; -} - -.k-floatright { - float: right; -} - -.k-pointer { - cursor: pointer; - cursor: hand; -} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/msgs/KuneMsgs.gwt.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -2,7 +2,8 @@ <module> <!-- Inherit the core Web Toolkit stuff. --> <inherits name='com.google.gwt.user.User' /> - <inherits name="org.adamtacy.GWTEffects"></inherits> + <inherits name="org.adamtacy.GWTEffects"></inherits> + <inherits name="cc.kune.common.KuneCommon" /> <!-- Inherit the default GWT style sheet. You can change --> <!-- the theme of your GWT application by uncommenting --> <!-- any one of the following lines. --> @@ -11,7 +12,8 @@ <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> <!-- Other module inherits --> <!-- Specify the app entry point class. --> -<!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint' />--> + <!-- <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint' + /> --> <!-- Specify the paths for translatable code --> <source path='client' /> <public path="public" /> Deleted: trunk/src/main/java/cc/kune/msgs/KuneMsgsTests.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/KuneMsgsTests.gwt.xml 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/msgs/KuneMsgsTests.gwt.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module rename-to='kune_messages'> - <!-- Inherit the core Web Toolkit stuff. --> - <inherits name='com.google.gwt.user.User' /> - <inherits name="org.adamtacy.GWTEffects"></inherits> - <!-- Inherit the default GWT style sheet. You can change --> - <!-- the theme of your GWT application by uncommenting --> - <!-- any one of the following lines. --> - <!-- <inherits name='com.google.gwt.user.theme.standard.Standard'/> --> - <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> --> - <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> - <!-- Other module inherits --> - <!-- Specify the app entry point class. --> - <entry-point class='cc.kune.msgs.client.KuneMessagesSampleEntryPoint' /> - <!-- Specify the paths for translatable code --> - <source path='client' /> - <public path="public" /> - <stylesheet src="kune-message.css" /> -</module> \ No newline at end of file Added: trunk/src/main/java/cc/kune/msgs/client/CloseCallback.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/CloseCallback.java (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/CloseCallback.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,5 @@ +package cc.kune.msgs.client; + +public interface CloseCallback { + void onClose(); +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/msgs/client/CloseCallback.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/src/main/java/cc/kune/msgs/client/KuneMessagesSampleEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/KuneMessagesSampleEntryPoint.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/msgs/client/KuneMessagesSampleEntryPoint.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,54 +0,0 @@ -package cc.kune.msgs.client; - -import cc.kune.msgs.client.msgs.UserMessage; -import cc.kune.msgs.client.msgs.UserMessageLevel; -import cc.kune.msgs.client.panel.UserMessagesPanel; -import cc.kune.msgs.client.panel.UserMessagesPresenter; - -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.Timer; -import com.google.gwt.user.client.ui.PopupPanel; - -/** - * Entry point classes define <code>onModuleLoad()</code>. - */ -public class KuneMessagesSampleEntryPoint implements EntryPoint { - - /** - * This is the entry point method. - */ - @Override - public void onModuleLoad() { - UserMessagesPanel panel = new UserMessagesPanel(); - UserMessage.setFadeMills(3000); - UserMessage.setCloseTitle("Close message"); - panel.setWidth("422px"); - final UserMessagesPresenter presenter = new UserMessagesPresenter(); - presenter.init(panel); - presenter.add(UserMessageLevel.info, "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", false); - presenter.add(UserMessageLevel.error, "Lorem ipsum dolor sit amet, consectetuer adipiscing elit", false); - Timer time = new Timer() { - @Override - public void run() { - presenter.add( - UserMessageLevel.error, - "Lorem <a href='/'>ipsum</a> dolor sit amet, consectetuer adipiscing elit. Lorem ipsum dolor sit amet, consectetuer adipiscing elit", - true); - } - }; - Timer time2 = new Timer() { - @Override - public void run() { - presenter.add(UserMessageLevel.important, "Lorem ", false); - presenter.add(UserMessageLevel.important, "Lorem ", true); - } - }; - time.schedule(1000); - time2.schedule(2000); - PopupPanel aPanel = new PopupPanel(); - aPanel.add(panel); - aPanel.setPopupPosition(0, 0); - aPanel.show(); - // RootPanel.get().add(aPanel); - } -} Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java (from rev 1178, trunk/src/main/java/cc/kune/msgs/client/msgs/UserMessage.java) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,126 @@ +package cc.kune.msgs.client; + +import org.adamtacy.client.ui.effects.events.EffectCompletedEvent; +import org.adamtacy.client.ui.effects.events.EffectCompletedHandler; +import org.adamtacy.client.ui.effects.examples.Fade; +import org.adamtacy.client.ui.effects.examples.Show; + +import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.msgs.client.resources.UserMessageImages; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HasText; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.InlineHTML; +import com.google.gwt.user.client.ui.PushButton; +import com.google.gwt.user.client.ui.Widget; + +public class UserMessage extends Composite implements HasText { + + private static int fadeMills = 5000; + private static MessageUiBinder uiBinder = GWT.create(MessageUiBinder.class); + private static String closeTitle = "Close"; + + @UiField + Image icon; + @UiField + InlineHTML label; + @UiField + PushButton close; + private final CloseCallback closeCallback; + + interface MessageUiBinder extends UiBinder<Widget, UserMessage> { + } + + public static void setCloseTitle(String title) { + closeTitle = title; + } + + public static void setFadeMills(int mills) { + fadeMills = mills; + } + + public UserMessage(NotifyLevel level, String title, String message, boolean closeable, CloseCallback closeCallback) { + this.closeCallback = closeCallback; + initWidget(uiBinder.createAndBindUi(this)); + label.setHTML((title != null && title.length() > 0 ? "<b>" + title + "</b><br/>" : "") + message); + close.setVisible(closeable); + close.setTitle(closeTitle); + if (!closeable) { + Timer time = new Timer() { + @Override + public void run() { + close(); + } + }; + time.schedule(fadeMills); + } + switch (level) { + case error: + icon.setResource(UserMessageImages.INST.error()); + break; + case important: + icon.setResource(UserMessageImages.INST.important()); + break; + case info: + icon.setResource(UserMessageImages.INST.info()); + break; + case veryImportant: + icon.setResource(UserMessageImages.INST.warning()); + break; + default: + break; + } + Show anim = new Show(this.getElement()); + anim.setDuration(0.5); + anim.play(); + } + + public UserMessage(String message, CloseCallback closeCallback) { + this("", message, false, closeCallback); + } + + public UserMessage(String title, String message, CloseCallback closeCallback) { + this(title, message, false, closeCallback); + } + + public UserMessage(String title, String message, boolean closeable, CloseCallback closeCallback) { + this(NotifyLevel.info, title, message, closeable, closeCallback); + } + + @Override + public void setText(String text) { + label.setText(text); + } + + @Override + public String getText() { + return label.getText(); + } + + @UiHandler("close") + void handleClick(ClickEvent e) { + close(); + } + + private void close() { + Fade fade = new Fade(this.getElement()); + fade.setDuration(0.7); + fade.play(); + fade.addEffectCompletedHandler(new EffectCompletedHandler() { + + @Override + public void onEffectCompleted(EffectCompletedEvent event) { + removeFromParent(); + closeCallback.onClose(); + } + }); + } + +} Property changes on: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml (from rev 1178, trunk/src/main/java/cc/kune/msgs/client/msgs/UserMessage.ui.xml) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,22 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='img' + type='cc.kune.msgs.client.resources.UserMessageImages' /> + <g:HorizontalPanel verticalAlignment="ALIGN_MIDDLE" + height="42px" addStyleNames="k-msg, k-opacity80, k-3corners"> + <g:SimplePanel addStyleNames="k-msg-icon"> + <g:Image width="100%" ui:field="icon" height="100%" /> + </g:SimplePanel> + <g:Cell width="100%"> + <g:InlineHTML ui:field="label" width="100%" + styleName="k-msg-label" /> + </g:Cell> + <g:PushButton ui:field="close" styleName="k-msg-close" + width="22px"> + <g:upHoveringFace image='{img.removeGrey}' /> + <g:downFace image='{img.removeOver}' /> + <g:upFace image='{img.remove}' /> + </g:PushButton> + </g:HorizontalPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/msgs/client/UserMessage.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java (from rev 1178, trunk/src/main/java/cc/kune/msgs/client/panel/UserMessagesPanel.java) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,36 @@ +package cc.kune.msgs.client; + +import org.adamtacy.client.ui.effects.examples.SlideUp; + +import cc.kune.common.client.noti.NotifyLevel; +import cc.kune.msgs.client.UserMessagesPresenter.UserMessagesView; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +public class UserMessagesPanel extends Composite implements UserMessagesView { + + private static MessagesPanelUiBinder uiBinder = GWT.create(MessagesPanelUiBinder.class); + @UiField + VerticalPanel vp; + + interface MessagesPanelUiBinder extends UiBinder<Widget, UserMessagesPanel> { + } + + public UserMessagesPanel() { + initWidget(uiBinder.createAndBindUi(this)); + } + + @Override + public void add(NotifyLevel level, String title, String message, boolean closeable, CloseCallback closeCallback) { + UserMessage msg = new UserMessage(level, title, message, closeable, closeCallback); + vp.add(msg); + SlideUp anim = new SlideUp(msg.getElement()); + anim.setDuration(.5); + anim.play(); + } +} Property changes on: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml (from rev 1178, trunk/src/main/java/cc/kune/msgs/client/panel/UserMessagesPanel.ui.xml) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,9 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <g:VerticalPanel verticalAlignment="ALIGN_TOP" + ui:field="vp" width="100%" height="" + addStyleNames="k-msg-panel, k-opacity80, k-box-10shadow, k-top-10corners" + spacing="10"> + </g:VerticalPanel> +</ui:UiBinder> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java (from rev 1178, trunk/src/main/java/cc/kune/msgs/client/panel/UserMessagesPresenter.java) =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -0,0 +1,23 @@ +package cc.kune.msgs.client; + +import cc.kune.common.client.noti.NotifyLevel; + +public class UserMessagesPresenter { + + private UserMessagesView view; + + public interface UserMessagesView { + void add(NotifyLevel level, String title, String message, boolean closable, CloseCallback callback); + } + + public UserMessagesPresenter() { + } + + public void init(UserMessagesView view) { + this.view = view; + } + + public void add(NotifyLevel level, String title, String message, boolean closable, CloseCallback closeCallback) { + view.add(level, title, message, closable, closeCallback); + } +} Property changes on: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/msgs/public/kune-message.css =================================================================== --- trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-01-10 04:43:49 UTC (rev 1179) @@ -1,12 +1,5 @@ .k-msg-panel { background-color: #892c00; - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - border-bottom-right-radius: 5px; - kfilter: alpha(opacity = 80); - -moz-opacity: 0.80; - -khtml-opacity: 0.80; - opacity: 0.80; } .k-msg-panel-title { @@ -18,28 +11,20 @@ .k-msg { margin: 0 5px; border: solid 1px #F2F2F2; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; background: #fff0e6; - color: #280b0b; - filter: alpha(opacity = 80); - -moz-opacity: 0.80; - -khtml-opacity: 0.80; - opacity: 0.80; - font-weight: bold; + color: #280b0b } .k-msg-close { position: relative; right: -14px; - top: 30px; + top: 0px; } .k-msg-icon { padding: 10px 10px 5px; } -.k-msg-label { +.k-msg-label { font-size: 17px; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -31,9 +31,9 @@ import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.common.client.utils.WindowUtils; import cc.kune.core.client.init.AppStarter; import cc.kune.core.client.state.Session; -import cc.kune.core.client.utils.WindowUtils; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -26,10 +26,10 @@ import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.client.utils.TextUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; 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 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -20,7 +20,7 @@ package org.ourproject.kune.chat.client.ctx.room; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; /** * Use TextUtils Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/ConfirmationAsk.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -2,6 +2,7 @@ import com.calclab.suco.client.events.Listener0; +@Deprecated public class ConfirmationAsk { private final String title; 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 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.user.client.ui.Frame; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; public class InsertLinkExtPresenter extends InsertLinkAbstractPresenter implements InsertLinkExt { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -5,7 +5,7 @@ import java.util.List; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.dto.ExtMediaDescripDTO; public class ExternalMediaRegistry extends ArrayList<ExtMediaDescripDTO> { 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 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -4,7 +4,7 @@ import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.allen_sauer.gwt.log.client.Log; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -5,7 +5,7 @@ import org.ourproject.kune.platf.client.ui.palette.SimplePalette; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.I18nTranslation; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -9,7 +9,7 @@ import org.ourproject.kune.platf.server.manager.impl.DefaultManager; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.domain.TagCloudResult; import cc.kune.core.shared.domain.TagCount; import cc.kune.domain.Content; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -28,8 +28,8 @@ import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.errors.DefaultException; -import cc.kune.core.client.utils.TextUtils; import cc.kune.domain.I18nLanguage; import cc.kune.domain.I18nTranslation; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -27,7 +27,7 @@ import org.ourproject.kune.workspace.client.search.SiteBottomTrayButton; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.i18n.I18nTranslationService; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -23,7 +23,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; import com.calclab.suco.client.events.Event0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -27,7 +27,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeSelector; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; 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 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -22,8 +22,8 @@ import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.utils.TextUtils; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -14,8 +14,8 @@ import com.calclab.suco.testing.events.MockedListener; import com.calclab.suco.testing.events.MockedListener0; import com.calclab.suco.testing.events.MockedListener2; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.gwtplatform.mvp.client.EventBus; public class StateManagerTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -6,7 +6,7 @@ import org.junit.Test; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; public class KuneStringUtilsTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2011-01-09 04:44:25 UTC (rev 1178) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2011-01-10 04:43:49 UTC (rev 1179) @@ -4,7 +4,7 @@ import org.junit.Test; -import cc.kune.core.client.utils.TextUtils; +import cc.kune.common.client.utils.TextUtils; public class TextUtilsTest { @Test