diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-02-20 17:02:35 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-02-20 17:02:35 +0000 |
| commit | c6a62376874e0fab628a35d5916ba0f326cbd997 (patch) | |
| tree | cc15dc4af1005abeea5ccb384d3f5d7a40efa489 | |
| parent | b6c6a23a093249c8c6124536bc7bb712822a7e4e (diff) | |
| download | gcc-c6a62376874e0fab628a35d5916ba0f326cbd997.zip gcc-c6a62376874e0fab628a35d5916ba0f326cbd997.tar.gz gcc-c6a62376874e0fab628a35d5916ba0f326cbd997.tar.bz2 | |
2004-02-20 Michael Koch <konqueror@gmx.de>
* gnu/gcj/convert/Convert.java
(main): Use equals() to compare strings.
From-SVN: r78174
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/convert/Convert.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a4fc99..6de22ee 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-02-20 Michael Koch <konqueror@gmx.de> + * gnu/gcj/convert/Convert.java + (main): Use equals() to compare strings. + +2004-02-20 Michael Koch <konqueror@gmx.de> + * javax/swing/AbstractButton.java: Made several constants final. (getRolloverSelectedIcon): Made public. (getSelectedIcon): Made public. diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java index d16adc1..3b2add6 100644 --- a/libjava/gnu/gcj/convert/Convert.java +++ b/libjava/gnu/gcj/convert/Convert.java @@ -157,10 +157,10 @@ public class Convert UnicodeToBytes outEncoder = outEncodingName == null ? UnicodeToBytes.getDefaultEncoder() : UnicodeToBytes.getEncoder(outEncodingName); - InputStream inStream = inName == "-" ? System.in + InputStream inStream = inName.equals("-") ? System.in : new FileInputStream(inName); OutputStream outStream; - if (outName == "-") + if (outName.equals("-")) outStream = System.out; else outStream = new FileOutputStream(outName); |