marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed WizardBean - it does nothing extra over EditBean

Browse Source
This commit is contained in:
str4d
2012-02-25 19:37:54 +00:00
parent f72e16f571
commit ce1e055848
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/WizardBean.java
View File

@@ -1,25 +0,0 @@
package net.i2p.i2ptunnel.web;
/**
* A temporary data holder for the wizard pages
*
* Warning - This class is not part of the i2ptunnel API, and at some point
* it will be moved from the jar to the war.
* Usage by classes outside of i2ptunnel.war is deprecated.
*/
public class WizardBean extends EditBean {
private boolean _isClient;
public WizardBean() { super(); }
/**
* Whether the tunnel being set up is a client tunnel or not.
* @since 0.8.13
*/
public void setIsClient(String isClient) {
_isClient = Boolean.valueOf(isClient);
}
/** @since 0.8.13 */
public boolean getIsClient() {
return _isClient;
}
}

14
apps/i2ptunnel/jsp/wizard.jsp
View File

@@ -2,10 +2,10 @@
// NOTE: Do the header carefully so there is no whitespace before the <?xml... line // NOTE: Do the header carefully so there is no whitespace before the <?xml... line
%><%@page pageEncoding="UTF-8" %><%@page pageEncoding="UTF-8"
%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.WizardBean" %><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
%><?xml version="1.0" encoding="UTF-8"?> %><?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<jsp:useBean class="net.i2p.i2ptunnel.web.WizardBean" id="wizardBean" scope="request" /> <jsp:useBean class="net.i2p.i2ptunnel.web.EditBean" id="editBean" scope="request" />
<jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" /> <jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
<% String pageStr = request.getParameter("page"); <% String pageStr = request.getParameter("page");
/* Get the number of the page we came from */ /* Get the number of the page we came from */
@@ -50,9 +50,9 @@
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" /> <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (wizardBean.allowCSS()) { <% if (editBean.allowCSS()) {
%><link href="<%=wizardBean.getTheme()%>default.css" rel="stylesheet" type="text/css" /> %><link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=wizardBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" /> <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }
%> %>
</head> </head>
@@ -82,7 +82,7 @@
} %> } %>
<input type="hidden" name="page" value="<%=curPage%>" /> <input type="hidden" name="page" value="<%=curPage%>" />
<input type="hidden" name="tunnel" value="null" /> <input type="hidden" name="tunnel" value="null" />
<input type="hidden" name="nonce" value="<%=wizardBean.getNextNonce()%>" /> <input type="hidden" name="nonce" value="<%=editBean.getNextNonce()%>" />
</div> </div>
<div class="separator"> <div class="separator">
@@ -341,7 +341,7 @@
if ("null".equals(clientInterface)) { if ("null".equals(clientInterface)) {
clientInterface = "127.0.0.1"; clientInterface = "127.0.0.1";
} }
for (String ifc : wizardBean.interfaceSet()) { for (String ifc : editBean.interfaceSet()) {
out.write("<option value=\""); out.write("<option value=\"");
out.write(ifc); out.write(ifc);
out.write('\"'); out.write('\"');