1.1 --- a/pom.xml Wed Oct 07 23:38:04 2009 +0200
1.2 +++ b/pom.xml Fri Oct 09 12:11:43 2009 +0200
1.3 @@ -28,7 +28,7 @@
1.4 <version.jetty>6.1.19</version.jetty>
1.5 <version.jetty-plugin>6.1.19</version.jetty-plugin>
1.6 <version.log4j>1.2.14</version.log4j>
1.7 - <version.junit>4.6</version.junit>
1.8 + <version.junit>4.4</version.junit>
1.9 <!-- <version.slf4j-log4j>1.4.2</version.slf4j-log4j>
1.10 <version.slf4j-jcl>1.5.8</version.slf4j-jcl> -->
1.11 <version.slf4j>1.5.8</version.slf4j>
2.1 --- a/wish-clients/pom.xml Wed Oct 07 23:38:04 2009 +0200
2.2 +++ b/wish-clients/pom.xml Fri Oct 09 12:11:43 2009 +0200
2.3 @@ -40,15 +40,15 @@
2.4 <maxIdleTime>60000</maxIdleTime>
2.5 </connector>
2.6 </connectors>
2.7 - <contextPath>${web.context}</contextPath>
2.8 + <!-- <contextPath>${web.context}</contextPath> -->
2.9 <scanIntervalSeconds>0</scanIntervalSeconds>
2.10 <scanTargets>
2.11 + <!--
2.12 <scanTarget>target/classes</scanTarget>
2.13 <scanTarget>src/main/resources</scanTarget>
2.14 <scanTarget>src/main/filters</scanTarget>
2.15 <scanTarget>src/main/webapp/WEB-INF</scanTarget>
2.16 <scanTarget>target/${project.finalName}</scanTarget>
2.17 - <!--
2.18 <scanTarget>target/{project}</scanTarget>
2.19 <scanTarget>src/main/java</scanTarget>
2.20 <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget>
3.1 --- a/wish-clients/wish-tools/src/main/java/net/sf/wishlist/enterprise/client/tools/adapter/WishDirectServiceAdapter.java Wed Oct 07 23:38:04 2009 +0200
3.2 +++ b/wish-clients/wish-tools/src/main/java/net/sf/wishlist/enterprise/client/tools/adapter/WishDirectServiceAdapter.java Fri Oct 09 12:11:43 2009 +0200
3.3 @@ -70,4 +70,9 @@
3.4 return wishService.findWishlist(wishlistId, dreamer);
3.5 }
3.6
3.7 + @Override
3.8 + public void updateWishlist(WishList wishlist, Dreamer dreamer) {
3.9 + wishService.updateWishlist(wishlist, dreamer);
3.10 + }
3.11 +
3.12 }
4.1 --- a/wish-clients/wish-web/wish-wicket/pom.xml Wed Oct 07 23:38:04 2009 +0200
4.2 +++ b/wish-clients/wish-web/wish-wicket/pom.xml Fri Oct 09 12:11:43 2009 +0200
4.3 @@ -99,7 +99,7 @@
4.4 </connectors>
4.5 <!-- <contextPath>${web.context}</contextPath> -->
4.6 <scanIntervalSeconds>0</scanIntervalSeconds>
4.7 - <reload>manual</reload>
4.8 + <reload>automatic</reload>
4.9 <webAppConfig>
4.10 <contextPath>${web.context}</contextPath>
4.11 <!--
5.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Wed Oct 07 23:38:04 2009 +0200
5.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.html Fri Oct 09 12:11:43 2009 +0200
5.3 @@ -54,14 +54,11 @@
5.4 </div>
5.5 <div id="deck" class="compartment"> </div>
5.6 </div>
5.7 - <div id="cockpit" class="compartment">
5.8 -
5.9 - <!--
5.10 + <div id="cockpit" class="compartment" wicket:id="cockpit">
5.11 <ul class="horizontal">
5.12 <li><a href="http://flurdy.com/contact/">contact</a></li>
5.13 <li><a href="http://code.flurdy.com">about</a></li>
5.14 </ul>
5.15 - -->
5.16 </div>
5.17 </div>
5.18 <div id="starboard" class="compartment"> </div>
5.19 @@ -106,6 +103,20 @@
5.20 </div>
5.21 </div>
5.22
5.23 +
5.24 +<!--[if IE 6]>
5.25 + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
5.26 + <script type="text/javascript">
5.27 + var __noconflict = true;
5.28 + var IE6UPDATE_OPTIONS = {
5.29 + icons_path: "http://static.ie6update.com/hosted/ie6update/images/",
5.30 + url: "http://getfirefox.com"
5.31 + }
5.32 + </script>
5.33 + <script type="text/javascript" src="http://static.ie6update.com/hosted/ie6update/ie6update.js"></script>
5.34 +<![endif]-->
5.35 +
5.36 +
5.37 <!-- ANALYTICS GO HERE -->
5.38
5.39 </body>
6.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.java Wed Oct 07 23:38:04 2009 +0200
6.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/BasePage.java Fri Oct 09 12:11:43 2009 +0200
6.3 @@ -9,7 +9,8 @@
6.4
6.5 protected static final String DECK_ID = "deck";
6.6 protected static final String HATCH_ID = "hatch";
6.7 - protected static final String COCKPIT_ID = "jib";
6.8 + protected static final String JIB_ID = "jib";
6.9 + protected static final String COCKPIT_ID = "cockpit";
6.10 protected static final String KEEL_ID = "keel";
6.11
6.12 protected transient Logger log = LoggerFactory.getLogger(this.getClass());
6.13 @@ -25,6 +26,7 @@
6.14 }
6.15
6.16 private void addLayout(){
6.17 + add( new KeelPanel(COCKPIT_ID));
6.18 // add( new BookmarkablePageLink("lookoutLinkWish",WishIndexPage.class));
6.19 // add( new Link("lookoutLinkShop"){
6.20 // @Override
7.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/CockpitPanel.html Wed Oct 07 23:38:04 2009 +0200
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,7 +0,0 @@
7.4 -<html>
7.5 -<body>
7.6 -<wicket:panel>
7.7 - <span wicket:id="cockpitLabel">cockpit</span>
7.8 -</wicket:panel>
7.9 -</body>
7.10 -</html>
8.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/CockpitPanel.java Wed Oct 07 23:38:04 2009 +0200
8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
8.3 @@ -1,16 +0,0 @@
8.4 -/*
8.5 - * To change this template, choose Tools | Templates
8.6 - * and open the template in the editor.
8.7 - */
8.8 -
8.9 -package net.sf.wishlist.enterprise.client.web.wicket;
8.10 -
8.11 -import org.apache.wicket.markup.html.basic.Label;
8.12 -import org.apache.wicket.markup.html.panel.Panel;
8.13 -
8.14 -public class CockpitPanel extends Panel {
8.15 - public CockpitPanel(String id, String label) {
8.16 - super(id);
8.17 - add(new Label("cockpitLabel", label));
8.18 - }
8.19 -}
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/JibPanel.html Fri Oct 09 12:11:43 2009 +0200
9.3 @@ -0,0 +1,7 @@
9.4 +<html>
9.5 +<body>
9.6 +<wicket:panel>
9.7 + <span wicket:id="cockpitLabel">cockpit</span>
9.8 +</wicket:panel>
9.9 +</body>
9.10 +</html>
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/JibPanel.java Fri Oct 09 12:11:43 2009 +0200
10.3 @@ -0,0 +1,16 @@
10.4 +/*
10.5 + * To change this template, choose Tools | Templates
10.6 + * and open the template in the editor.
10.7 + */
10.8 +
10.9 +package net.sf.wishlist.enterprise.client.web.wicket;
10.10 +
10.11 +import org.apache.wicket.markup.html.basic.Label;
10.12 +import org.apache.wicket.markup.html.panel.Panel;
10.13 +
10.14 +public class JibPanel extends Panel {
10.15 + public JibPanel(String id, String label) {
10.16 + super(id);
10.17 + add(new Label("cockpitLabel", label));
10.18 + }
10.19 +}
11.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Wed Oct 07 23:38:04 2009 +0200
11.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/LoginPage.java Fri Oct 09 12:11:43 2009 +0200
11.3 @@ -38,7 +38,7 @@
11.4 }
11.5
11.6 private void addLayout() {
11.7 - add( new CockpitPanel(COCKPIT_ID,"login"));
11.8 + add( new JibPanel(JIB_ID,"login"));
11.9 add( new WebMarkupContainer(HATCH_ID));
11.10 add( new Link("registerLink"){
11.11 @Override
12.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Wed Oct 07 23:38:04 2009 +0200
12.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/RegisterPage.java Fri Oct 09 12:11:43 2009 +0200
12.3 @@ -37,7 +37,7 @@
12.4 }
12.5
12.6 private void addLayout() {
12.7 - add( new CockpitPanel(COCKPIT_ID,"register"));
12.8 + add( new JibPanel(JIB_ID,"register"));
12.9 add( new WebMarkupContainer(HATCH_ID));
12.10 add( new Link("loginLink"){
12.11 @Override
13.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Wed Oct 07 23:38:04 2009 +0200
13.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/AccessDeniedPage.java Fri Oct 09 12:11:43 2009 +0200
13.3 @@ -6,7 +6,7 @@
13.4 package net.sf.wishlist.enterprise.client.web.wicket.error;
13.5
13.6 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
13.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
13.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
13.9 import org.apache.wicket.markup.html.WebMarkupContainer;
13.10
13.11 /**
13.12 @@ -21,7 +21,7 @@
13.13 }
13.14
13.15 private void addLayout() {
13.16 - add( new CockpitPanel(COCKPIT_ID,"access denied"));
13.17 + add( new JibPanel(JIB_ID,"access denied"));
13.18 add( new WebMarkupContainer(HATCH_ID));
13.19 addCargo();
13.20 }
14.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Wed Oct 07 23:38:04 2009 +0200
14.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/ApplicationErrorPage.java Fri Oct 09 12:11:43 2009 +0200
14.3 @@ -6,7 +6,7 @@
14.4 package net.sf.wishlist.enterprise.client.web.wicket.error;
14.5
14.6 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
14.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
14.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
14.9 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
14.10 import org.apache.wicket.markup.html.WebMarkupContainer;
14.11 import org.apache.wicket.markup.html.basic.Label;
14.12 @@ -31,7 +31,7 @@
14.13 }
14.14
14.15 private void addLayout() {
14.16 - add( new CockpitPanel(COCKPIT_ID,"application error"));
14.17 + add( new JibPanel(JIB_ID,"application error"));
14.18 add( new WebMarkupContainer(HATCH_ID));
14.19 }
14.20
15.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Wed Oct 07 23:38:04 2009 +0200
15.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageExpiredPage.java Fri Oct 09 12:11:43 2009 +0200
15.3 @@ -6,7 +6,7 @@
15.4 package net.sf.wishlist.enterprise.client.web.wicket.error;
15.5
15.6 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
15.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
15.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
15.9 import org.apache.wicket.markup.html.WebMarkupContainer;
15.10
15.11 /**
15.12 @@ -21,7 +21,7 @@
15.13 }
15.14
15.15 private void addLayout() {
15.16 - add( new CockpitPanel(COCKPIT_ID,"page expired"));
15.17 + add( new JibPanel(JIB_ID,"page expired"));
15.18 add( new WebMarkupContainer(HATCH_ID));
15.19 addCargo();
15.20 }
16.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Wed Oct 07 23:38:04 2009 +0200
16.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/PageNotFoundPage.java Fri Oct 09 12:11:43 2009 +0200
16.3 @@ -7,7 +7,7 @@
16.4
16.5 import javax.servlet.http.HttpServletResponse;
16.6 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
16.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
16.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
16.9 import org.apache.wicket.markup.html.WebMarkupContainer;
16.10
16.11 /**
16.12 @@ -38,7 +38,7 @@
16.13 }
16.14
16.15 private void addLayout() {
16.16 - add( new CockpitPanel(COCKPIT_ID,"404: not found"));
16.17 + add( new JibPanel(JIB_ID,"404: not found"));
16.18 add( new WebMarkupContainer(HATCH_ID));
16.19 // add( new WebMarkupContainer(DECK_ID));
16.20 addCargo();
17.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Wed Oct 07 23:38:04 2009 +0200
17.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/error/SystemErrorPage.java Fri Oct 09 12:11:43 2009 +0200
17.3 @@ -6,7 +6,7 @@
17.4 package net.sf.wishlist.enterprise.client.web.wicket.error;
17.5
17.6 import net.sf.wishlist.enterprise.client.web.wicket.BasePage;
17.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
17.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
17.9 import net.sf.wishlist.enterprise.common.exception.WishTechnicalException;
17.10 import org.apache.wicket.markup.html.WebMarkupContainer;
17.11 import org.apache.wicket.markup.html.basic.Label;
17.12 @@ -30,7 +30,7 @@
17.13 }
17.14
17.15 private void addLayout() {
17.16 - add( new CockpitPanel(COCKPIT_ID,"500: system error"));
17.17 + add( new JibPanel(JIB_ID,"500: system error"));
17.18 add( new WebMarkupContainer(HATCH_ID));
17.19 }
17.20
18.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java Wed Oct 07 23:38:04 2009 +0200
18.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishAddPage.java Fri Oct 09 12:11:43 2009 +0200
18.3 @@ -7,7 +7,7 @@
18.4
18.5 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
18.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
18.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
18.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
18.9 import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
18.10 import net.sf.wishlist.enterprise.common.domain.Dreamer;
18.11 import net.sf.wishlist.enterprise.common.domain.WishItem;
18.12 @@ -39,7 +39,7 @@
18.13 }
18.14
18.15 private void addLayout() {
18.16 - add( new CockpitPanel(COCKPIT_ID,"wish add"));
18.17 + add( new JibPanel(JIB_ID,"wish add"));
18.18 // add( new HatchFragement("hatch"));
18.19 add( new WishDeckPanel(HATCH_ID));
18.20 // add( new KeelPanel("keel"));
19.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java Wed Oct 07 23:38:04 2009 +0200
19.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishEditPage.java Fri Oct 09 12:11:43 2009 +0200
19.3 @@ -2,7 +2,7 @@
19.4
19.5 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagEditPoolPanel;
19.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
19.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
19.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
19.9 import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
19.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
19.11 import net.sf.wishlist.enterprise.common.domain.Dreamer;
19.12 @@ -27,7 +27,7 @@
19.13
19.14 private void addLayout(LoadableWishItemModel wishModel) {
19.15 WishItem wish = (WishItem)wishModel.getObject();
19.16 - add(new CockpitPanel(COCKPIT_ID, "edit wish"));
19.17 + add(new JibPanel(JIB_ID, "edit wish"));
19.18 add(new WishDeckPanel(HATCH_ID, wish));
19.19 // add(new KeelPanel("keel"));
19.20 Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
20.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.java Wed Oct 07 23:38:04 2009 +0200
20.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishIndexPage.java Fri Oct 09 12:11:43 2009 +0200
20.3 @@ -4,7 +4,7 @@
20.4 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishPoolPanel;
20.5 import java.util.Set;
20.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
20.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
20.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
20.9 import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
20.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagPoolPanel;
20.11 import net.sf.wishlist.enterprise.common.domain.Tag;
20.12 @@ -30,7 +30,7 @@
20.13 }
20.14
20.15 private void addLayout() {
20.16 - add(new CockpitPanel(COCKPIT_ID, "wish"));
20.17 + add(new JibPanel(JIB_ID, "wish"));
20.18 add(new WishDeckPanel(HATCH_ID));
20.19 addCargo();
20.20 }
21.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java Wed Oct 07 23:38:04 2009 +0200
21.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishRemovePage.java Fri Oct 09 12:11:43 2009 +0200
21.3 @@ -1,7 +1,7 @@
21.4 package net.sf.wishlist.enterprise.client.web.wicket.wish;
21.5
21.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
21.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
21.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
21.9 import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
21.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
21.11 import net.sf.wishlist.enterprise.common.domain.Dreamer;
21.12 @@ -25,7 +25,7 @@
21.13 }
21.14
21.15 private void addLayout(WishItem wish) {
21.16 - add(new CockpitPanel(COCKPIT_ID, "remove wish"));
21.17 + add(new JibPanel(JIB_ID, "remove wish"));
21.18 add(new WishDeckPanel(HATCH_ID, wish));
21.19 // add(new KeelPanel("keel"));
21.20 addCargo(wish);
22.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java Wed Oct 07 23:38:04 2009 +0200
22.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/WishViewPage.java Fri Oct 09 12:11:43 2009 +0200
22.3 @@ -8,8 +8,7 @@
22.4 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagPoolPanel;
22.5 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
22.6 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
22.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
22.8 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
22.9 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
22.10 import net.sf.wishlist.enterprise.common.domain.Dreamer;
22.11 import net.sf.wishlist.enterprise.common.domain.WishItem;
22.12 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
22.13 @@ -61,7 +60,7 @@
22.14 }
22.15
22.16 private void addLayout(LoadableWishItemModel wishModel) {
22.17 - add( new CockpitPanel(COCKPIT_ID,"wish"));
22.18 + add( new JibPanel(JIB_ID,"wish"));
22.19 WishItem wish = wishModel.getObject();
22.20 add( new WishDeckPanel(HATCH_ID, wish));
22.21 // add( new KeelPanel("keel"));
23.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html Wed Oct 07 23:38:04 2009 +0200
23.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.html Fri Oct 09 12:11:43 2009 +0200
23.3 @@ -7,143 +7,108 @@
23.4
23.5 <body>
23.6
23.7 - <table id="ocean">
23.8 +
23.9 + <wicket:extend>
23.10 +
23.11 + <div style="float: right; overflow: auto; padding: 1em; height: 40em;">
23.12 + <table>
23.13 + <tr>
23.14 + <th colspan="2">available tags</th>
23.15 + </tr>
23.16 + <tr>
23.17 + <td><a href="#">hard</a></td>
23.18 + <td><button>add</button></td>
23.19 + </tr>
23.20 + <tr>
23.21 + <td><a href="#">2009</a></td>
23.22 + <td><button>add</button></td>
23.23 + </tr>
23.24 + <tr>
23.25 + <td><a href="#">christmas</a></td>
23.26 + <td><button>add</button></td>
23.27 + </tr>
23.28 + <tr>
23.29 + <td><a href="#">book</a></td>
23.30 + <td><button>add</button></td>
23.31 + </tr>
23.32 + <tr>
23.33 + <td><a href="#">hard</a></td>
23.34 + <td><button>add</button></td>
23.35 + </tr>
23.36 + <tr>
23.37 + <td><a href="#">2009</a></td>
23.38 + <td><button>add</button></td>
23.39 + </tr>
23.40 + <tr>
23.41 + <td><a href="#">christmas</a></td>
23.42 + <td><button>add</button></td>
23.43 + </tr>
23.44 + <tr>
23.45 + <td><a href="#">book</a></td>
23.46 + <td><button>add</button></td>
23.47 + </tr>
23.48 + <tr>
23.49 + <td><a href="#">hard</a></td>
23.50 + <td><button>add</button></td>
23.51 + </tr>
23.52 + <tr>
23.53 + <td><a href="#">2009</a></td>
23.54 + <td><button>add</button></td>
23.55 + </tr>
23.56 + <tr>
23.57 + <td><a href="#">christmas</a></td>
23.58 + <td><button>add</button></td>
23.59 + </tr>
23.60 + <tr>
23.61 + <td><a href="#">book</a></td>
23.62 + <td><button>add</button></td>
23.63 + </tr>
23.64 + </table>
23.65 + </div>
23.66 +
23.67 +
23.68 +
23.69 + <form action="#" wicket:id="newWishlistForm">
23.70 + <table>
23.71 + <tr>
23.72 + <th>title</th>
23.73 + <td><input type="text" wicket:id="title"/></td>
23.74 + </tr>
23.75 + <tr>
23.76 + <th>description</th>
23.77 + <td><textarea wicket:id="description"></textarea></td>
23.78 + </tr>
23.79 + <tr>
23.80 + <td colspan="2"><input type="submit" value="update" /></td>
23.81 + </tr>
23.82 + </table>
23.83 + </form>
23.84 +
23.85 + <table>
23.86 <tr>
23.87 - <td id="flare" colspan="1" rowspan="1">
23.88 -
23.89 - </td>
23.90 + <th colspan="2">wishlist tags</th>
23.91 </tr>
23.92 <tr>
23.93 - <td id="ship">
23.94 + <td><a href="#">hard</a></td>
23.95 + <td><button>remove</button></td>
23.96 + </tr>
23.97 + <tr>
23.98 + <td><a href="#">2009</a></td>
23.99 + <td><button>remove</button></td>
23.100 + </tr>
23.101 + <tr>
23.102 + <td><a href="#">christmas</a></td>
23.103 + <td><button>remove</button></td>
23.104 + </tr>
23.105 + <tr>
23.106 + <td><a href="#">book</a></td>
23.107 + <td><button>remove</button></td>
23.108 + </tr>
23.109 + </table>
23.110
23.111 - <table id="hull">
23.112 - <tr>
23.113 - <td id="prow" colspan="1" rowspan="1">
23.114
23.115 - </td>
23.116 - </tr>
23.117 - <tr>
23.118 - <td id="innerhull">
23.119 - <table>
23.120
23.121 - <tr>
23.122 - <td id="bow" class="grid" colspan="3" rowspan="1">
23.123 -
23.124 - </td>
23.125 - </tr>
23.126 - <tr>
23.127 - <td id="lookout" class="grid" colspan="3" rowspan="1">
23.128 - <wicket:link>
23.129 - <a href="wish/WishIndex.html">wish</a>
23.130 - <a href="shop/ShopIndex.html">shop</a>
23.131 - <a href="gift/GiftIndex.html">gift</a>
23.132 - </wicket:link>
23.133 - </td>
23.134 - </tr>
23.135 -
23.136 - <wicket:extend>
23.137 -
23.138 - <div style="float: right; overflow: auto; padding: 1em; height: 400px;">
23.139 - <table>
23.140 - <tr>
23.141 - <th colspan="2">available tags</th>
23.142 - </tr>
23.143 - <tr>
23.144 - <td><a href="#">hard</a></td>
23.145 - <td><button>add</button></td>
23.146 - </tr>
23.147 - <tr>
23.148 - <td><a href="#">2009</a></td>
23.149 - <td><button>add</button></td>
23.150 - </tr>
23.151 - <tr>
23.152 - <td><a href="#">christmas</a></td>
23.153 - <td><button>add</button></td>
23.154 - </tr>
23.155 - <tr>
23.156 - <td><a href="#">book</a></td>
23.157 - <td><button>add</button></td>
23.158 - </tr>
23.159 - <tr>
23.160 - <td><a href="#">hard</a></td>
23.161 - <td><button>add</button></td>
23.162 - </tr>
23.163 - <tr>
23.164 - <td><a href="#">2009</a></td>
23.165 - <td><button>add</button></td>
23.166 - </tr>
23.167 - <tr>
23.168 - <td><a href="#">christmas</a></td>
23.169 - <td><button>add</button></td>
23.170 - </tr>
23.171 - <tr>
23.172 - <td><a href="#">book</a></td>
23.173 - <td><button>add</button></td>
23.174 - </tr>
23.175 - <tr>
23.176 - <td><a href="#">hard</a></td>
23.177 - <td><button>add</button></td>
23.178 - </tr>
23.179 - <tr>
23.180 - <td><a href="#">2009</a></td>
23.181 - <td><button>add</button></td>
23.182 - </tr>
23.183 - <tr>
23.184 - <td><a href="#">christmas</a></td>
23.185 - <td><button>add</button></td>
23.186 - </tr>
23.187 - <tr>
23.188 - <td><a href="#">book</a></td>
23.189 - <td><button>add</button></td>
23.190 - </tr>
23.191 - </table>
23.192 - </div>
23.193 -
23.194 -
23.195 - <img src="images/blank.gif" width="1" height="300" align="left"/>
23.196 -
23.197 -
23.198 - <form action="#" wicket:id="newWishlistForm">
23.199 - <table>
23.200 - <tr>
23.201 - <th>title</th>
23.202 - <td><input type="text" wicket:id="title"/></td>
23.203 - </tr>
23.204 - <tr>
23.205 - <th>description</th>
23.206 - <td><textarea wicket:id="description"></textarea></td>
23.207 - </tr>
23.208 - <tr>
23.209 - <td colspan="2"><input type="submit" value="update" /></td>
23.210 - </tr>
23.211 - </table>
23.212 - </form>
23.213 -
23.214 - <table>
23.215 - <tr>
23.216 - <th colspan="2">wishlist tags</th>
23.217 - </tr>
23.218 - <tr>
23.219 - <td><a href="#">hard</a></td>
23.220 - <td><button>remove</button></td>
23.221 - </tr>
23.222 - <tr>
23.223 - <td><a href="#">2009</a></td>
23.224 - <td><button>remove</button></td>
23.225 - </tr>
23.226 - <tr>
23.227 - <td><a href="#">christmas</a></td>
23.228 - <td><button>remove</button></td>
23.229 - </tr>
23.230 - <tr>
23.231 - <td><a href="#">book</a></td>
23.232 - <td><button>remove</button></td>
23.233 - </tr>
23.234 - </table>
23.235 -
23.236 -
23.237 -
23.238 - <!-- <div id="tagPoolBox" class="poolBox" wicket:id="tagPoolBox">
23.239 + <!-- <div id="tagPoolBox" class="poolBox" wicket:id="tagPoolBox">
23.240 <div class="poolTitle">available tags:</div>
23.241 <div class="poolWrap" wicket:id="tagPoolWrap">
23.242 <ul class="pool">
23.243 @@ -162,34 +127,11 @@
23.244
23.245
23.246
23.247 - <div wicket:id="feedback"></div>
23.248 + <div wicket:id="feedback"></div>
23.249
23.250 -
23.251 - </wicket:extend>
23.252
23.253 - <tr>
23.254 - <td id="stern" class="grid" colspan="3" rowspan="1">
23.255 - </td>
23.256 - </tr>
23.257 - </table>
23.258 - </td>
23.259 - </tr>
23.260 - <tr>
23.261 - <td id="anchor" colspan="1" rowspan="1">
23.262 - </td>
23.263 + </wicket:extend>
23.264
23.265 - </tr>
23.266 - </table>
23.267 - </td>
23.268 -</tr>
23.269 -<tr>
23.270 - <td id="net" colspan="1" rowspan="1">
23.271 -
23.272 - </td>
23.273 -</tr>
23.274 -</table>
23.275 -
23.276 -<!-- ANALYTICS GO HERE -->
23.277
23.278 </body>
23.279 <!-- copyright & copyleft, see website wishlist.sf.net -->
24.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java Wed Oct 07 23:38:04 2009 +0200
24.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/EditWishlistPage.java Fri Oct 09 12:11:43 2009 +0200
24.3 @@ -4,18 +4,13 @@
24.4 */
24.5 package net.sf.wishlist.enterprise.client.web.wicket.wish.list;
24.6
24.7 -import java.util.Set;
24.8 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
24.9 -import net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel.WishlistDeckPanel;
24.10 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
24.11 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
24.12 +import net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel.WishlistMenuPanel;
24.13 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
24.14 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
24.15 -import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.TagPoolPanel;
24.16 import net.sf.wishlist.enterprise.common.domain.Dreamer;
24.17 -import net.sf.wishlist.enterprise.common.domain.Tag;
24.18 import net.sf.wishlist.enterprise.common.domain.WishList;
24.19 import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
24.20 -import org.apache.wicket.markup.html.WebMarkupContainer;
24.21 import org.apache.wicket.markup.html.form.Form;
24.22 import org.apache.wicket.markup.html.form.RequiredTextField;
24.23 import org.apache.wicket.markup.html.form.TextArea;
24.24 @@ -32,39 +27,45 @@
24.25
24.26 public EditWishlistPage(LoadableWishlistModel wishlistModel) {
24.27 super();
24.28 +// log.debug("cons: " + wishlistModel.getObject());
24.29 addLayout(wishlistModel);
24.30 }
24.31
24.32 private void addLayout(LoadableWishlistModel wishlistModel) {
24.33 - add(new CockpitPanel(COCKPIT_ID, "edit wishlist"));
24.34 - add(new WishlistDeckPanel(wishlistModel));
24.35 -// add(new KeelPanel("keel"));
24.36 -// Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
24.37 -// WishList wishlist = wishlistModel.load();
24.38 -// WishList wishlist = wishServiceAdapter.findWishlist(modelList.getWishlistId(), dreamer);
24.39 + add(new JibPanel(JIB_ID, "edit wishlist"));
24.40 + add(new WishlistMenuPanel(wishlistModel));
24.41 wishlistModel.detach();
24.42 addCargo(wishlistModel);
24.43 }
24.44
24.45 +
24.46 private void addCargo(LoadableWishlistModel wishlistModel) {
24.47 add(new FeedbackPanel("feedback"));
24.48
24.49 +// log.debug("form dara" + wishlistModel.getObject());
24.50
24.51 Form<WishList> form = new Form<WishList>(FORM_ID, new CompoundPropertyModel<WishList>(wishlistModel)) {
24.52
24.53 +
24.54 @Override
24.55 protected void onSubmit() {
24.56 WishList wishlist = getModelObject();
24.57 - info("Edited " + wishlist);
24.58 +// info("Edited " + wishlist);
24.59 +// log.debug("Edited " + wishlist);
24.60 Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
24.61 try {
24.62 -// wishServiceAdapter.addWishlist(wishlist, dreamer);
24.63 -// log.debug("added wishlist " + wishlist);
24.64 -// LoadableWishlistModel wishlistModel = new LoadableWishlistModel(wishlist);
24.65 -// wishlistModel.detach();
24.66 -// setRedirect(true);
24.67 -// setResponsePage(new EditWishlistPage(wishlistModel));
24.68 +
24.69 + wishServiceAdapter.updateWishlist(wishlist, dreamer);
24.70 +
24.71 + log.debug("updated wishlist " + wishlist);
24.72 + LoadableWishlistModel wishlistModel = new LoadableWishlistModel(wishlist);
24.73 + wishlistModel.detach();
24.74 + setRedirect(true);
24.75 + setResponsePage(new ViewWishlistPage(wishlistModel));
24.76 +
24.77 +
24.78 } catch (WishLogicalException exception) {
24.79 + log.info("Update wishlist logic error: " + exception.getErrorCode().getErrorMessage());
24.80 error(exception.getErrorCode().getErrorMessage());
24.81 }
24.82
25.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/LoadableWishlistModel.java Wed Oct 07 23:38:04 2009 +0200
25.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/LoadableWishlistModel.java Fri Oct 09 12:11:43 2009 +0200
25.3 @@ -47,12 +47,14 @@
25.4 if(wishlistId <= 0)
25.5 return new WishList();
25.6 log.debug("RELOADING WISHLIST MODEL");
25.7 - log.debug("wishlistId is " + wishlistId);
25.8 +// log.debug("wishlistId is " + wishlistId);
25.9 Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
25.10 - log.debug("dreamer is " + dreamer);
25.11 +// log.debug("dreamer is " + dreamer);
25.12 if( wishServiceAdapter == null )
25.13 throw new WishTechnicalException(WishTechnicalError.CONFIG, "Adapter is null!!!!");
25.14 - return wishServiceAdapter.findWishlist(wishlistId, dreamer);
25.15 + WishList wishlist = wishServiceAdapter.findWishlist(wishlistId, dreamer);
25.16 + log.debug("loaded wishlist:"+wishlist);
25.17 + return wishlist;
25.18 }
25.19
25.20 // @Override
26.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java Wed Oct 07 23:38:04 2009 +0200
26.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/NewWishlistPage.java Fri Oct 09 12:11:43 2009 +0200
26.3 @@ -5,8 +5,7 @@
26.4 package net.sf.wishlist.enterprise.client.web.wicket.wish.list;
26.5
26.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
26.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
26.8 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
26.9 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
26.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
26.11 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishDeckPanel;
26.12 import net.sf.wishlist.enterprise.common.domain.Dreamer;
26.13 @@ -33,7 +32,7 @@
26.14 }
26.15
26.16 private void addLayout() {
26.17 - add(new CockpitPanel(COCKPIT_ID, "new wishlist"));
26.18 + add(new JibPanel(JIB_ID, "new wishlist"));
26.19 add(new WishDeckPanel(HATCH_ID));
26.20 // add(new KeelPanel("keel"));
26.21 addCargo();
27.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java Wed Oct 07 23:38:04 2009 +0200
27.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/ViewWishlistPage.java Fri Oct 09 12:11:43 2009 +0200
27.3 @@ -5,12 +5,13 @@
27.4
27.5 package net.sf.wishlist.enterprise.client.web.wicket.wish.list;
27.6
27.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
27.8 -import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
27.9 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
27.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
27.11 -import net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel.WishlistDeckPanel;
27.12 +import net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel.WishlistMenuPanel;
27.13 +import net.sf.wishlist.enterprise.common.domain.WishList;
27.14 import org.apache.wicket.markup.html.basic.Label;
27.15 import org.apache.wicket.markup.html.panel.FeedbackPanel;
27.16 +import org.apache.wicket.model.CompoundPropertyModel;
27.17
27.18 public class ViewWishlistPage extends WishPage {
27.19
27.20 @@ -20,8 +21,8 @@
27.21 }
27.22
27.23 private void addLayout(LoadableWishlistModel wishlistModel) {
27.24 - add(new CockpitPanel( COCKPIT_ID, "edit wishlist"));
27.25 - add(new WishlistDeckPanel(wishlistModel));
27.26 + add(new JibPanel( JIB_ID, "edit wishlist"));
27.27 + add(new WishlistMenuPanel(wishlistModel));
27.28 // add(new KeelPanel("keel"));
27.29 // Dreamer dreamer = AuthenticatedWishlistSession.get().getSessionDreamer();
27.30 // WishList wishlist = wishlistModel.load();
27.31 @@ -32,10 +33,11 @@
27.32
27.33 private void addCargo(LoadableWishlistModel wishlistModel) {
27.34 add(new FeedbackPanel("feedback"));
27.35 - setDefaultModel(wishlistModel);
27.36 + log.debug("viewing wishlist : " + wishlistModel.load());
27.37 + setDefaultModel(new CompoundPropertyModel<WishList>(wishlistModel));
27.38 add(new Label("title"));
27.39 add(new Label("description"));
27.40 -
27.41 + // TODO tags
27.42 }
27.43
27.44 }
28.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/panel/WishlistDeckPanel.java Wed Oct 07 23:38:04 2009 +0200
28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
28.3 @@ -1,60 +0,0 @@
28.4 -/*
28.5 - * To change this template, choose Tools | Templates
28.6 - * and open the template in the editor.
28.7 - */
28.8 -
28.9 -package net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel;
28.10 -
28.11 -import net.sf.wishlist.enterprise.client.web.wicket.DeckPanel;
28.12 -import net.sf.wishlist.enterprise.client.web.wicket.wish.LoadableWishItemModel;
28.13 -import net.sf.wishlist.enterprise.client.web.wicket.wish.WishAddPage;
28.14 -import net.sf.wishlist.enterprise.client.web.wicket.wish.WishEditPage;
28.15 -import net.sf.wishlist.enterprise.client.web.wicket.wish.WishRemovePage;
28.16 -import net.sf.wishlist.enterprise.client.web.wicket.wish.WishViewPage;
28.17 -import net.sf.wishlist.enterprise.client.web.wicket.wish.list.*;
28.18 -import net.sf.wishlist.enterprise.common.domain.WishItem;
28.19 -import net.sf.wishlist.enterprise.common.domain.WishList;
28.20 -import org.apache.wicket.markup.repeater.RepeatingView;
28.21 -
28.22 -public class WishlistDeckPanel extends DeckPanel {
28.23 -
28.24 - private static final String id = "hatch";
28.25 -
28.26 - public WishlistDeckPanel( LoadableWishlistModel wishlistModel) {
28.27 - super(id);
28.28 -
28.29 - RepeatingView deckRows = new RepeatingView("deckRow");
28.30 - add(deckRows);
28.31 -
28.32 -// deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("add wish to list", wishlistModel) {
28.33 -// @Override
28.34 -// public void onClick() {
28.35 -// setResponsePage(WishAddPage.class);
28.36 -// }
28.37 -// }));
28.38 -
28.39 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("view wishlist", wishlistModel) {
28.40 - @Override
28.41 - public void onClick() {
28.42 - setResponsePage(new ViewWishlistPage((LoadableWishlistModel) getModel()));
28.43 - }
28.44 - }));
28.45 -
28.46 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("edit wishlist", wishlistModel) {
28.47 - @Override
28.48 - public void onClick() {
28.49 - setResponsePage(new EditWishlistPage((LoadableWishlistModel) getModel()));
28.50 - }
28.51 - }));
28.52 -
28.53 - deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("remove wishlist", wishlistModel) {
28.54 - @Override
28.55 - public void onClick() {
28.56 -// setResponsePage(new WishRemovePage((WishItem) getModelObject()));
28.57 - }
28.58 - }));
28.59 -
28.60 -
28.61 - }
28.62 -
28.63 -}
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
29.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/list/panel/WishlistMenuPanel.java Fri Oct 09 12:11:43 2009 +0200
29.3 @@ -0,0 +1,67 @@
29.4 +/*
29.5 + * To change this template, choose Tools | Templates
29.6 + * and open the template in the editor.
29.7 + */
29.8 +
29.9 +package net.sf.wishlist.enterprise.client.web.wicket.wish.list.panel;
29.10 +
29.11 +import net.sf.wishlist.enterprise.client.web.wicket.DeckPanel;
29.12 +import net.sf.wishlist.enterprise.client.web.wicket.wish.LoadableWishItemModel;
29.13 +import net.sf.wishlist.enterprise.client.web.wicket.wish.WishAddPage;
29.14 +import net.sf.wishlist.enterprise.client.web.wicket.wish.WishEditPage;
29.15 +import net.sf.wishlist.enterprise.client.web.wicket.wish.WishRemovePage;
29.16 +import net.sf.wishlist.enterprise.client.web.wicket.wish.WishViewPage;
29.17 +import net.sf.wishlist.enterprise.client.web.wicket.wish.list.*;
29.18 +import net.sf.wishlist.enterprise.common.domain.WishItem;
29.19 +import net.sf.wishlist.enterprise.common.domain.WishList;
29.20 +import org.apache.wicket.markup.repeater.RepeatingView;
29.21 +
29.22 +public class WishlistMenuPanel extends DeckPanel {
29.23 +
29.24 + private static final String id = "hatch";
29.25 +
29.26 + public WishlistMenuPanel( LoadableWishlistModel wishlistModel) {
29.27 + super(id);
29.28 +
29.29 + RepeatingView deckRows = new RepeatingView("deckRow");
29.30 + add(deckRows);
29.31 +
29.32 +// deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("add wish to list", wishlistModel) {
29.33 +// @Override
29.34 +// public void onClick() {
29.35 +// setResponsePage(WishAddPage.class);
29.36 +// }
29.37 +// }));
29.38 +
29.39 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("view wishlist", wishlistModel) {
29.40 + @Override
29.41 + public void onClick() {
29.42 + setResponsePage(new ViewWishlistPage((LoadableWishlistModel) getModel()));
29.43 + }
29.44 + }));
29.45 +
29.46 +
29.47 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("edit wishlist", wishlistModel) {
29.48 + @Override
29.49 + public void onClick() {
29.50 + setResponsePage(new EditWishlistPage((LoadableWishlistModel) getModel()));
29.51 + }
29.52 + }));
29.53 +
29.54 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("remove wishlist", wishlistModel) {
29.55 + @Override
29.56 + public void onClick() {
29.57 +// setResponsePage(new WishRemovePage((WishItem) getModelObject()));
29.58 + }
29.59 + }));
29.60 +
29.61 + deckRows.add(new DeckRow(deckRows.newChildId(), new DeckLink<WishList>("new wishlist", wishlistModel) {
29.62 + @Override
29.63 + public void onClick() {
29.64 + setResponsePage(new NewWishlistPage());
29.65 + }
29.66 + }));
29.67 +
29.68 + }
29.69 +
29.70 +}
30.1 --- a/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java Wed Oct 07 23:38:04 2009 +0200
30.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/java/net/sf/wishlist/enterprise/client/web/wicket/wish/tag/TagWishesPage.java Fri Oct 09 12:11:43 2009 +0200
30.3 @@ -2,7 +2,7 @@
30.4
30.5 import java.util.Set;
30.6 import net.sf.wishlist.enterprise.client.web.wicket.AuthenticatedWishlistSession;
30.7 -import net.sf.wishlist.enterprise.client.web.wicket.CockpitPanel;
30.8 +import net.sf.wishlist.enterprise.client.web.wicket.JibPanel;
30.9 import net.sf.wishlist.enterprise.client.web.wicket.KeelPanel;
30.10 import net.sf.wishlist.enterprise.client.web.wicket.wish.WishPage;
30.11 import net.sf.wishlist.enterprise.client.web.wicket.wish.panel.WishPoolPanel;
30.12 @@ -22,7 +22,7 @@
30.13 }
30.14
30.15 private void addLayout(Tag tag){
30.16 - add( new CockpitPanel(COCKPIT_ID,"tag"));
30.17 + add( new JibPanel(JIB_ID,"tag"));
30.18 add( new WebMarkupContainer(HATCH_ID));
30.19 addCargo(tag);
30.20
31.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Wed Oct 07 23:38:04 2009 +0200
31.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/cargo.css Fri Oct 09 12:11:43 2009 +0200
31.3 @@ -11,10 +11,10 @@
31.4 .right{ text-align: right; }
31.5 .fleft{ float: left; }
31.6
31.7 -#lookout { font-size: 16pt; font-weight: bold; padding: 0.2em 2em 0.2em 0; }
31.8 +#lookout { font-size: 16pt; font-weight: bold; padding: 0.2em 1em 0.2em 4.5em; }
31.9 #lookout a { padding: 0.2em 2em; text-decoration: none;}
31.10
31.11 -#jib { font-size: 1.6em; font-weight: bold; }
31.12 +#jib { font-size: 1.6em; font-weight: bold; padding: 0.2em 1em 0.2em 4.5em; }
31.13
31.14 #hatch { vertical-align: top; padding: 0.01em; }
31.15 #hatch ul { margin: 0.01em; padding: 0.01em; }
31.16 @@ -31,7 +31,10 @@
31.17 #anchor { color: #ababab; font-size: 7pt; text-align: left; padding: 0em 2em; }
31.18 #anchor a, #anchor a:visited { color: #ababab; }
31.19
31.20 -#cargo { padding: 3em; text-align: center; vertical-align: top; }
31.21 +
31.22 +
31.23 +
31.24 +
31.25
31.26
31.27 #cargo table#searchBox { text-align: center; }
32.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/grid.css Wed Oct 07 23:38:04 2009 +0200
32.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/grid.css Fri Oct 09 12:11:43 2009 +0200
32.3 @@ -19,7 +19,7 @@
32.4 #keel { display: table; }
32.5 #innerhull { }
32.6 #bulkhead { display: table; }
32.7 -#ballast { }
32.8 +#ballast { }
32.9
32.10
32.11 #prow { }
32.12 @@ -37,6 +37,7 @@
32.13
32.14 #cargo { }
32.15
32.16 +
32.17 #tug { display: table-row; }
32.18 #lighthouse { display: table-row; }
32.19 #ama { display: table-cell; }
33.1 --- a/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Wed Oct 07 23:38:04 2009 +0200
33.2 +++ b/wish-clients/wish-web/wish-wicket/src/main/webapp/styles/wish.css Fri Oct 09 12:11:43 2009 +0200
33.3 @@ -52,11 +52,12 @@
33.4 .compartment { padding: 0.2em 1em; }
33.5 body { padding: 0.2em; }
33.6 #ocean { margin-left: 1em; }
33.7 -#ballast { width: 40em; padding: 2em; min-height: 25em; }
33.8 +#ballast { width: 40em; min-height: 25em; padding: 2em 1em; }
33.9 #port { width: 1em; min-width: 1em; }
33.10 #starboard { width: 1em; min-width: 1em; }
33.11 #hatch { width: 8em; min-width: 8em; }
33.12 -#deck { width: 6em; min-width: 6em; }
33.13 +#deck { width: 1em; min-width: 1em; }
33.14 +#bow, #stern { height: 0.2em; }
33.15 #ama { padding: 0.8em 0 0 1em; }
33.16 #tug > .compartment { margin: 0 0 0.5em 0; text-align: center; }
33.17 #net > .compartment { margin: 0.5em 0 0 0; text-align: center; }
34.1 --- a/wish-common/wish-domain/src/main/java/net/sf/wishlist/enterprise/common/domain/WishList.java Wed Oct 07 23:38:04 2009 +0200
34.2 +++ b/wish-common/wish-domain/src/main/java/net/sf/wishlist/enterprise/common/domain/WishList.java Fri Oct 09 12:11:43 2009 +0200
34.3 @@ -104,7 +104,7 @@
34.4 return null;
34.5 WishList wishlist = new WishList();
34.6
34.7 - if( realWishlist.wishlistId <= 0 )
34.8 +// if( realWishlist.wishlistId <= 0 )
34.9 wishlist.setWishlistId( 0+realWishlist.getWishlistId() );
34.10
34.11 if( realWishlist.getTitle() != null )
35.1 --- a/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/dao/IWishRepository.java Wed Oct 07 23:38:04 2009 +0200
35.2 +++ b/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/dao/IWishRepository.java Fri Oct 09 12:11:43 2009 +0200
35.3 @@ -6,7 +6,6 @@
35.4 package net.sf.wishlist.enterprise.server.logic.dao;
35.5
35.6 import java.util.List;
35.7 -import java.util.Set;
35.8 import net.sf.wishlist.enterprise.common.domain.Tag;
35.9 import net.sf.wishlist.enterprise.common.domain.WishItem;
35.10 import net.sf.wishlist.enterprise.common.domain.WishList;
35.11 @@ -41,4 +40,6 @@
35.12
35.13 public WishList findWishlist(long wishlistId);
35.14
35.15 + public void updateWishlist(WishList wishlist);
35.16 +
35.17 }
36.1 --- a/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/dao/WishRepository.java Wed Oct 07 23:38:04 2009 +0200
36.2 +++ b/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/dao/WishRepository.java Fri Oct 09 12:11:43 2009 +0200
36.3 @@ -4,15 +4,11 @@
36.4 */
36.5 package net.sf.wishlist.enterprise.server.logic.dao;
36.6
36.7 -import java.util.ArrayList;
36.8 import java.util.List;
36.9 -import java.util.Set;
36.10 import javax.persistence.Query;
36.11 import net.sf.wishlist.enterprise.common.domain.Tag;
36.12 import net.sf.wishlist.enterprise.common.domain.WishItem;
36.13 import net.sf.wishlist.enterprise.common.domain.WishList;
36.14 -import net.sf.wishlist.enterprise.common.exception.WishLogicalError;
36.15 -import net.sf.wishlist.enterprise.common.exception.WishLogicalException;
36.16 import org.springframework.stereotype.Repository;
36.17 import org.springframework.transaction.annotation.Transactional;
36.18
36.19 @@ -161,5 +157,30 @@
36.20 assert wishlistId > 0;
36.21 return entityManager.find(WishList.class, wishlistId);
36.22 }
36.23 +
36.24 + @Override
36.25 + public void updateWishlist(WishList wishlist) {
36.26 +
36.27 + log.debug("update wishlist" + wishlist);
36.28 +
36.29 + assert wishlist != null;
36.30 + assert wishlist.getTitle() != null;
36.31 + assert wishlist.getTitle().length() > 0;
36.32 + assert wishlist.getWishlistId() > 0;
36.33 +
36.34 +
36.35 + WishList realWishlist = findWishlist(wishlist.getWishlistId());
36.36 + realWishlist.setTitle(wishlist.getTitle());
36.37 + realWishlist.setDescription(wishlist.getDescription());
36.38 +
36.39 + // TODO tags
36.40 +// realWishlist.setTags(wishlist.getTags());
36.41 +
36.42 + entityManager.merge(realWishlist);
36.43 + entityManager.flush();
36.44 + }
36.45 +
36.46 +
36.47 +
36.48 }
36.49
37.1 --- a/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/service/IWishService.java Wed Oct 07 23:38:04 2009 +0200
37.2 +++ b/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/service/IWishService.java Fri Oct 09 12:11:43 2009 +0200
37.3 @@ -36,6 +36,8 @@
37.4 public Set<Tag> findTags(Dreamer dreamer);
37.5
37.6 public void addWishlist(WishList wishlist, Dreamer dreamer);
37.7 +
37.8 + public void updateWishlist(WishList wishlist, Dreamer dreamer);
37.9
37.10 public WishList findWishlist(Long wishlistId, Dreamer dreamer);
37.11
38.1 --- a/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/service/WishService.java Wed Oct 07 23:38:04 2009 +0200
38.2 +++ b/wish-server/wish-logic/src/main/java/net/sf/wishlist/enterprise/server/logic/service/WishService.java Fri Oct 09 12:11:43 2009 +0200
38.3 @@ -242,6 +242,13 @@
38.4 * Should these be in the domain class?
38.5 */
38.6 private boolean isValidEditor(WishItem wish, Dreamer dreamer) {
38.7 + // TODO editor check
38.8 + log.warn("NO LOGIC FOR EDITOR CHECKS. YET.");
38.9 + return true;
38.10 + }
38.11 +
38.12 + private boolean isValidEditor(WishList wishlist, Dreamer dreamer) {
38.13 + // TODO editor check
38.14 log.warn("NO LOGIC FOR EDITOR CHECKS. YET.");
38.15 return true;
38.16 }
38.17 @@ -262,6 +269,15 @@
38.18 return false;
38.19 }
38.20
38.21 + private boolean isValidWishlist(WishList wishlist) {
38.22 + if (wishlist != null && isValidId(wishlist.getWishlistId())) {
38.23 + if (wishlist.getTitle() != null && wishlist.getTitle().length() > 0) {
38.24 + return true;
38.25 + }
38.26 + }
38.27 + return false;
38.28 + }
38.29 +
38.30 private boolean isValidNewWish(WishItem wish) {
38.31 if (wish != null && !isValidId(wish.getWishId())) {
38.32 if (wish.getTitle() != null && wish.getTitle().length() > 0) {
38.33 @@ -400,8 +416,13 @@
38.34 // log.error("WISHES: " + wishRepository.findWishes(dreamer.getDreamerId()));
38.35
38.36
38.37 +
38.38 +// log.debug("found real wishlist: "+ realWishlist);
38.39 +
38.40 WishList wishlist = WishList.cloneFullWishlist(realWishlist);
38.41 realWishlist = null;
38.42 +// log.debug("returning wishlist: "+ wishlist);
38.43 +
38.44 return wishlist;
38.45
38.46 } else {
38.47 @@ -447,5 +468,54 @@
38.48 log.warn("NO LOGIC FOR ACCESS CHECKS. YET.");
38.49 return true;
38.50 }
38.51 +
38.52 + @Override
38.53 + public void updateWishlist(WishList wishlist, Dreamer dreamer) {
38.54 + log.info("Updating wishlist: " + wishlist);
38.55 + if (isValidWishlistReference(wishlist)) {
38.56 + if (isValidDreamerReference(dreamer)) {
38.57 +
38.58 + WishList realWishlist = wishRepository.findWishlist(wishlist.getWishlistId());
38.59 + if (isValidWishlistReference(realWishlist)) {
38.60 + Dreamer realDreamer = dreamerRepository.findDreamer(dreamer.getDreamerId());
38.61 + if (isValidDreamerReference(realDreamer)) {
38.62 +
38.63 + if (isValidEditor(realWishlist, realDreamer)) {
38.64 +
38.65 + if (isValidWishlist(wishlist)) {
38.66 +
38.67 +
38.68 +// log.error("WISHES: " + wishRepository.findWishes(dreamer.getDreamerId()));
38.69 +
38.70 + wishRepository.updateWishlist(wishlist);
38.71 +
38.72 +// log.error("WISHES: " + wishRepository.findWishes(dreamer.getDreamerId()));
38.73 +
38.74 +
38.75 + } else {
38.76 + log.info("Wishlist is not valid");
38.77 + throw new WishLogicalException(WishLogicalError.WISHLIST_INVALID);
38.78 + }
38.79 +
38.80 + } else {
38.81 + throw new WishLogicalException(WishLogicalError.PERMISSION_DENIED);
38.82 + }
38.83 +
38.84 + } else {
38.85 + throw new WishLogicalException(WishLogicalError.DREAMER_INVALID);
38.86 + }
38.87 + } else {
38.88 + throw new WishLogicalException(WishLogicalError.WISHLIST_NOTFOUND);
38.89 + }
38.90 + } else {
38.91 + throw new WishLogicalException(WishLogicalError.DREAMER_INVALID);
38.92 + }
38.93 + } else {
38.94 + log.info("Wishlist reference is not valid");
38.95 + throw new WishLogicalException(WishLogicalError.WISHLIST_INVALID);
38.96 + }
38.97 + }
38.98 +
38.99 +
38.100 }
38.101