Skip to content

Revert "trouble with tags" #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnastasiaQuail wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "trouble with tags" #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 67 additions & 172 deletions Perepelova_A/Lecture3/game-number/.idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Perepelova_A/Lecture3/game-number/game-number.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp/tags" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/tags" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
Expand Down
23 changes: 0 additions & 23 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/LooseOrWin.jsp
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/Lose
View file
Open in desktop

This file was deleted.

35 changes: 11 additions & 24 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/WEB-INF/tag.tld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,15 @@
http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
<tlib-version>1.0</tlib-version>
<short-name>tags</short-name>
<uri>/WEB-INF/tags</uri>
<tag>
<name>check</name>
<tag-class>tags.CheckLoseWin</tag-class>
<body-content>empty</body-content>
<attribute>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
<tag>
<name>parse</name>
<tag-class>tags.Parser</tag-class>
<body-content>empty</body-content>
<attribute>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
<short-name>m</short-name>
<uri>http://exigen.ru/students/tags</uri>
<function>
<name>Checking</name>
<function-class>CheckLoseWin</function-class>
<function-signature>boolean checking(java.lang.Integer)</function-signature>
</function>
<function>Parse</function>
<function-class>Parser</function-class>
<function-signature>Integer parse(java.lang.String)</function-signature>

</taglib>
2 changes: 1 addition & 1 deletion Perepelova_A/Lecture3/game-number/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<web-app>
<display-name>Archetype Created Web Application</display-name>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>Lose.jsp</welcome-file>
</welcome-file-list>
</web-app>

8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/Win
View file
Open in desktop

This file was deleted.

23 changes: 18 additions & 5 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="m" tagdir="/WEB-INF/tags" %>

<html>
<body>
<h2>Hello World!Play with me!</h2>

<form action="LooseOrWin.jsp" method = "POST">
<Form action="${todo}" method = "post">
<p><input type="text" name="getnumber"/></p>
<input type="hidden" name="action" value="add">
<p> <input type = "submit" value = "Go"> </p>
</form>
<p> <input type = "submit" name = "get" value = "Go"> </p>

<c:catch var="myException">
<c:set var="number" scope ="session" value ="<m:parse value ='${getnumber}'/>" />
</c:catch>

<c:if test="${myException != null}">
There was an exception: %{myException.message}
</c:if>
<c:if test="${myException == null}">
<c:set var="check" scope ="session" value="<m:checking value=${number}/>" />
<c:if test = "${check} = true">
<c:set var="todo" value="Win.jsp"/>
</c:if>
<c:if test = "${check} = false">
<c:set var="todo" value="Lose.jsp"/>
</c:if>
</form>
</body>
</html>
47 changes: 0 additions & 47 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/tags/CheckLoseWin.java
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/tags/NullStringExeption.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Perepelova_A/Lecture3/game-number/src/main/webapp/tags/Parser.java
View file
Open in desktop

This file was deleted.

Binary file modified Perepelova_A/Lecture3/game-number/target/jsp-demo.war
View file
Open in desktop
Binary file not shown.
23 changes: 0 additions & 23 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/LooseOrWin.jsp
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/Lose
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/LooseOrWin.jsp
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/Lose
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<html>
<body>
<h2> Sorry, you lose(</h2>
<c:set var="real_number"><%= request.getParameter("curnumber")%></c:set>
<p>The number was ${real_number}</p>
<p>The number was ${cur_number}</p>
<a href="<c:url value='/index.jsp'/>" >Try again!</a>
</body>
</html>
5 changes: 2 additions & 3 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/Win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<html>
<body>
<h2> You win!!!(</h2>
<c:set var="real_number"><%= request.getParameter("curnumber")%></c:set>
<p>The number was ${real_number}</p>
<h2> You win!!! =)(</h2>
<p>The number was ${cur_number}</p>
<a href="<c:url value='/index.jsp'/>" >Try again!</a>
</body>
</html>
35 changes: 11 additions & 24 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/tag.tld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,15 @@
http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
<tlib-version>1.0</tlib-version>
<short-name>tags</short-name>
<uri>/WEB-INF/tags</uri>
<tag>
<name>check</name>
<tag-class>tags.CheckLoseWin</tag-class>
<body-content>empty</body-content>
<attribute>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
<tag>
<name>parse</name>
<tag-class>tags.Parser</tag-class>
<body-content>empty</body-content>
<attribute>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
<short-name>m</short-name>
<uri>http://exigen.ru/students/tags</uri>
<function>
<name>Checking</name>
<function-class>CheckLoseWin</function-class>
<function-signature>boolean checking(java.lang.Integer)</function-signature>
</function>
<function>Parse</function>
<function-class>Parser</function-class>
<function-signature>Integer parse(java.lang.String)</function-signature>

</taglib>
26 changes: 3 additions & 23 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/tags/CheckLoseWin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,14 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
import javax.servlet.jsp.tagext.TagSupport;
import java.util.Random;

/**
* Created by user on 19.11.2015.
*/
public class CheckLoseWin extends SimpleTagSupport {
public class CheckLoseWin extends TagSupport {

private Integer value;
public void setValue(Integer val){
this.value = val;
}

@Override
public void doTag() throws JspException, IOException {
JspWriter out = getJspContext().getOut();
try{
out.print(checking(value));
}
catch (NullStringExeption e)
{
e.printStackTrace();
}
}

public boolean checking(Integer value)throws NullStringExeption{
public boolean checking(Integer value){
Random random = new Random();
if(false) throw new NullStringExeption("fff");
if(value.equals(random.nextInt(101)))
return true;
else
Expand Down
8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/tags/NullStringExeption.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Perepelova_A/Lecture3/game-number/target/jsp-demo/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<web-app>
<display-name>Archetype Created Web Application</display-name>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>Lose.jsp</welcome-file>
</welcome-file-list>
</web-app>

8 changes: 0 additions & 8 deletions Perepelova_A/Lecture3/game-number/target/jsp-demo/Win
View file
Open in desktop

This file was deleted.

Loading