diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-20 17:02:35 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-20 17:02:35 +0000 |
| commit | b7630a63a896b853ff94f87a5df6d28243f0caab (patch) | |
| tree | cc15dc4af1005abeea5ccb384d3f5d7a40efa489 /libjava | |
| parent | e5096e3735e7615de44e58043c251c5430e9e8c2 (diff) | |
| download | ppe42-gcc-b7630a63a896b853ff94f87a5df6d28243f0caab.tar.gz ppe42-gcc-b7630a63a896b853ff94f87a5df6d28243f0caab.zip | |
2004-02-20 Michael Koch <konqueror@gmx.de>
* gnu/gcj/convert/Convert.java
(main): Use equals() to compare strings.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 1a4fc99cb34..6de22ee5b44 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 d16adc13014..3b2add6ef42 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); |
