Author: rfelden
Date: Mon Jan 21 10:44:17 2008
New Revision: 19549
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19549&repname=
=3Djahia
Log:
gwt refactoring + additions in taglibs
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/
- copied from r19547, branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java=
/org/jahia/ajax/gwt/gwtsitemap/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/SitemapManager.java
- copied, changed from r19547, branches/JAHIA-INCLUDE-TAG-BRANCH/core=
/src/java/org/jahia/ajax/gwt/gwtsitemap/client/GWTSitemapManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTree.java
- copied, changed from r19547, branches/JAHIA-INCLUDE-TAG-BRANCH/core=
/src/java/org/jahia/ajax/gwt/gwtsitemap/client/widgets/GWTSitemapTree.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTreeItem.java
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/GWTSitemapManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/GWTSitemapTree.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/GWTSitemapTreeItem.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/GWTSitemapTreeItemChildren.java
Copied: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/=
sitemap/client/SitemapManager.java (from r19547, branches/JAHIA-INCLUDE-TAG=
-BRANCH/core/src/java/org/jahia/ajax/gwt/gwtsitemap/client/GWTSitemapManage=
r.java)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/sitemap/client/SitemapManager=
.java&rev=3D19549&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/gwts=
itemap/client/GWTSitemapManager.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/SitemapManager.java Mon Jan 21 10:44:17 2008
@@ -1,14 +1,14 @@
-package org.jahia.ajax.gwt.gwtsitemap.client;
+package org.jahia.ajax.gwt.sitemap.client;
=
import com.google.gwt.user.client.ui.*;
import org.jahia.ajax.gwt.base.client.JahiaPageEntryPoint;
import org.jahia.ajax.gwt.base.client.beans.JahiaGWTPage;
-import org.jahia.ajax.gwt.gwtsitemap.client.widgets.GWTSitemapTree;
+import org.jahia.ajax.gwt.sitemap.client.widgets.SitemapTree;
=
/**
*
*/
-public class GWTSitemapManager extends JahiaPageEntryPoint {
+public class SitemapManager extends JahiaPageEntryPoint {
public static final String SITEMAP_ID =3D "default_sitemap";
=
public void onModuleLoad() {
@@ -16,7 +16,7 @@
=
// init panel
final JahiaGWTPage page =3D getJahiaGWTPage();
- final GWTSitemapTree sitemap =3D new GWTSitemapTree(page) ;
+ final SitemapTree sitemap =3D new SitemapTree(page) ;
DockPanel panel =3D new DockPanel() ;
Button expandAll =3D new Button("Expand sitemap") ;
expandAll.addClickListener(new ClickListener() {
Copied: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/=
sitemap/client/widgets/SitemapTree.java (from r19547, branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/gwtsitemap/client/widgets/GWT=
SitemapTree.java)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/sitemap/client/widgets/Sitema=
pTree.java&rev=3D19549&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/gwts=
itemap/client/widgets/GWTSitemapTree.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTree.java Mon Jan 21 10:44:17 2008
@@ -1,4 +1,4 @@
-package org.jahia.ajax.gwt.gwtsitemap.client.widgets;
+package org.jahia.ajax.gwt.sitemap.client.widgets;
=
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -15,7 +15,7 @@
* @author rfelden
* @version 5 d=C3=A9c. 2007
*/
-public class GWTSitemapTree extends Tree {
+public class SitemapTree extends Tree {
=
private Tree dis =3D this ;
=
@@ -27,7 +27,7 @@
*
* @param page the current page (to retrieve current pid & mode)
*/
- public GWTSitemapTree(final JahiaGWTPage page) {
+ public SitemapTree(final JahiaGWTPage page) {
super() ;
=
jahiaService.getHomePageForCurrentUser(page.getPid(), page.getMode=
(), false, new AsyncCallback() {
@@ -37,8 +37,8 @@
=
public void onSuccess(Object o) {
GWTJahiaPageWrapper homePage =3D (GWTJahiaPageWrapper) o ;
- GWTSitemapTreeItem root =3D new GWTSitemapTreeItem(homePag=
e) ;
- root.addItem(new GWTSitemapTreeItemChildren()) ;
+ SitemapTreeItem root =3D new SitemapTreeItem(homePage) ;
+ root.addItem(new SitemapTreeItemChildren()) ;
dis.addItem(root);
listener =3D new MySitemapTreeListener(page, dis) ;
dis.addTreeListener(listener) ;
@@ -57,7 +57,7 @@
dis.clear();
dis.removeTreeListener(listener);
GWTJahiaPageWrapper homePage =3D (GWTJahiaPageWrapper) o ;
- GWTSitemapTreeItem root =3D new GWTSitemapTreeItem(homePag=
e) ;
+ SitemapTreeItem root =3D new SitemapTreeItem(homePage) ;
dis.addItem(root);
recMapPagesToTree(root, homePage) ;
dis.addTreeListener(listener) ;
@@ -65,11 +65,11 @@
});
}
=
- public void recMapPagesToTree(GWTSitemapTreeItem node, GWTJahiaPageWra=
pper page) {
+ public void recMapPagesToTree(SitemapTreeItem node, GWTJahiaPageWrappe=
r page) {
if (page.hasChildren()) {
for (int i=3D0; i<page.getSubpages().length; i++) {
GWTJahiaPageWrapper subpage =3D page.getSubpages()[i] ;
- GWTSitemapTreeItem item =3D new GWTSitemapTreeItem(subpage=
) ;
+ SitemapTreeItem item =3D new SitemapTreeItem(subpage) ;
node.addItem(item) ;
if (!node.getState()) node.setState(true);
recMapPagesToTree(item, subpage);
@@ -99,7 +99,7 @@
String mode =3D page.getMode() ;
GWTJahiaPageWrapper page =3D null ;
if (pageTree.getItem(0) !=3D treeItem) {
- page =3D ( (GWTSitemapTreeItem) treeItem).getPage() ;
+ page =3D ( (SitemapTreeItem) treeItem).getPage() ;
}
jahiaService.getSubPagesForCurrentUser(pid, mode, page, ne=
w AsyncCallback() {
=
@@ -111,9 +111,9 @@
treeItem.removeItems() ;
GWTJahiaPageWrapper[] subpages =3D (GWTJahiaPageWr=
apper[])o ;
for (int i=3D0; i<subpages.length; i++) {
- GWTSitemapTreeItem currentItem =3D new GWTSite=
mapTreeItem(subpages[i]) ;
+ SitemapTreeItem currentItem =3D new SitemapTre=
eItem(subpages[i]) ;
if (subpages[i].hasChildren()) {
- currentItem.addItem(new GWTSitemapTreeItem=
Children());
+ currentItem.addItem(new SitemapTreeItemChi=
ldren());
}
treeItem.addItem(currentItem) ;
}
@@ -122,7 +122,7 @@
}
else {
treeItem.removeItems();
- treeItem.addItem(new GWTSitemapTreeItemChildren()) ;
+ treeItem.addItem(new SitemapTreeItemChildren()) ;
}
}
}
Added: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/s=
itemap/client/widgets/SitemapTreeItem.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=
/SitemapTreeItem.java&rev=3D19549&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/SitemapTreeItem.java (added)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/site=
map/client/widgets/SitemapTreeItem.java Mon Jan 21 10:44:17 2008
@@ -0,0 +1,35 @@
+package org.jahia.ajax.gwt.sitemap.client.widgets;
+
+import com.google.gwt.user.client.ui.TreeItem;
+import org.jahia.ajax.gwt.base.client.beans.GWTJahiaPageWrapper;
+import org.jahia.ajax.gwt.base.client.beans.GWTJahiaLink;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @author rfelden
+ * @version 6 d=C3=A9c. 2007
+ */
+public class SitemapTreeItem extends TreeItem {
+
+ private GWTJahiaPageWrapper page ;
+
+ public SitemapTreeItem(GWTJahiaPageWrapper page) {
+ super(new GWTJahiaLink(page.getTitle(), page.getLink())) ;
+ this.page =3D page ;
+ }
+
+ public GWTJahiaPageWrapper getPage() {
+ return page;
+ }
+
+ public void setPage(GWTJahiaPageWrapper page) {
+ this.page =3D page;
+ }
+
+ public String getLink() {
+ return page.getLink() ;
+ }
+
+
+}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
