Author: ludovic
Date: 2008-02-25 20:59:05 +0100 (Mon, 25 Feb 2008)
New Revision: 7939
Added:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/pom.xml
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiService.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiServiceAsync.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/LoadingDialog.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/ModalMessageDialogBox.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiAsyncCallback.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiGWTDefaultApp.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/dialog/Dialog.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/resources/com/xpn/xwiki/gwt/api/Api.gwt.xml
Log:
Create xwiki platform web gwt branch for gwt 1.4 port
Copied: xwiki-platform/web/branches/xwiki-web-gwt-gwt14 (from rev 7925,
xwiki-platform/web/trunk/gwt)
Modified: xwiki-platform/web/branches/xwiki-web-gwt-gwt14/pom.xml
===================================================================
--- xwiki-platform/web/trunk/gwt/pom.xml 2008-02-24 14:18:01 UTC (rev
7925)
+++ xwiki-platform/web/branches/xwiki-web-gwt-gwt14/pom.xml 2008-02-25
19:59:05 UTC (rev 7939)
@@ -35,27 +35,17 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
- <version>1.3.3</version>
+ <version>1.4.61</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <version>1.3.3</version>
+ <version>1.4.61</version>
<!-- This JAR is used to generate JS files and shouldn't be included in
the server side
WAR -->
<scope>provided</scope>
</dependency>
- <!-- The GWT TK library is not in any Maven2 remote repository. For the
time being we
- have uploaded it in our custom Maven repository on
http://maven.xwiki.org. -->
<dependency>
- <groupId>gwttk</groupId>
- <artifactId>gwttk</artifactId>
- <version>0.2.2</version>
- <!-- This JAR is used to generate JS files and shouldn't be included in
the server side
- WAR -->
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
<version>${platform.core.version}</version>
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiService.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiService.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiService.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -102,6 +102,9 @@
public Dictionary getTranslation(String translationPage, String local)
throws XWikiGWTException;
+ public String convertHtml2XWiki(String text, String fullName) throws
XWikiGWTException;
+ public String convertXWiki2Html(String fullName) throws XWikiGWTException;
+ public String convertXWiki2Html(String text, String fullName) throws
XWikiGWTException;
/**
* Utility/Convinience class.
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiServiceAsync.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiServiceAsync.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/XWikiServiceAsync.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -122,4 +122,10 @@
void getTranslation(String translationPage, String local, AsyncCallback
async);
void getDocumentVersions(String pageName, int nb, int start, AsyncCallback
async);
+
+ void convertHtml2XWiki(String text, String fullName, AsyncCallback async);
+
+ void convertXWiki2Html(String fullName, AsyncCallback async);
+
+ void convertXWiki2Html(String text, String fullName, AsyncCallback async);
}
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/LoadingDialog.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/app/LoadingDialog.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/LoadingDialog.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -1,8 +1,10 @@
package com.xpn.xwiki.gwt.api.client.app;
-import asquare.gwt.tk.client.ui.ModalDialog;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.DialogBox;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.Window;
/** See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
@@ -28,7 +30,7 @@
public class LoadingDialog {
private XWikiGWTApp app;
- protected ModalDialog loadingPanel;
+ protected DialogBox loadingPanel;
private int currentRequest = 0;
private boolean disable = false;
@@ -47,13 +49,15 @@
public void startLoading() {
if (loadingPanel == null && !disable){
- loadingPanel = new ModalDialog();
+ loadingPanel = new DialogBox(true, true);
loadingPanel.addStyleName("dialog-loading");
- loadingPanel.add(new
Label(app.getTranslation("loading.loading_msg")));
+ FlowPanel panel = new FlowPanel();
+ panel.add(new Label(app.getTranslation("loading.loading_msg")));
String iconspinner =
app.getTranslation("loading.loading_icon_spinner");
if (iconspinner.equals("loading.loading_icon_spinner"))
iconspinner = XWikiGWTAppConstants.LOADING_ICON_SPINNER;
- loadingPanel.add(new Image(app.getSkinFile(iconspinner)));
+ panel.add(new Image(app.getSkinFile(iconspinner)));
+ loadingPanel.setWidget(panel);
}
if (loadingPanel != null){
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/ModalMessageDialogBox.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/app/ModalMessageDialogBox.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/ModalMessageDialogBox.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -1,6 +1,5 @@
package com.xpn.xwiki.gwt.api.client.app;
-import asquare.gwt.tk.client.ui.ModalDialog;
import com.google.gwt.user.client.ui.*;
/**
@@ -28,7 +27,7 @@
public class ModalMessageDialogBox {
private XWikiGWTApp app;
- private ModalDialog dialog = new ModalDialog();
+ private DialogBox dialog = new DialogBox(false, true);
public ModalMessageDialogBox() {
}
@@ -39,7 +38,7 @@
public ModalMessageDialogBox(XWikiGWTApp app, String title, String msg,
String styleName){
this.app = app;
- dialog.setCaption(title, false);
+ // dialog.setCaption(title, false);
if (styleName!=null) {
ScrollPanel scroll = new ScrollPanel();
scroll.add(new Label(msg));
@@ -53,9 +52,9 @@
}
class CloseListener implements ClickListener {
- private final ModalDialog m_dialog;
+ private final DialogBox m_dialog;
- public CloseListener(ModalDialog dialog)
+ public CloseListener(DialogBox dialog)
{
m_dialog = dialog;
}
@@ -68,11 +67,11 @@
}
class CloseButton extends Button {
- public CloseButton(ModalDialog dialog, String msg)
+ public CloseButton(DialogBox dialog, String msg)
{
super(msg);
addClickListener(new CloseListener(dialog));
}
}
-}
\ No newline at end of file
+}
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiAsyncCallback.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiAsyncCallback.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiAsyncCallback.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -1,6 +1,7 @@
package com.xpn.xwiki.gwt.api.client.app;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.Window;
/** See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiGWTDefaultApp.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiGWTDefaultApp.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/app/XWikiGWTDefaultApp.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -10,6 +10,9 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.core.client.GWT;
+import java.util.Map;
+import java.util.HashMap;
+
/**
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
@@ -37,6 +40,7 @@
protected LoadingDialog loadingDialog;
protected XWikiServiceAsync serviceInstance;
protected String name;
+ protected static Map _metaPropertiesMap = null;
public XWikiGWTDefaultApp() {
loadingDialog = new
com.xpn.xwiki.gwt.api.client.app.LoadingDialog(this);
@@ -54,23 +58,49 @@
this.name = name;
}
+ private static native Map getMetaProperties(Map map) /*-{
+ var metas = $wnd.document.getElementsByTagName("meta");
+ var n = metas.length;
+ for (var i = 0; i < n; ++i) {
+ var meta = metas[i];
+ var name = meta.getAttribute("name");
+ if (name && name == "gwt:property") {
+ var content = meta.getAttribute("content");
+ if (content) {
+ var name = content;
+ var value = "";
+ var eq = content.indexOf("=");
+ if (eq != -1) {
+ name = content.substring(0, eq);
+ value = content.substring(eq+1);
+ }
+ [EMAIL
PROTECTED]::put(Ljava/lang/Object;Ljava/lang/Object;)(name,value);
+ }
+ }
+ }
+ return map;
+ }-*/;
+
/**
* Native method in JavaScript to access gwt:property
*/
- public static native String getProperty(String name) /*-{
- return $wnd.__gwt_getMetaProperty(name);
- }-*/;
+ public static String getProperty(String name) {
+ if (_metaPropertiesMap == null) {
+ _metaPropertiesMap = getMetaProperties(new HashMap());
+ }
+ return (String) _metaPropertiesMap.get(name);
+ };
public String getParam(String key) {
return getParam(key, "");
}
public String getParam(String key, String defaultValue) {
- String param = getProperty(key);
- if ((param==null)||(param.equals("")))
- return defaultValue;
- else
- return param;
+ String param = getProperty(key);
+ if ((param==null)||(param.equals("")))
+ return defaultValue;
+ else
+ return param;
}
public int getParamAsInt(String key) {
@@ -200,7 +230,7 @@
* @param cback Where to call previousStep after the translator is loaded.
*/
public void checkTranslator(AsyncCallback cback) {
- if (translator==null) {
+ if (translator==null) {
// We need to disable the loading box
// otherwise it shows without translations
getLoadingDialog().disable();
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/dialog/Dialog.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/dialog/Dialog.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/client/dialog/Dialog.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -1,7 +1,5 @@
package com.xpn.xwiki.gwt.api.client.dialog;
-import asquare.gwt.tk.client.ui.ModalDialog;
-import asquare.gwt.tk.client.ui.behavior.TabFocusController;
import com.xpn.xwiki.gwt.api.client.app.XWikiGWTApp;
import com.xpn.xwiki.gwt.api.client.wizard.Wizard;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -30,7 +28,7 @@
* @author ldubost
*/
-public class Dialog extends ModalDialog {
+public class Dialog extends DialogBox {
public static int BUTTON_CANCEL = 1;
public static int BUTTON_PREVIOUS = 2;
public static int BUTTON_NEXT = 4;
@@ -68,6 +66,7 @@
* @param nextCallback Callback when dialog is finished
*/
public Dialog(XWikiGWTApp app, String name, int buttonModes, AsyncCallback
nextCallback) {
+ super(false, true);
this.app = app;
this.nextCallback = nextCallback;
this.name = name;
@@ -75,8 +74,8 @@
this.dialogTranslationName = name;
this.buttonModes = buttonModes;
addStyleName(getCSSName(null));
- setCaption(app.getTranslation(dialogTranslationName + ".caption"),
false);
- removeController(getController(TabFocusController.class));
+ // setCaption(app.getTranslation(dialogTranslationName + ".caption"),
false);
+ // removeController(getController(TabFocusController.class));
}
public void setAsyncCallback(AsyncCallback nextCallback) {
@@ -241,7 +240,7 @@
public void setDialogTranslationName(String dialogTranslationName) {
this.dialogTranslationName = dialogTranslationName;
- setCaption(app.getTranslation(dialogTranslationName + ".caption"),
false);
+ // setCaption(app.getTranslation(dialogTranslationName + ".caption"),
false);
}
public String getCssPrefix() {
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java
2008-02-25 19:59:05 UTC (rev 7939)
@@ -35,10 +35,13 @@
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.doc.XWikiLock;
import com.xpn.xwiki.gwt.api.client.*;
+import com.xpn.xwiki.gwt.api.server.wysiwyg.Converter;
import com.xpn.xwiki.objects.*;
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.objects.classes.ListClass;
import com.xpn.xwiki.render.XWikiVelocityRenderer;
+import com.xpn.xwiki.render.XWikiRenderingEngine;
+import com.xpn.xwiki.render.XWikiRadeoxRenderer;
import com.xpn.xwiki.user.api.XWikiUser;
import com.xpn.xwiki.web.Utils;
import com.xpn.xwiki.web.XWikiEngineContext;
@@ -1074,4 +1077,34 @@
throw getXWikiGWTException(e);
}
}
+
+ public String convertHtml2XWiki(String text, String fullName) throws
XWikiGWTException {
+ try {
+ return Converter.convertHtml2XWiki(text);
+ } catch (Exception e) {
+ throw getXWikiGWTException(e);
+ }
+ }
+
+ public String convertXWiki2Html(String fullName) throws XWikiGWTException {
+ try {
+ XWikiContext context = getXWikiContext();
+ XWikiRadeoxRenderer renderEngine = (XWikiRadeoxRenderer)
context.getWiki().getRenderingEngine().getRenderer("wiki");
+ XWikiDocument doc = context.getWiki().getDocument(fullName,
context);
+ return renderEngine.render(doc.getContent(), doc, doc,
context);
+ } catch (Exception e) {
+ throw getXWikiGWTException(e);
+ }
+ }
+
+ public String convertXWiki2Html(String text, String fullName) throws
XWikiGWTException {
+ try {
+ XWikiContext context = getXWikiContext();
+ XWikiRadeoxRenderer renderEngine = (XWikiRadeoxRenderer)
context.getWiki().getRenderingEngine().getRenderer("wiki");
+ XWikiDocument doc = context.getWiki().getDocument(fullName,
context);
+ return renderEngine.render(text, doc, doc, context);
+ } catch (Exception e) {
+ throw getXWikiGWTException(e);
+ }
+ }
}
Modified:
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/resources/com/xpn/xwiki/gwt/api/Api.gwt.xml
===================================================================
---
xwiki-platform/web/trunk/gwt/src/main/resources/com/xpn/xwiki/gwt/api/Api.gwt.xml
2008-02-24 14:18:01 UTC (rev 7925)
+++
xwiki-platform/web/branches/xwiki-web-gwt-gwt14/src/main/resources/com/xpn/xwiki/gwt/api/Api.gwt.xml
2008-02-25 19:59:05 UTC (rev 7939)
@@ -1,6 +1,5 @@
<module>
<inherits name='com.google.gwt.user.User'/>
- <inherits name='asquare.gwt.tk.Tk'/>
<servlet path="/XWikiService"
class="com.xpn.xwiki.gwt.api.server.XWikiServiceImpl"/>
<entry-point class='com.xpn.xwiki.gwt.api.client.Api'/>
-</module>
\ No newline at end of file
+</module>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
