cleanups after review, ticket 390

This commit is contained in:
zzz
2011-01-24 13:20:06 +00:00
parent 4191eb98b0
commit bf99b04e0a
7 changed files with 1583 additions and 1590 deletions

View File

@ -144,6 +144,7 @@ public class PluginUpdateHandler extends UpdateHandler {
} }
buf.append(": "); buf.append(": ");
buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred))); buf.append(_("{0}B transferred", DataHelper.formatSize2(currentWrite + alreadyTransferred)));
buf.append("</b>");
updateStatus(buf.toString()); updateStatus(buf.toString());
} }

View File

@ -26,11 +26,13 @@ class DestReplyMessageHandler extends HandlerImpl {
_log.debug("Handle message " + message); _log.debug("Handle message " + message);
DestReplyMessage msg = (DestReplyMessage) message; DestReplyMessage msg = (DestReplyMessage) message;
Destination d = msg.getDestination(); Destination d = msg.getDestination();
if (d != null) if (d != null) {
session.destReceived(d); session.destReceived(d);
Hash h = msg.getHash(); } else {
if (h != null) Hash h = msg.getHash();
session.destLookupFailed(h); if (h != null)
session.destLookupFailed(h);
}
// else let it time out // else let it time out
} }
} }

View File

@ -75,7 +75,7 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
/** /**
* Sets the data. * Sets the data.
* @param data of correct length, or null * @param in the stream to read
* @throws RuntimeException if data already set. * @throws RuntimeException if data already set.
*/ */
public void readBytes(InputStream in) throws DataFormatException, IOException { public void readBytes(InputStream in) throws DataFormatException, IOException {

View File

@ -865,7 +865,7 @@ input:active {
color: #EE9; color: #EE9;
} }
input[type=text] { input[type=text], input[type=password] {
background: #000; background: #000;
color: #EE9; color: #EE9;
margin: 5px 10px; margin: 5px 10px;
@ -881,7 +881,7 @@ input[type=text] {
box-shadow: inset 1px 1px 1px 0px #000; box-shadow: inset 1px 1px 1px 0px #000;
} }
input[type=text]:active, input[type=text]:hover { input[type=text]:active, input[type=text]:hover, input[type=password]:active, input[type=password]:hover {
background: #000; background: #000;
} }
@ -1080,4 +1080,4 @@ div.footnote hr{
margin-top: -5px; margin-top: -5px;
margin-bottom: -5px; margin-bottom: -5px;
margin-right: 5px; margin-right: 5px;
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,423 +1,421 @@
/* I2P Tunnel Manager Theme: Light */ /* I2P Tunnel Manager Theme: Light */
/* Description: Light blue highlights. */ /* Description: Light blue highlights. */
/* Author: dr|z3d */ /* Author: dr|z3d */
body { body {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
text-align: center; text-align: center;
font-family: "Lucida Sans Unicode", Verdana, Helvetica, sans-serif; font-family: "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
background: #eef url('images/snowcamo.png'); background: #eef url('images/snowcamo.png');
color: #001; color: #001;
font-size: 10pt; font-size: 10pt;
/* we've avoided Tantek Hacks so far, /* we've avoided Tantek Hacks so far,
** but we can't avoid using the non-w3c method of ** but we can't avoid using the non-w3c method of
** box rendering. (and therefore one of mozilla's ** box rendering. (and therefore one of mozilla's
** proprietry -moz properties (which hopefully they'll ** proprietry -moz properties (which hopefully they'll
** drop soon). ** drop soon).
*/ */
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
background: #99f url(images/magic.png); background: #99f url(images/magic.png);
} }
div { div {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
label { label {
margin: 0px 4px; margin: 0px 4px;
padding: 1px 10px 2px 0px; padding: 1px 10px 2px 0px;
float: left; float: left;
width: 120px; width: 120px;
height: 24px; height: 24px;
font-weight: normal; font-weight: normal;
text-align: right; text-align: right;
font-size: 8pt; font-size: 8pt;
font-style: italic; font-style: italic;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
line-height: 120%; line-height: 120%;
color: #101; color: #101;
} }
h4 { h4 {
font-size: 11pt; font-size: 11pt;
font-weight: bold !important; font-weight: bold !important;
color: #115; color: #115;
text-align: left; text-align: left;
border: 1px solid #115; border: 1px solid #115;
margin: 5px 0 15px 0; margin: 5px 0 15px 0;
padding: 5px 10px; padding: 5px 10px;
background: url(images/header.png) repeat-x center center; background: url(images/header.png) repeat-x center center;
text-transform: uppercase; letter-spacing: 0.07em;
letter-spacing: 0.07em; -moz-border-radius: 4px;
-moz-border-radius: 4px; -khtml-border-radius: 4px;
-khtml-border-radius: 4px; border-radius: 4px;
border-radius: 4px; -moz-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
text-shadow: 0px 1px 1px #77f; -khtml-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
-moz-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4); box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
-khtml-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4); }
box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
} a {
text-decoration: none;
a { }
text-decoration: none;
} form {
margin: 0px;
form { }
margin: 0px;
} textarea, input, select, button, a {
-moz-box-sizing: border-box;
textarea, input, select, button, a { box-sizing: border-box;
-moz-box-sizing: border-box; font-size: 8.5pt;
box-sizing: border-box; float: left;
font-size: 8.5pt; vertical-align: middle;
float: left; }
vertical-align: middle;
} button {
float: none;
button { text-decoration: none;
float: none; }
text-decoration: none;
} textarea {
color: #003;
textarea { background: #fff;
color: #003; border: 1px solid #447;
background: #fff; -moz-border-radius: 4px;
border: 1px solid #447; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; }
border-radius: 4px;
} textarea:active {
-moz-box-shadow: inset 0px 0px 0px 1px #f60;
textarea:active { -khtml-box-shadow: inset 0px 0px 0px 1px #f60;
-moz-box-shadow: inset 0px 0px 0px 1px #f60; box-shadow: inset 0px 0px 0px 1px #f60;
-khtml-box-shadow: inset 0px 0px 0px 1px #f60; }
box-shadow: inset 0px 0px 0px 1px #f60;
} br {
clear: left;
br { }
clear: left;
} div.statusNotRunning {
float: left;
div.statusNotRunning { width: 68px;
float: left; height: 24px;
width: 68px; overflow: hidden;
height: 24px; color: #d00;
overflow: hidden; background: url('images/console_status_stopped.png') 0 0 no-repeat;
color: #d00; padding-top: 24px;
background: url('images/console_status_stopped.png') 0 0 no-repeat; margin-top: 4px;
padding-top: 24px; }
margin-top: 4px;
} div.statusRunning {
float: left;
div.statusRunning { width: 68px;
float: left; height: 24px;
width: 68px; overflow: hidden;
height: 24px; color: #0b0;
overflow: hidden; background: url('images/console_status_running.png') 0 0 no-repeat;
color: #0b0; padding-top: 24px;
background: url('images/console_status_running.png') 0 0 no-repeat; margin-top: 4px;
padding-top: 24px; }
margin-top: 4px;
} div.statusStarting {
float: left;
div.statusStarting { width: 68px;
float: left; height: 24px;
width: 68px; overflow: hidden;
height: 24px; color: #339933;
overflow: hidden; background: url('images/console_status_starting.png') 0 0 no-repeat;
color: #339933; padding-top: 24px;
background: url('images/console_status_starting.png') 0 0 no-repeat; margin-top: 4px;
padding-top: 24px; }
margin-top: 4px;
} hr {
display: none;
hr { }
display: none;
} .separator, .subdivider {
clear: both;
.separator, .subdivider { height: 1px;
clear: both; margin: 10px 0px 10px 0px;
height: 1px; border-bottom: 1px dotted #447;
margin: 10px 0px 10px 0px; /*
border-bottom: 1px dotted #447; display: none;
/* */
display: none; }
*/
} .subdivider {
border-bottom: 1px dotted #447;
.subdivider { padding: 5px 0;
border-bottom: 1px dotted #447; }
padding: 5px 0;
} .freetext {
width: 150px;
.freetext { height: 24px;
width: 150px; border: 1px solid #447;
height: 24px; padding: 2px;
border: 1px solid #447; margin: 4px 0 2px 0px;
padding: 2px; font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
margin: 4px 0 2px 0px; font-weight: bold;
font: 9pt "Lucida Console", "DejaVu Sans Mono", Courier, mono; background: #fff;
font-weight: bold; color: #003;
background: #fff; -moz-border-radius: 4px;
color: #003; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; /*
border-radius: 4px; -moz-box-shadow: inset 0px -1px 1px 0px #fff;
/* */
-moz-box-shadow: inset 0px -1px 1px 0px #fff; }
*/
} .freetext:active {
-moz-box-shadow: inset 0px 0px 0px 1px #f60;
.freetext:active { -khtml-box-shadow: inset 0px 0px 0px 1px #f60;
-moz-box-shadow: inset 0px 0px 0px 1px #f60; box-shadow: inset 0px 0px 0px 1px #f60;
-khtml-box-shadow: inset 0px 0px 0px 1px #f60; }
box-shadow: inset 0px 0px 0px 1px #f60;
} .control, control:link, control:visited {
margin: 4px 0 0 4px !important;
.control, control:link, control:visited { padding: 2px;
margin: 4px 0 0 4px !important; overflow: hidden;
padding: 2px; min-width: 60px;
overflow: hidden; font-weight: bold;
min-width: 60px; background: #ffe;
font-weight: bold; color: #001;
background: #ffe; border: 1px outset #66a;
color: #001; text-align: center;
border: 1px outset #66a; white-space: nowrap;
text-align: center; -moz-border-radius: 4px;
white-space: nowrap; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; margin-top: 8px;
border-radius: 4px; text-decoration: none;
margin-top: 8px; }
text-decoration: none;
} /*
.control:active {
/* border: 1px inset;
.control:active { background-color: #003;
border: 1px inset; color: #f60;
background-color: #003; text-decoration: none;
color: #f60; }
text-decoration: none; */
}
*/ .control:hover, control:visited:hover {
background-color: #f60;
.control:hover, control:visited:hover { color: #fff !important;
background-color: #f60; text-decoration: none;
color: #fff !important; border: 1px solid #f60 !important;
text-decoration: none; background: #f60 !important;
border: 1px solid #f60 !important; color: #fff;
background: #f60 !important; -moz-box-shadow: inset 0px 0px 0px 1px #fff !important;
color: #fff; -khtml-box-shadow: inset 0px 0px 0px 1px #fff !important;
-moz-box-shadow: inset 0px 0px 0px 1px #fff !important; box-shadow: inset 0px 0px 0px 1px #fff !important;
-khtml-box-shadow: inset 0px 0px 0px 1px #fff !important; }
box-shadow: inset 0px 0px 0px 1px #fff !important;
} .control:link, control:visited {
margin: 4px 0 0 4px !important;
.control:link, control:visited { padding: 2px;
margin: 4px 0 0 4px !important; overflow: hidden;
padding: 2px; min-width: 60px;
overflow: hidden; font-weight: bold;
min-width: 60px; color: #001;
font-weight: bold; border: 1px outset #66a;
color: #001; text-align: center;
border: 1px outset #66a; white-space: nowrap;
text-align: center; -moz-border-radius: 4px;
white-space: nowrap; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; margin-top: 8px;
border-radius: 4px; background: #ffe url(images/header.png) center center repeat:x !important;
margin-top: 8px; text-decoration: none;
background: #ffe url(images/header.png) center center repeat:x !important; }
text-decoration: none;
} .panel {
width: 800px;
.panel { margin: 16px auto 16px auto;
width: 800px; overflow: hidden;
margin: 16px auto 16px auto; text-align: left !important;
overflow: hidden; font-size: 7pt;
text-align: left !important; background-color: #fff;
font-size: 7pt; background: url(images/magic.png);
background-color: #fff; -moz-border-radius: 4px;
background: url(images/magic.png); -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; border: 1px solid #002;
border-radius: 4px; padding: 10px 20px;
border: 1px solid #002; -moz-box-shadow: inset 0px 0px 1px 1px #bbf;
padding: 10px 20px; -khtml-box-shadow: inset 0px 0px 1px 1px #bbf;
-moz-box-shadow: inset 0px 0px 1px 1px #bbf; box-shadow: inset 0px 0px 1px 1px #bbf;
-khtml-box-shadow: inset 0px 0px 1px 1px #bbf; background: none repeat scroll 0 0 #EEEEFF;
box-shadow: inset 0px 0px 1px 1px #bbf; background: #fff url(images/magic.png);
background: none repeat scroll 0 0 #EEEEFF; border: 1px solid #444477;
background: #fff url(images/magic.png); color: #000011;
border: 1px solid #444477; }
color: #000011;
} .panel .footer {
float: right;
.panel .footer { padding: 4px;
float: right; }
padding: 4px;
} .toolbox {
float: right;
.toolbox { }
float: right;
} .rowItem {
width: 750px;
.rowItem { float: left;
width: 750px; margin: 2px 0;
float: left; }
margin: 2px 0;
} .comment {
font-weight: bold;
.comment { display: block;
font-weight: bold; padding: 2px 10px 0 20px;
display: block; text-align: left;
padding: 2px 10px 0 20px; }
text-align: left;
} .text {
height: 24px;
.text { width: 150px;
height: 24px; padding: 0 0 0 2px;
width: 150px; float: left;
padding: 0 0 0 2px; margin: 0;
float: left; font-size: 8.5pt !important;
margin: 0; font-weight: bold;
font-size: 8.5pt !important; }
font-weight: bold;
} .accessKey {
text-decoration: underline;
.accessKey { }
text-decoration: underline;
} #globalOperationsPanel {
background-color: #fff;
#globalOperationsPanel { border: 1px solid #003;
background-color: #fff; padding: 5px 20px 11px 10px;
border: 1px solid #003; -moz-box-shadow: inset 0px 0px 0px 1px #f00;
padding: 5px 20px 11px 10px; -moz-box-shadow: inset 0px 0px 1px 0px #f60;
-moz-box-shadow: inset 0px 0px 0px 1px #f00; background: #fff url(images/magic.png);
-moz-box-shadow: inset 0px 0px 1px 0px #f60; border: 1px solid #444477;
background: #fff url(images/magic.png); color: #613;
border: 1px solid #444477; }
color: #613;
} #globalOperationsPanel .control {
min-width: 120px;
#globalOperationsPanel .control { font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
min-width: 120px; font-weight: bold;
font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif; }
font-weight: bold;
} #globalOperationsPanel .control:link {
min-width: 120px;
#globalOperationsPanel .control:link { }
min-width: 120px;
}
globalOperationsPanel .control:link {
min-width: 120px;
globalOperationsPanel .control:link { margin: 4px 0 0 4px !important;
min-width: 120px; padding: 2px;
margin: 4px 0 0 4px !important; overflow: hidden;
padding: 2px; font-weight: bold;
overflow: hidden; background-color: #bbbbff;
font-weight: bold; color: black;
background-color: #bbbbff; border: 1px outset #ddddc0;
color: black; text-align: center;
border: 1px outset #ddddc0; white-space: nowrap;
text-align: center; -moz-border-radius: 4px;
white-space: nowrap; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; margin-top: 8px;
border-radius: 4px; background: #ffe url(images/header.png) 0 0 repeat: x !important;
margin-top: 8px; }
background: #ffe url(images/header.png) 0 0 repeat: x !important;
}
globalOperationsPanel .control:visited {
min-width: 120px;
globalOperationsPanel .control:visited { margin: 4px 0 0 4px !important;
min-width: 120px; padding: 2px;
margin: 4px 0 0 4px !important; overflow: hidden;
padding: 2px; font-weight: bold;
overflow: hidden; background-color: #ffe;
font-weight: bold; color: black;
background-color: #ffe; border: 1px outset #ddddc0;
color: black; text-align: center;
border: 1px outset #ddddc0; white-space: nowrap;
text-align: center; -moz-border-radius: 4px;
white-space: nowrap; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; margin-top: 8px;
border-radius: 4px; background: url(images/header.png) 0 0 repeat: x !important;
margin-top: 8px; }
background: url(images/header.png) 0 0 repeat: x !important;
} globalOperationsPanel .control:hover {
min-width: 120px;
globalOperationsPanel .control:hover { margin: 4px 0 0 4px !important;
min-width: 120px; padding: 2px;
margin: 4px 0 0 4px !important; overflow: hidden;
padding: 2px; font-weight: bold;
overflow: hidden; background-color: #003;
font-weight: bold; color: #f60;
background-color: #003; border: 1px outset #fff;
color: #f60; text-align: center;
border: 1px outset #fff; white-space: nowrap;
text-align: center; -moz-border-radius: 4px;
white-space: nowrap; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; margin-top: 8px;
border-radius: 4px; background: url(images/header_on.png) 0 0 repeat: x !important;
margin-top: 8px; }
background: url(images/header_on.png) 0 0 repeat: x !important; .header {
} -moz-border-radius: 4px;
.header { -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; }
border-radius: 4px;
} select {
background-color: #fff;
select { color: #003;
background-color: #fff; margin: 4px;
color: #003; font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
margin: 4px; font-weight: bold;
font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif; border: 1px solid #447;
font-weight: bold; padding: 3px 3px 3px 0;
border: 1px solid #447; min-width: 270px;
padding: 3px 3px 3px 0; font-size: 8pt;
min-width: 270px; max-height: 24px;
font-size: 8pt; -moz-border-radius: 4px;
max-height: 24px; -khtml-border-radius: 4px;
-moz-border-radius: 4px; border-radius: 4px;
-khtml-border-radius: 4px; }
border-radius: 4px;
} select:active {
-moz-box-shadow: inset 0px 0px 0px 1px #f60;
select:active { -khtml-box-shadow: inset 0px 0px 0px 1px #f60;
-moz-box-shadow: inset 0px 0px 0px 1px #f60; box-shadow: inset 0px 0px 0px 1px #f60;
-khtml-box-shadow: inset 0px 0px 0px 1px #f60; }
box-shadow: inset 0px 0px 0px 1px #f60;
} a:link{
color: #359;
a:link{ text-decoration: none;
color: #359; font-weight: bold;
text-decoration: none; word-wrap: break-word;
font-weight: bold; }
word-wrap: break-word;
} a:visited{
color: #218;
a:visited{ text-decoration: none;
color: #218; font-weight: bold;
text-decoration: none; }
font-weight: bold;
} a:hover{
color: #f60;
a:hover{ text-decoration: underline;
color: #f60; font-weight: bold;
text-decoration: underline; }
font-weight: bold;
} a:active{
color: #f93;
a:active{ text-decoration: underline;
color: #f93; font-weight: bold;
text-decoration: underline; }
font-weight: bold;
}

View File

@ -744,7 +744,7 @@ input {
vertical-align: middle; vertical-align: middle;
} }
input[type=text] { input[type=text], input[type=password] {
margin: 3px 5px 3px 5px; margin: 3px 5px 3px 5px;
vertical-align: middle; vertical-align: middle;
} }
@ -754,7 +754,7 @@ select {
vertical-align: middle; vertical-align: middle;
} }
input[type=text], select { input[type=text], input[type=password] select {
background: #001; background: #001;
color: #eef; color: #eef;
border: 1px solid #99f; border: 1px solid #99f;
@ -953,4 +953,4 @@ div.footnote hr{
margin-top: -5px; margin-top: -5px;
margin-bottom: -10px; margin-bottom: -10px;
margin-right: 5px; margin-right: 5px;
} }