From 7ecb90640c48a501fb951329fba648922fabe06d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 30 Jul 2012 13:15:58 +0000
Subject: [PATCH] fixes after review
---
.../src/org/klomp/snark/PeerCheckerTask.java | 4 +-
.../java/src/org/klomp/snark/Snark.java | 4 +-
.../org/klomp/snark/web/I2PSnarkServlet.java | 2 +-
apps/i2ptunnel/jsp/editClient.jsp | 2 +-
apps/i2ptunnel/jsp/editServer.jsp | 2 +-
apps/i2ptunnel/jsp/index.jsp | 2 +-
apps/i2ptunnel/jsp/wizard.jsp | 2 +-
.../src/net/i2p/router/web/SummaryHelper.java | 7 +-
.../src/net/i2p/client/I2PSessionImpl.java | 6 +-
.../resources/themes/snark/light/snark.css | 2 +-
.../resources/themes/snark/ubergine/snark.css | 150 +++++++++---------
11 files changed, 92 insertions(+), 91 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
index ede3be57b7..ac53f38b63 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@@ -133,7 +133,7 @@ class PeerCheckerTask implements Runnable
// Check if it still wants pieces from us.
if (!peer.isInterested())
{
- if (_log.shouldLog(Log.INFO))
+ if (_log.shouldLog(Log.DEBUG))
_log.debug("Choke uninterested peer: " + peer);
peer.setChoking(true);
uploaders--;
@@ -144,7 +144,7 @@ class PeerCheckerTask implements Runnable
}
else if (overBWLimitChoke)
{
- if (_log.shouldLog(Log.INFO))
+ if (_log.shouldLog(Log.DEBUG))
_log.debug("BW limit (" + upload + "/" + uploaded + "), choke peer: " + peer);
peer.setChoking(true);
uploaders--;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
index 138f2dd2c8..1cb344c5e8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java
@@ -249,8 +249,8 @@ public class Snark
private TrackerClient trackerclient;
private String rootDataDir = ".";
private final CompleteListener completeListener;
- private boolean stopped;
- private boolean starting;
+ private volatile boolean stopped;
+ private volatile boolean starting;
private byte[] id;
private byte[] infoHash;
private String additionalTrackerURL;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index b2b3300ea1..21cf743569 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -232,7 +232,7 @@ public class I2PSnarkServlet extends DefaultServlet {
//out.write("<meta http-equiv=\"refresh\" content=\"" + delay + ";/i2psnark/" + peerString + "\">\n");
out.write("<script src=\"/js/ajax.js\" type=\"text/javascript\"></script>\n" +
"<script type=\"text/javascript\">\n" +
- "var failMessage = \"<div class=\\\"routerdown\\\"><b>" + _("Router is down") + "<\\/b></div>\";\n" +
+ "var failMessage = \"<div class=\\\"routerdown\\\"><b>" + _("Router is down") + "<\\/b><\\/div>\";\n" +
"function requestAjax1() { ajax(\"/i2psnark/.ajax/xhr1.html" + peerString + "\", \"mainsection\", " + (delay*1000) + "); }\n" +
"function initAjax() { setTimeout(requestAjax1, " + (delay*1000) +"); }\n" +
"</script>\n");
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 2fcf487f55..d2ca8f7ad3 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -22,7 +22,7 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (editBean.allowCSS()) {
- %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico">
+ %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 3b7e7b9435..1931182cce 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -22,7 +22,7 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (editBean.allowCSS()) {
- %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico">
+ %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 02a21bf186..5fad2c9ad4 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -24,7 +24,7 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (indexBean.allowCSS()) {
- %><link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico">
+ %><link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico" />
<link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index 3adac32ea4..28439dc71d 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -57,7 +57,7 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (editBean.allowCSS()) {
- %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico">
+ %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 342bf3e805..cc8a26f14c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -748,12 +748,13 @@ public class SummaryHelper extends HelperBase {
public List<String> getSummaryBarSections(String page) {
String config = "";
- if ("home".equals(page))
+ if ("home".equals(page)) {
config = _context.getProperty(PROP_SUMMARYBAR + page, DEFAULT_MINIMAL);
- else
- config = _context.getProperty(PROP_SUMMARYBAR + page, null);
+ } else {
+ config = _context.getProperty(PROP_SUMMARYBAR + page);
if (config == null)
config = _context.getProperty(PROP_SUMMARYBAR + "default", DEFAULT_FULL);
+ }
return Arrays.asList(config.split("" + S));
}
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 9dc50b12b4..21bff1a8b1 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@@ -110,10 +110,10 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
private final Object _leaseSetWait = new Object();
/** whether the session connection has already been closed (or not yet opened) */
- protected boolean _closed;
+ protected volatile boolean _closed;
/** whether the session connection is in the process of being closed */
- protected boolean _closing;
+ protected volatile boolean _closing;
/** have we received the current date from the router yet? */
private boolean _dateReceived;
@@ -121,7 +121,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
private final Object _dateReceivedLock = new Object();
/** whether the session connection is in the process of being opened */
- protected boolean _opening;
+ protected volatile boolean _opening;
/** monitor for waiting until opened */
private final Object _openingWait = new Object();
diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css
index fe42d50649..cc464d64da 100644
--- a/installer/resources/themes/snark/light/snark.css
+++ b/installer/resources/themes/snark/light/snark.css
@@ -760,7 +760,7 @@ div.configsection a:hover {
text-decoration: none;
}
-code {;
+code {
font-size: 8pt;
color: #009;
padding: 0 2px;
diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css
index b3d599b6c8..3facca0f97 100644
--- a/installer/resources/themes/snark/ubergine/snark.css
+++ b/installer/resources/themes/snark/ubergine/snark.css
@@ -6,11 +6,11 @@ body {
color: #001;
font: 7.5pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
}
-
+
body.iframed {
- background: transparent url('../../console/dark/images/transparent.gif') !important;
+ background: transparent url('../../console/dark/images/transparent.gif') !important;
margin: 6px 0 !important;
-}
+}
.snarkTitle {
font-size: 12pt;
@@ -163,7 +163,7 @@ thead a, tfoot a {
text-shadow:1px 1px #550000;
}
-thead {;
+thead {
border-bottom: 1px solid #101;
}
@@ -260,7 +260,7 @@ td:first-child {
text-align: center !important;
}
-.snarkTorrentName {
+.snarkTorrentName {
line-height: 100%;
text-shadow:1px 1px #550000;
padding: 2px 0 0;
@@ -304,7 +304,7 @@ td:first-child {
}
.snarkTorrentStatus {
- padding: 2px 2px 2px 0;
+ padding: 2px 2px 2px 0;
line-height: 100%;
}
@@ -326,7 +326,7 @@ td:first-child {
.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
font-size: 7.5pt;
font-weight: bold;
- padding: 0 3px;
+ padding: 0 3px;
line-height: 100%;
}
@@ -382,41 +382,41 @@ td:first-child {
font-style: italic;
color: #dd7 !important;
}
-
-.snarkTorrentInfo img {
- max-height: 16px !important;
- margin: 1px 0 1px 2px !important;
-}
-
-.snarkTorrentInfo td {
- text-align: left !important;
- padding: 0 1px !important;
-}
-
-table.SnarkTorrentInfo {
- margin-bottom: 3 !important;
- background: #000;
-}
-
-table.SnarkDirInfo {
- margin-top: -2px !important;
-}
-
-.snarkDirInfo thead img {
- margin: 0 -1px 0 0 !important;
-}
-
-.SnarkDirInfo td, .SnarkDirInfo th {
- min-width: 0px !important;
-}
-
-.SnarkDirInfo td:nth-child(n+1) {
-}
-
-.SnarkDirInfo .headerpriority {
- text-align: center !important;
- vertical-align: middle;
-}
+
+.snarkTorrentInfo img {
+ max-height: 16px !important;
+ margin: 1px 0 1px 2px !important;
+}
+
+.snarkTorrentInfo td {
+ text-align: left !important;
+ padding: 0 1px !important;
+}
+
+table.SnarkTorrentInfo {
+ margin-bottom: 3 !important;
+ background: #000;
+}
+
+table.SnarkDirInfo {
+ margin-top: -2px !important;
+}
+
+.snarkDirInfo thead img {
+ margin: 0 -1px 0 0 !important;
+}
+
+.SnarkDirInfo td, .SnarkDirInfo th {
+ min-width: 0px !important;
+}
+
+.SnarkDirInfo td:nth-child(n+1) {
+}
+
+.SnarkDirInfo .headerpriority {
+ text-align: center !important;
+ vertical-align: middle;
+}
.choked {
color: #f00000 !important;
@@ -652,7 +652,7 @@ textarea {
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
- border: 1px inset #000;
+ border: 1px inset #000;
font-size: 8pt;
}
@@ -823,35 +823,35 @@ code {
padding: 1px 0 0px !important;
vertical-align: top;
}
-
-.routerdown {
- color: #ee9;
-}
-
-.trackerconfig {
- text-align: left !important;
-}
-
-.trackerconfig th:nth-child(n+4), .trackerconfig th:nth-child(n+5), .trackerconfig td:nth-child(n+4), .trackerconfig td:nth-child(n+5) {
- text-align: center !important;
-}
-
-.trackerconfig th, .trackerconfig td, .trackerconfig th:last-child, .trackerconfig td:last-child {
- text-align: left !important;
-}
-
-.trackerconfig td:first-child {
- text-align: right !important;
-}
-
-input.trackername {
- width: 100px;
-}
-
-input.trackerhome {
- width: 200px;
-}
-
-input.trackerannounce {
- width: 230px;
-}
\ No newline at end of file
+
+.routerdown {
+ color: #ee9;
+}
+
+.trackerconfig {
+ text-align: left !important;
+}
+
+.trackerconfig th:nth-child(n+4), .trackerconfig th:nth-child(n+5), .trackerconfig td:nth-child(n+4), .trackerconfig td:nth-child(n+5) {
+ text-align: center !important;
+}
+
+.trackerconfig th, .trackerconfig td, .trackerconfig th:last-child, .trackerconfig td:last-child {
+ text-align: left !important;
+}
+
+.trackerconfig td:first-child {
+ text-align: right !important;
+}
+
+input.trackername {
+ width: 100px;
+}
+
+input.trackerhome {
+ width: 200px;
+}
+
+input.trackerannounce {
+ width: 230px;
+}
--
GitLab