MALIO-DEV/PlantUmlServer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TASK] Better usage of JSTL

Browse Source 
Old core_rt reference deleted
This commit is contained in:
Maxime Sinclair
2013-10-16 12:51:14 +02:00
parent 45eb47839d
commit ccc71e7cd4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/webapp/index.jsp
View File

@@ -1,5 +1,5 @@
<%@ page info="index" contentType="text/html; charset=utf-8" pageEncoding="utf-8" session="false" %> <%@ page info="index" contentType="text/html; charset=utf-8" pageEncoding="utf-8" session="false" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<% <%
String contextRoot = request.getContextPath(); String contextRoot = request.getContextPath();
String host = "http://" + request.getServerName() + ":" + request.getServerPort(); String host = "http://" + request.getServerName() + ":" + request.getServerPort();
@@ -8,7 +8,6 @@ String umltext = "";
String imgurl = ""; String imgurl = "";
String svgurl = ""; String svgurl = "";
String txturl = ""; String txturl = "";
String mapurl = "";
Object mapNeeded = request.getAttribute("net.sourceforge.plantuml.servlet.mapneeded"); Object mapNeeded = request.getAttribute("net.sourceforge.plantuml.servlet.mapneeded");
Object encodedAttribute = request.getAttribute("net.sourceforge.plantuml.servlet.encoded"); Object encodedAttribute = request.getAttribute("net.sourceforge.plantuml.servlet.encoded");
if (encodedAttribute != null) { if (encodedAttribute != null) {
@@ -18,7 +17,7 @@ if (encodedAttribute != null) {
svgurl = host + contextRoot + "/svg/" + encoded; svgurl = host + contextRoot + "/svg/" + encoded;
txturl = host + contextRoot + "/txt/" + encoded; txturl = host + contextRoot + "/txt/" + encoded;
if (mapNeeded != null) { if (mapNeeded != null) {
mapurl = host + contextRoot + "/map/" + encoded; pageContext.setAttribute("mapurl", host + contextRoot + "/map/" + encoded);
} }
} }
} }
@@ -69,13 +68,13 @@ if (decodedAttribute != null) {
<a href="<%=svgurl%>">View as SVG</a>&nbsp; <a href="<%=svgurl%>">View as SVG</a>&nbsp;
<a href="<%=txturl%>">View as ASCII Art</a>&nbsp; <a href="<%=txturl%>">View as ASCII Art</a>&nbsp;
<% if (mapNeeded != null) { %> <% if (mapNeeded != null) { %>
<a href="<%=mapurl%>">View Map Data</a> <a href="<c:out value="${mapurl}"/>">View Map Data</a>
<% } //endif %> <% } //endif %>
<p id="diagram"> <p id="diagram">
<% if (mapNeeded != null) { %> <% if (mapNeeded != null) { %>
<img src="<%=imgurl %>" alt="PlantUML diagram" usemap="#umlmap" /> <img src="<%=imgurl %>" alt="PlantUML diagram" usemap="#umlmap" />
<map name="umlmap"> <map name="umlmap">
<c:import url="<%=mapurl %>" /> <c:import url="${mapurl}" />
</map> </map>
<% } else { %> <% } else { %>
<img src="<%=imgurl %>" alt="PlantUML diagram" /> <img src="<%=imgurl %>" alt="PlantUML diagram" />