taylor 2004/06/25 00:22:09
Modified: applications/demo/src/webapp/WEB-INF/demo/simple
PickANumberHelp.jsp PickANumber.jsp
Added: applications/demo/src/webapp/WEB-INF/demo/simple
PickANumberEdit.jsp
Log:
Cleaned up and fixed bugs in Pick a Number portlet
Added Edit Mode to set a preference on the high range
http://nagoya.apache.org/jira/browse/JS2-45
Revision Changes Path
1.3 +28 -1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp
Index: PickANumberHelp.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/PickANumberHelp.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PickANumberHelp.jsp 18 Mar 2004 19:35:02 -0000 1.2
+++ PickANumberHelp.jsp 25 Jun 2004 07:22:09 -0000 1.3
@@ -13,7 +13,34 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<hr/>
+<h2>This is the Help Page for the PickANumber demo portlet</h2>
+<hr/>
+<h3>Instructions</h3>
<p>
- This is the Help Jsp for the PickANumber demo portlet
+This portlet runs the popular 'Pick A Number' guessing game.
+The goal is to guess, in the least number of guesses, a number between [1..{Range}]:
+</p>
+<p>
+where {Range} is the highest possible number<br/>
+where '1' is always the lowest possible number.<br/>
+</p>
+<h4>Winning</h4>
+<p>
+ Who ever guesses in the lowest number of guesses wins.
+</p>
+<p>
+ Take turn with your friends playing this action packed game.
+ This game is sure to provide endless hours of amusement!
+</p>
+<p>
+<hr/>
+<h3>
+Preferences
+</h3>
+<p>
+This portlet has one preference: the <b>Range</b>, which defaults to 100.
+This default value can be overridden as a preference for each portlet entity.
+Select Edit mode to change top range value.
</p>
1.5 +56 -36
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/PickANumber.jsp
Index: PickANumber.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/PickANumber.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PickANumber.jsp 12 May 2004 18:51:54 -0000 1.4
+++ PickANumber.jsp 25 Jun 2004 07:22:09 -0000 1.5
@@ -23,55 +23,75 @@
<portlet:param name="myParam" value="testParam"/>
</portlet:actionURL>
-<c:if test="${empty targetValue}">
- <c:set var="targetValue" scope="session" value="5"/>
- <c:set var="guessCount" scope="session" value="0"/>
-</c:if>
-
<%
PortletSession portletSession = renderRequest.getPortletSession(true);
- Long lg = (Long)portletSession.getAttribute("LastGuess",
PortletSession.APPLICATION_SCOPE);
- String lastGuess = "50";
- if (lg != null)
+ Long value = (Long)portletSession.getAttribute("LastGuess",
PortletSession.APPLICATION_SCOPE);
+ long lastGuess = 0;
+ if (value != null)
{
- lastGuess = lg.toString();
+ lastGuess = value.longValue();
}
- else
- {
- lg = new Long(50);
- lastGuess = "50";
- }
+
%>
-<c:set var="guessCount" scope="session" value="${guessCount + 1}"/>
-
-target = <c:out value="${targetValue}"/>
-<br/>
-
-last guess = <c:out value="${param.Guess}"/>
-
-<br/>
+<c:set var="guessCount" scope="session" value="${GuessCount}"/>
+<c:set var="targetValue" scope="session" value="${TargetValue}"/>
+<c:set var="lastGuess" scope="session" value="${LastGuess}"/>
+<c:set var="topRange" scope="session" value="${TopRange}"/>
+
+<h2>
+Pick a Number Guess Count Game
+</h2>
+
+<c:choose>
+<c:when test="${empty guessCount}">
+</c:when>
+<c:when test="${targetValue == lastGuess}">
+</c:when>
+<c:otherwise>
+You have made <c:out value="${guessCount}"/> guess thus far.
+</c:otherwise>
+</c:choose>
+
+<c:choose>
+<c:when test="${targetValue == lastGuess}">
+<p>
+Start a new Game now!<br/>Enter a number between 1 and <c:out value="${TopRange}"/>
+</p>
+</c:when>
+<c:otherwise>
+<p>
+Enter a number between 1 and <c:out value="${TopRange}"/>
+</p>
+</c:otherwise>
+</c:choose>
-<div>
- You guessed <%=lastGuess%>
- <br/>
- Guess Count <c:out value="${guessCount}"/>
- <br/>
+<p>
<c:choose>
- <c:when test="${targetValue == (param.Guess + 0)}">
- <center><strong>You have guessed the number!!!!</strong></center>
+ <c:when test="${empty targetValue}">
+ Ready to start a New game.
+ </c:when>
+ <c:when test="${empty lastGuess}">
+ Ready to start a New game.
+ </c:when>
+ <c:when test="${targetValue == lastGuess}">
+ <center><strong><%=lastGuess%> is correct! You have guessed the number in
<c:out value="${guessCount}"/> guesses!!!!</strong></center>
<c:remove var="targetValue" scope="session"/>
</c:when>
- <c:when test="${targetValue < (param.Guess + 0)}">
- You have guessed to high. Try a lower Number
+ <c:when test="${targetValue < lastGuess}">
+ You have guessed to high. Try a lower Number
</c:when>
- <c:when test="${targetValue > (param.Guess + 0)}">
+ <c:when test="${targetValue > lastGuess}">
You have guessed to low. Try a higher Number
</c:when>
+ <c:otherwise>
+ Ready to start a New game.
+ </c:otherwise>
</c:choose>
- <br/>
+</p>
+<p>
<form action="<%=myAction%>" method="POST">
- <input type="text" name="Guess" value="<%=lastGuess%>">
- <input type="submit">
+ <input type="text" name="Guess" value="<%=lastGuess%>"/>
+ <input type="submit" value='Guess'/>
</form>
-</div>
+</p>
\ No newline at end of file
1.1
jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/simple/PickANumberEdit.jsp
Index: PickANumberEdit.jsp
===================================================================
<%--
Copyright 2004 The Apache Software Foundation
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.
--%>
<%@ page language="java" session="true" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"; %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ page import="javax.portlet.PortletSession"%>
<portlet:defineObjects/>
<portlet:actionURL var="editAction">
</portlet:actionURL>
<%
String topRange = renderRequest.getPreferences().getValue("TopRange", "101");
%>
<div>
<br/>
<form action="<%=editAction%>" method="POST">
High End of Guess Range: [2..]:
<input type="text" name="TopRange" value="<%=topRange%>">
<input type="submit" value='Save'>
</form>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
