Author: rfelden
Date: Mon Jan 21 10:45:16 2008
New Revision: 19550
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19550&repname=
=3Djahia
Log:
gwt refactoring + additions in taglibs (3rd edition)
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/SitemapManager.gwt.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/client/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/public/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/public/sitemap.html
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/base=
/client/beans/GWTJahiaLink.java
- copied, changed from r19547, branches/JAHIA-INCLUDE-TAG-BRANCH/core=
/src/java/org/jahia/ajax/gwt/base/client/beans/GWTLink.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTreeItemChildren.java
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/gwtsitemap/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/base=
/client/beans/GWTLink.java
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/SitemapTag.java
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/=
gwt/sitemap/SitemapManager.gwt.xml
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt/sitemap/SitemapMa=
nager.gwt.xml&rev=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/SitemapManager.gwt.xml (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/SitemapManager.gwt.xml Mon Jan 21 10:45:16 2008
@@ -0,0 +1,10 @@
+<module>
+ <inherits name=3D'com.google.gwt.user.User'/>
+ <inherits name=3D"com.google.gwt.i18n.I18N"/>
+ <!-- jahia services -->
+ <inherits name=3D'org.jahia.ajax.gwt.base.jahiaService'/>
+ <!-- css -->
+ <!--stylesheet src=3D'layoutmanager.css'/-->
+
+ <entry-point class=3D'org.jahia.ajax.gwt.sitemap.client.SitemapManager=
'/>
+</module>
\ No newline at end of file
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/=
gwt/sitemap/public/sitemap.html
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt/sitemap/public/si=
temap.html&rev=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/public/sitemap.html (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/ajax/gwt=
/sitemap/public/sitemap.html Mon Jan 21 10:45:16 2008
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<head>
+ <script type=3D"text/javascript">
+ var jahiaGWTParameters =3D {
+ pid: "9",
+ op: "edit",
+ serviceEntryPoint: "/org.jahia.ajax.gwt.sitemap.SitemapManager=
/"
+ };
+ </script>
+</head>
+<body>
+<!-- The fully-qualified module name, followed by 'nocache.js' -->
+<script language=3D"javascript" src=3D"org.jahia.ajax.gwt.sitemap.SitemapM=
anager.nocache.js"></script>
+
+
+<!-- layout area-->
+<div id=3D"default_sitemap"></div>
+</body>
+</html>
\ No newline at end of file
Copied: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/=
base/client/beans/GWTJahiaLink.java (from r19547, branches/JAHIA-INCLUDE-TA=
G-BRANCH/core/src/java/org/jahia/ajax/gwt/base/client/beans/GWTLink.java)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/base/client/beans/GWTJahiaLin=
k.java&rev=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/base=
/client/beans/GWTLink.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/base=
/client/beans/GWTJahiaLink.java Mon Jan 21 10:45:16 2008
@@ -8,9 +8,9 @@
* @author rfelden
* @version 10 d=C3=A9c. 2007
*/
-public class GWTLink extends HTML {
+public class GWTJahiaLink extends HTML {
=
- public GWTLink(String label, String link) {
+ public GWTJahiaLink(String label, String link) {
super() ;
setHTML("<a href=3D\"" + link + "\">"+ label + "</a>") ;
}
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/s=
itemap/client/widgets/SitemapTreeItemChildren.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/sitemap/client/widgets=
/SitemapTreeItemChildren.java&rev=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTreeItemChildren.java (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTreeItemChildren.java Mon Jan 21 10:45:16 2008
@@ -0,0 +1,21 @@
+package org.jahia.ajax.gwt.sitemap.client.widgets;
+
+import com.google.gwt.user.client.ui.TreeItem;
+import org.jahia.ajax.gwt.base.client.beans.GWTJahiaLink;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @author rfelden
+ * @version 6 d=C3=A9c. 2007
+ */
+public class SitemapTreeItemChildren extends TreeItem {
+
+ public static final String LOADING_CHILDREN_STRING =3D "loading childr=
en..." ;
+ public static final String LOADING_CHILDREN_LINK =3D "#" ;
+
+ public SitemapTreeItemChildren() {
+ super(new GWTJahiaLink(LOADING_CHILDREN_STRING, LOADING_CHILDREN_L=
INK)) ;
+ }
+
+}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/links/CurrentPagePathTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/links/CurrentPagePathTag.=
java&rev=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java Mon Jan 21 10:45:16 2008
@@ -83,7 +83,7 @@
* jsp:attribute name=3D"unreadablePages" required=3D"false" rtexprva=
lue=3D"true"
* description=3D"what to display when a page is unreachable
* <p><attriInfo>e"llipsis" (default) means that a sequel of unreacha=
ble pages will be replaced
- * by a single "...", "display means that everything will be displaye=
d and if the title is not
+ * by a single "...", "display" means that everything will be display=
ed and if the title is not
* available there will be "n.d." instead. Any other value will resul=
t in no display at all.
* </attriInfo>"
*/
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/NavMenuTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/NavMenuTag.java&rev=
=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java Mon Jan 21 10:45:16 2008
@@ -31,6 +31,7 @@
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.cache.ContainerHTMLCacheEntry;
import org.jahia.taglibs.AbstractJahiaTag;
+import org.jahia.taglibs.ajax.GWTIncluder;
import org.jahia.taglibs.util.Utils;
import org.jahia.registries.ServicesRegistry;
import org.jahia.content.ContentObjectKey;
@@ -141,7 +142,7 @@
out.print(new StringBuffer().append("<div class=3D\"").app=
end(cssClassName).append("\">\n").toString());
}
if (useGwt) {
- getGwtMenu() ;
+ useGwtMenu(out) ;
} else {
getPageSubTree(jData, jData.gui().getLevelID(startLevel), =
startLevel);
}
@@ -244,9 +245,16 @@
=
/**
* This is the GWT menu if needed.
+ * @param out the JSP writer
*/
- private void getGwtMenu() {
- // TODO GWT drop down menu
+ private void useGwtMenu(JspWriter out) {
+ // use the gwt module
+ try {
+ out.print("<div id=3D\"default_sitemap\" class=3D\"sitemap=
\"></div>") ;
+ out.print(GWTIncluder.generateGWTImport(pageContext, "org.=
jahia.ajax.gwt.navmenu.NavmenuManager")) ;
+ } catch (IOException e) {
+ logger.error("Could not write to output", e);
+ }
}
=
/**
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/SitemapTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/SitemapTag.java&rev=
=3D19550&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/SitemapTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/SitemapTag.java Mon Jan 21 10:45:16 2008
@@ -53,7 +53,7 @@
// use the gwt module
try {
out.print("<div id=3D\"default_sitemap\" class=3D\"sitemap=
\"></div>") ;
- out.print(GWTIncluder.generateGWTImport(pageContext, "org.=
jahia.ajax.gwt.gwtsitemap.GWTSitemapManager")) ;
+ out.print(GWTIncluder.generateGWTImport(pageContext, "org.=
jahia.ajax.gwt.sitemap.SitemapManager")) ;
} catch (IOException e) {
logger.error("Could not write to output", e);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
