[freenet-cvs] r13973 - in trunk/freenet/src/freenet/node: . useralerts

[t...@freenetproject.org]

Author: toad
Date: 2007-07-06 23:09:22 +0000 (Fri, 06 Jul 2007)
New Revision: 13973

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
Log:
Use <p> instead of <div>.
Remove and close a FileOffer once finished.

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-07-06 21:20:37 UTC 
(rev 13972)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2007-07-06 23:09:22 UTC 
(rev 13973)
@@ -843,6 +843,8 @@
                                        } catch (Throwable t) {
                                                Logger.error(this, "Caught 
"+t+" receiving file", t);
                                                onReceiveFailure();
+                                       } finally {
+                                               remove();
                                        }
                                        if(logMINOR)
                                                Logger.minor(this, "Received 
file");
@@ -854,6 +856,15 @@
                        sendFileOfferAccepted(uid);
                }

+               protected void remove() {
+                       Long l = new Long(uid);
+                       synchronized(DarknetPeerNode.this) {
+                               myFileOffersByUID.remove(l);
+                               hisFileOffersByUID.remove(l);
+                       }
+                       data.close();
+               }
+
                public void send() throws DisconnectedException {
                        prb = new PartiallyReceivedBulk(node.usm, size, 
Node.PACKET_SIZE, data, true);
                        transmitter = new BulkTransmitter(prb, 
DarknetPeerNode.this, uid, node.outputThrottle);
@@ -871,6 +882,7 @@
                                                }
                                        } catch (Throwable t) {
                                                Logger.error(this, "Caught 
"+t+" sending file", t);
+                                               remove();
                                        }
                                        if(logMINOR)
                                                Logger.minor(this, "Sent file");
@@ -1199,7 +1211,7 @@
                protected void addComment(HTMLNode node) {
                        String[] lines = comment.split("\n");
                        for (int i = 0, c = lines.length; i < c; i++) {
-                               node.addChild("div", lines[i]);
+                               node.addChild("p", lines[i]);
                        }
                }


Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java       
2007-07-06 21:20:37 UTC (rev 13972)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java       
2007-07-06 23:09:22 UTC (rev 13973)
@@ -59,7 +59,7 @@
                                                
DateFormat.getInstance().format(new Date(sentTime)), 
DateFormat.getInstance().format(new Date(receivedTime)) }));
                String[] lines = messageText.split("\n");
                for (int i = 0, c = lines.length; i < c; i++) {
-                       alertNode.addChild("div", lines[i]);
+                       alertNode.addChild("p", lines[i]);
                }
                alertNode.addChild("p").addChild("a", "href", 
"/send_n2ntm/?peernode_hashcode=" + sourcePeerNode.hashCode(), l10n("reply"));
                return alertNode;