I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit ce1e0558 authored by str4d's avatar str4d
Browse files

Removed WizardBean - it does nothing extra over EditBean

parent f72e16f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/WizardBean.java deleted 100644 → 0
+ 0
− 25
View file @ f72e16f5
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;
}
}
apps/i2ptunnel/jsp/wizard.jsp
+ 7
− 7
View file @ ce1e0558
......@@ -2,10 +2,10 @@
// NOTE: Do the header carefully so there is no whitespace before the <?xml... line
%><%@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"?>
<!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" />
<% String pageStr = request.getParameter("page");
/* 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" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (wizardBean.allowCSS()) {
%><link href="<%=wizardBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=wizardBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% if (editBean.allowCSS()) {
%><link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
%>
</head>
......@@ -82,7 +82,7 @@
} %>
<input type="hidden" name="page" value="<%=curPage%>" />
<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 class="separator">
......@@ -341,7 +341,7 @@
if ("null".equals(clientInterface)) {
clientInterface = "127.0.0.1";
}
for (String ifc : wizardBean.interfaceSet()) {
for (String ifc : editBean.interfaceSet()) {
out.write("<option value=\"");
out.write(ifc);
out.write('\"');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]