From 9d030327e6a28057a7c68bc89e8d111322a6421a Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Tue, 15 Nov 2005 12:46:54 +0000
Subject: [PATCH] put rome and jdom in the syndie.war, and fix some deprecation
warnings
---
.../java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java | 2 +-
apps/syndie/java/build.xml | 6 ++++++
apps/syndie/java/src/net/i2p/syndie/Sucker.java | 14 +++++++++++---
.../src/net/i2p/apps/systray/BrowserChooser.java | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
index 198efa84d6..7dd7308456 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelGUI.java
@@ -32,7 +32,7 @@ public class I2PTunnelGUI extends Frame implements ActionListener, Logging {
log.setEditable(false);
log("enter 'help' for help.");
pack();
- show();
+ setVisible(true);
}
public void log(String s) {
diff --git a/apps/syndie/java/build.xml b/apps/syndie/java/build.xml
index 89c8b688eb..3a0c16e87b 100644
--- a/apps/syndie/java/build.xml
+++ b/apps/syndie/java/build.xml
@@ -32,10 +32,16 @@
<ant target="war" />
</target>
<target name="war" depends="builddep, compile, precompilejsp">
+ <mkdir dir="./tmpwar" />
+ <copy file="../../jdom/jdom.jar" tofile="./tmpwar/jdom.jar" />
+ <copy file="../../rome/rome-0.7.jar" tofile="./tmpwar/rome-0.7.jar" />
+
<war destfile="../syndie.war" webxml="../jsp/web-out.xml">
<fileset dir="../jsp/" includes="**/*" excludes=".nbintdb, web.xml, web-out.xml, web-fragment.xml, **/*.java, **/*.jsp" />
<classes dir="./build/obj" />
+ <lib dir="./tmpwar" />
</war>
+ <delete dir="./tmpwar" />
</target>
<target name="precompilejsp">
<delete dir="../jsp/WEB-INF/" />
diff --git a/apps/syndie/java/src/net/i2p/syndie/Sucker.java b/apps/syndie/java/src/net/i2p/syndie/Sucker.java
index 6574132a82..33d4d8510c 100644
--- a/apps/syndie/java/src/net/i2p/syndie/Sucker.java
+++ b/apps/syndie/java/src/net/i2p/syndie/Sucker.java
@@ -6,6 +6,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -25,6 +26,7 @@ import com.sun.syndication.io.XmlReader;
import net.i2p.I2PAppContext;
import net.i2p.data.Base64;
import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
import net.i2p.syndie.data.BlogURI;
import net.i2p.util.EepGet;
@@ -294,11 +296,17 @@ public class Sucker {
// get its output (your input) stream
- DataInputStream ls_in = new DataInputStream(pushScript_proc.getInputStream());
+ InputStream ls_in = pushScript_proc.getInputStream();
try {
- while ((ls_str = ls_in.readLine()) != null) {
- infoLog(pushScript + ": " + ls_str);
+ StringBuffer buf = new StringBuffer();
+ while (true) {
+ boolean eof = DataHelper.readLine(ls_in, buf);
+ if (buf.length() > 0)
+ infoLog(pushScript + ": " + buf.toString());
+ buf.setLength(0);
+ if (eof)
+ break;
}
} catch (IOException e) {
return false;
diff --git a/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java b/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
index b274afa106..8e826ea92b 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/BrowserChooser.java
@@ -25,6 +25,6 @@ public class BrowserChooser extends FileDialog {
}
public void initialize(){
- this.show();
+ this.setVisible(true);
}
}
--
GitLab