diff options
| author | Mario Torre <neugens@limasoftware.net> | 2006-12-19 01:14:22 +0000 |
|---|---|---|
| committer | Mario Torre <neugens@limasoftware.net> | 2006-12-19 01:14:22 +0000 |
| commit | 3d6a7e2db41965692e56ca44e3116c68973a1a98 (patch) | |
| tree | 9068d63fcac5050bf538c52e5b9c3ab790f7b0a3 | |
| parent | ec47f739052b575319d8f1d9f51941a0a7b694d4 (diff) | |
| download | classpath-3d6a7e2db41965692e56ca44e3116c68973a1a98.tar.gz | |
2006-12-19 Mario Torre <neugens@limasoftware.net>
* javax/imageio/spi/ServiceRegistry.java: fixed Empty control-flow
statement.
* tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java: likewise.
* gnu/java/io/Base64InputStream.java (read): likewise.
* gnu/javax/swing/text/html/CharacterAttributeTranslator.java: likewise.
* java/util/zip/DeflaterEngine.java (findLongestMatch): likewise.
* java/util/zip/ZipInputStream.java (closeEntry): likewise.
* java/util/zip/DeflaterHuffman.java (Tree.buildLength): likewise.
* org/omg/CORBA/ORB.java: likewise.
* javax/swing/plaf/metal/MetalFileChooserUI.java: likewise.
* gnu/javax/imageio/png/PNGICCProfile.java (PNGICCProfile): likewise.
* tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java: likewise.
* java/text/MessageFormat.java (MessageFormatElement.setLocale): likewise.
* java/text/BreakIterator.java (preceding): likewise.
* gnu/javax/net/ssl/provider/SSLEngineImpl.java: likewise.
* gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java (engineVerify):
likewise.
* java/beans/XMLEncoder.java (writeObject): likewise.
* gnu/java/beans/encoder/ScanEngine.java (ScanEngine): likewise.
* java/util/Collections.java (binarySearch): likewise.
* java/util/StringTokenizer.java (nextToken): likewise.
* java/util/PriorityQueue.java (.next): likewise.
* java/util/EnumMap.java (..next): likewise.
* java/util/BitSet.java (length): likewise.
* java/util/Date.java (parse): likewise.
* javax/swing/text/html/CSSParser.java (parse): likewise.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(TabbedPaneScrollLayout.calculateTabRects): likewise.
* java/lang/Character.java (UnicodeBlock): likewise.
* java/lang/String.java (trim): likewise.
* java/lang/StrictMath.java (remPiOver2): likewise.
* javax/swing/JFormattedTextField.java (commitEdit): likewise.
* javax/swing/JComponent.java (paintImmediately2): likewise.
(paintChildren): likewise.
* javax/swing/JToolTip.java (paramString): likewise.
* javax/swing/JEditorPane.java (JEditorPane): likewise.
* gnu/CORBA/Poa/gnuPOA.java: likewise.
* gnu/javax/security/auth/login/ConfigFileParser.java
(parseAppOrOtherEntry): likewise.
(parse): likewise.
* java/math/BigInteger.java (setBitOp): likewise.
(add): likewise.
(BigInteger): likewise.
* gnu/java/lang/management/BeanImpl.java (translate): likewise.
* javax/swing/text/DefaultStyledDocument.java (ElementBuffer.insertUpdate):
likewise.
* javax/swing/text/AbstractDocument.java (BranchElement): likewise.
* javax/swing/text/JTextComponent.java (getScrollableTracksViewportWidth):
likewise.
* javax/swing/text/FieldView.java (checkContainer): likewise.
* javax/swing/text/AsyncBoxView.java (ChildLocator.updateChildOffsets):
likewise.
* java/text/DecimalFormat.java (formatToCharacterIterator): likewise.
(parse): small refactoring.
68 files changed, 226 insertions, 167 deletions
@@ -1,3 +1,60 @@ +2006-12-19 Mario Torre <neugens@limasoftware.net> + + * javax/imageio/spi/ServiceRegistry.java: fixed Empty control-flow + statement. + * tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java: likewise. + * gnu/java/io/Base64InputStream.java (read): likewise. + * gnu/javax/swing/text/html/CharacterAttributeTranslator.java: likewise. + * java/util/zip/DeflaterEngine.java (findLongestMatch): likewise. + * java/util/zip/ZipInputStream.java (closeEntry): likewise. + * java/util/zip/DeflaterHuffman.java (Tree.buildLength): likewise. + * org/omg/CORBA/ORB.java: likewise. + * javax/swing/plaf/metal/MetalFileChooserUI.java: likewise. + * gnu/javax/imageio/png/PNGICCProfile.java (PNGICCProfile): likewise. + * tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java: likewise. + * java/text/MessageFormat.java (MessageFormatElement.setLocale): likewise. + * java/text/BreakIterator.java (preceding): likewise. + * gnu/javax/net/ssl/provider/SSLEngineImpl.java: likewise. + * gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java (engineVerify): + likewise. + * java/beans/XMLEncoder.java (writeObject): likewise. + * gnu/java/beans/encoder/ScanEngine.java (ScanEngine): likewise. + * java/util/Collections.java (binarySearch): likewise. + * java/util/StringTokenizer.java (nextToken): likewise. + * java/util/PriorityQueue.java (.next): likewise. + * java/util/EnumMap.java (..next): likewise. + * java/util/BitSet.java (length): likewise. + * java/util/Date.java (parse): likewise. + * javax/swing/text/html/CSSParser.java (parse): likewise. + * javax/swing/plaf/basic/BasicTabbedPaneUI.java + (TabbedPaneScrollLayout.calculateTabRects): likewise. + * java/lang/Character.java (UnicodeBlock): likewise. + * java/lang/String.java (trim): likewise. + * java/lang/StrictMath.java (remPiOver2): likewise. + * javax/swing/JFormattedTextField.java (commitEdit): likewise. + * javax/swing/JComponent.java (paintImmediately2): likewise. + (paintChildren): likewise. + * javax/swing/JToolTip.java (paramString): likewise. + * javax/swing/JEditorPane.java (JEditorPane): likewise. + * gnu/CORBA/Poa/gnuPOA.java: likewise. + * gnu/javax/security/auth/login/ConfigFileParser.java + (parseAppOrOtherEntry): likewise. + (parse): likewise. + * java/math/BigInteger.java (setBitOp): likewise. + (add): likewise. + (BigInteger): likewise. + * gnu/java/lang/management/BeanImpl.java (translate): likewise. + * javax/swing/text/DefaultStyledDocument.java (ElementBuffer.insertUpdate): + likewise. + * javax/swing/text/AbstractDocument.java (BranchElement): likewise. + * javax/swing/text/JTextComponent.java (getScrollableTracksViewportWidth): + likewise. + * javax/swing/text/FieldView.java (checkContainer): likewise. + * javax/swing/text/AsyncBoxView.java (ChildLocator.updateChildOffsets): + likewise. + * java/text/DecimalFormat.java (formatToCharacterIterator): likewise. + (parse): small refactoring. + 2006-12-19 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/lang/Enum.java: diff --git a/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java b/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java index 5184e5ba0..a7472dfb5 100644 --- a/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java +++ b/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java @@ -183,7 +183,7 @@ public class NavigationFilterDemo return pos; case SwingConstants.WEST: // Calculate the next word start. - newpos = Utilities.getWordStart(text, newpos);; + newpos = Utilities.getWordStart(text, newpos); // If that means that the caret will not move, return // the start of the previous word. diff --git a/external/jsr166/java/util/AbstractQueue.java b/external/jsr166/java/util/AbstractQueue.java index 644df6c49..9cc0a097b 100644 --- a/external/jsr166/java/util/AbstractQueue.java +++ b/external/jsr166/java/util/AbstractQueue.java @@ -117,7 +117,7 @@ public abstract class AbstractQueue<E> */ public void clear() { while (poll() != null) - ; + continue; } /** diff --git a/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java b/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java index 52cd17a52..bbb00a0f0 100644 --- a/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java +++ b/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java @@ -866,7 +866,7 @@ public class ConcurrentSkipListMap<K,V> extends AbstractMap<K,V> if (n != null) { Node<K,V> f = n.next; if (n != b.next) // inconsistent read - break;; + break; Object v = n.value; if (v == null) { // n is deleted n.helpDelete(b, f); diff --git a/gnu/CORBA/DynAn/gnuDynValue.java b/gnu/CORBA/DynAn/gnuDynValue.java index 0c31d4093..57150f746 100644 --- a/gnu/CORBA/DynAn/gnuDynValue.java +++ b/gnu/CORBA/DynAn/gnuDynValue.java @@ -172,7 +172,6 @@ public class gnuDynValue extends RecordAny implements DynValue, else return super.current_member_kind(); } - ; /** @inheritDoc */ public String current_member_name() throws TypeMismatch, InvalidValue @@ -182,7 +181,6 @@ public class gnuDynValue extends RecordAny implements DynValue, else return super.current_member_name(); } - ; /** @inheritDoc */ public NameDynAnyPair[] get_members_as_dyn_any() throws InvalidValue @@ -191,7 +189,6 @@ public class gnuDynValue extends RecordAny implements DynValue, throw new InvalidValue(ISNULL); return super.gnu_get_members_as_dyn_any(); } - ; /** @inheritDoc */ public NameValuePair[] get_members() throws InvalidValue @@ -201,7 +198,6 @@ public class gnuDynValue extends RecordAny implements DynValue, else return super.gnu_get_members(); } - ; /** @inheritDoc */ public void set_members_as_dyn_any(NameDynAnyPair[] value) @@ -210,7 +206,6 @@ public class gnuDynValue extends RecordAny implements DynValue, super.set_members_as_dyn_any(value); isNull = false; } - ; /** @inheritDoc */ public void set_members(NameValuePair[] value) @@ -219,7 +214,6 @@ public class gnuDynValue extends RecordAny implements DynValue, super.set_members(value); isNull = false; } - ; /** @inheritDoc */ public boolean is_null() diff --git a/gnu/CORBA/Poa/gnuPOA.java b/gnu/CORBA/Poa/gnuPOA.java index 8ceec23d7..0dbca7cfb 100644 --- a/gnu/CORBA/Poa/gnuPOA.java +++ b/gnu/CORBA/Poa/gnuPOA.java @@ -1348,7 +1348,6 @@ public class gnuPOA { return name; } - ; /** * Return the parent of this POA. diff --git a/gnu/java/awt/font/opentype/truetype/VirtualMachine.java b/gnu/java/awt/font/opentype/truetype/VirtualMachine.java index 7e50b6678..b0dbc308b 100644 --- a/gnu/java/awt/font/opentype/truetype/VirtualMachine.java +++ b/gnu/java/awt/font/opentype/truetype/VirtualMachine.java @@ -499,8 +499,7 @@ class VirtualMachine // FIXME: SECURITY: Possible denial-of-service attack // via instructions that have an endless loop. while (instructions.hasRemaining() - && executeInstruction(instructions)) - ; + && executeInstruction(instructions)) continue; } diff --git a/gnu/java/awt/peer/qt/QtToolkit.java b/gnu/java/awt/peer/qt/QtToolkit.java index 511676938..f66684a3d 100644 --- a/gnu/java/awt/peer/qt/QtToolkit.java +++ b/gnu/java/awt/peer/qt/QtToolkit.java @@ -163,7 +163,8 @@ public class QtToolkit extends ClasspathToolkit if( guiThread == null ) initToolkit(); - while (!guiThread.isRunning()); // make sure the GUI thread has started. + // make sure the GUI thread has started. + while (!guiThread.isRunning()) continue; if( graphicsEnv == null ) graphicsEnv = new QtGraphicsEnvironment( this ); diff --git a/gnu/java/awt/print/JavaPrinterGraphics.java b/gnu/java/awt/print/JavaPrinterGraphics.java index 9a3db0125..8e79ea6e0 100644 --- a/gnu/java/awt/print/JavaPrinterGraphics.java +++ b/gnu/java/awt/print/JavaPrinterGraphics.java @@ -135,7 +135,7 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics { int index = 0; while(spoolPage(out, printable, pageFormat, index++) == - Printable.PAGE_EXISTS); + Printable.PAGE_EXISTS) continue; } out.println("%%Trailer"); out.println("%%EOF"); diff --git a/gnu/java/awt/print/PostScriptGraphics2D.java b/gnu/java/awt/print/PostScriptGraphics2D.java index e4cc8199a..4b8f888c9 100644 --- a/gnu/java/awt/print/PostScriptGraphics2D.java +++ b/gnu/java/awt/print/PostScriptGraphics2D.java @@ -191,7 +191,7 @@ class PostScriptGraphics2D extends Graphics2D { int index = 0; while(spoolPage(out, printable, pageFormat, index++) == - Printable.PAGE_EXISTS); + Printable.PAGE_EXISTS) continue; } out.println("%%Trailer"); out.println("%%EOF"); diff --git a/gnu/java/beans/encoder/ScanEngine.java b/gnu/java/beans/encoder/ScanEngine.java index edf07d760..b78a81413 100644 --- a/gnu/java/beans/encoder/ScanEngine.java +++ b/gnu/java/beans/encoder/ScanEngine.java @@ -153,7 +153,7 @@ public class ScanEngine writer = new StAXWriter(os); root = new Root(); - final ScannerState start = current = new GenericScannerState(root);; + final ScannerState start = current = new GenericScannerState(root); ScannerState conf; // Use the ReportingScannerState to debug serialization issues. diff --git a/gnu/java/io/Base64InputStream.java b/gnu/java/io/Base64InputStream.java index b0824ab69..9f442e51f 100644 --- a/gnu/java/io/Base64InputStream.java +++ b/gnu/java/io/Base64InputStream.java @@ -139,7 +139,7 @@ public class Base64InputStream extends FilterInputStream while (count < len) { int i; - while (Character.isWhitespace((char) (i = in.read()))); + while (Character.isWhitespace((char) (i = in.read()))) continue; int pos = BASE_64.indexOf((char) i); if (pos >= 0) { @@ -173,11 +173,13 @@ public class Base64InputStream extends FilterInputStream case 1: throw new IOException("malformed Base-64 input"); case 2: - while (Character.isWhitespace((char) (i = in.read()))); + while (Character.isWhitespace((char) (i = in.read()))) + continue; if (i != BASE_64_PAD) throw new IOException("malformed Base-64 input"); case 3: - while (Character.isWhitespace((char) (i = in.read()))); + while (Character.isWhitespace((char) (i = in.read()))) + continue; } eof = true; break; diff --git a/gnu/java/lang/management/BeanImpl.java b/gnu/java/lang/management/BeanImpl.java index 2e6f449af..fb9409c33 100644 --- a/gnu/java/lang/management/BeanImpl.java +++ b/gnu/java/lang/management/BeanImpl.java @@ -510,7 +510,7 @@ public class BeanImpl if (c.isArray()) { int depth; - for (depth = 0; c.getName().charAt(depth) == '['; ++depth); + for (depth = 0; c.getName().charAt(depth) == '['; ++depth) continue; OpenType ot = getTypeFromClass(c.getComponentType()); return new OpenMBeanParameterInfoSupport("TransParam", "Translated parameter", diff --git a/gnu/java/nio/charset/ByteCharset.java b/gnu/java/nio/charset/ByteCharset.java index da0fdcbcd..5e8fb816c 100644 --- a/gnu/java/nio/charset/ByteCharset.java +++ b/gnu/java/nio/charset/ByteCharset.java @@ -115,8 +115,9 @@ abstract class ByteCharset extends Charset return CoderResult.OVERFLOW; } - if((c = lookup[(int) (b & 0xFF)]) == NONE); - // return CoderResult.unmappableForLength (1); + //if((c = lookup[(int) (b & 0xFF)]) == NONE); + // return CoderResult.unmappableForLength (1); + c = lookup[(int) (b & 0xFF)]; out.put (c); } diff --git a/gnu/javax/imageio/png/PNGICCProfile.java b/gnu/javax/imageio/png/PNGICCProfile.java index d2696e1c6..c4f390fd5 100644 --- a/gnu/javax/imageio/png/PNGICCProfile.java +++ b/gnu/javax/imageio/png/PNGICCProfile.java @@ -61,7 +61,7 @@ public class PNGICCProfile extends PNGChunk { super( type, data, crc ); int i = 0; - while( data[i++] != 0 ); + while( data[i++] != 0 ) continue; try { name = new String(data, 0, i, "8859_1"); diff --git a/gnu/javax/net/ssl/provider/SSLEngineImpl.java b/gnu/javax/net/ssl/provider/SSLEngineImpl.java index 22c488d68..4a7f924e8 100644 --- a/gnu/javax/net/ssl/provider/SSLEngineImpl.java +++ b/gnu/javax/net/ssl/provider/SSLEngineImpl.java @@ -99,7 +99,7 @@ public final class SSLEngineImpl extends SSLEngine private Mode mode; - private enum Mode { SERVER, CLIENT }; + private enum Mode { SERVER, CLIENT } SSLEngineImpl (SSLContextImpl contextImpl, String host, int port) { diff --git a/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java b/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java index 415efc6f5..acff4395e 100644 --- a/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java +++ b/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java @@ -188,7 +188,7 @@ public class SSLRSASignatureImpl extends SignatureSpi final byte[] eb = EB.toByteArray(); if (eb[0] == 0x00) { - for (i = 0; i < eb.length && eb[i] == 0x00; i++); + for (i = 0; i < eb.length && eb[i] == 0x00; i++) continue; } else if (eb[0] == 0x01) { diff --git a/gnu/javax/security/auth/login/ConfigFileParser.java b/gnu/javax/security/auth/login/ConfigFileParser.java index b5b506923..40adb783e 100644 --- a/gnu/javax/security/auth/login/ConfigFileParser.java +++ b/gnu/javax/security/auth/login/ConfigFileParser.java @@ -122,7 +122,9 @@ public final class ConfigFileParser initParser(r); while (parseAppOrOtherEntry()) - ; // do nothing + { + /* do nothing */ + } } private void initParser(Reader r) throws IOException @@ -157,7 +159,9 @@ public final class ConfigFileParser List lmis = new ArrayList(); while (parseACE(lmis)) - ; // do nothing + { + /* do nothing */ + } c = cft.nextToken(); if (c != '}') diff --git a/gnu/javax/swing/text/html/CharacterAttributeTranslator.java b/gnu/javax/swing/text/html/CharacterAttributeTranslator.java index 06732e401..77bac127d 100644 --- a/gnu/javax/swing/text/html/CharacterAttributeTranslator.java +++ b/gnu/javax/swing/text/html/CharacterAttributeTranslator.java @@ -74,7 +74,7 @@ public class CharacterAttributeTranslator colorMap.put("teal" , "#008080"); colorMap.put("white" , "#FFFFFF"); colorMap.put("yellow" , "#FFFF00"); - }; + } /** * Convert the color string represenation into java.awt.Color. The valid diff --git a/gnu/javax/swing/text/html/css/CSSParser.java b/gnu/javax/swing/text/html/css/CSSParser.java index 5647e2506..c50c39493 100644 --- a/gnu/javax/swing/text/html/css/CSSParser.java +++ b/gnu/javax/swing/text/html/css/CSSParser.java @@ -308,7 +308,7 @@ public class CSSParser { // FIXME: Handle block and ATKEYWORD. boolean success = parseAny(s); - while (parseAny(s)); + while (parseAny(s)) continue; return success; } @@ -329,7 +329,7 @@ public class CSSParser boolean ret = parseAny(sel); if (ret) { - while (parseAny(sel)); + while (parseAny(sel)) continue; } return ret; } diff --git a/gnu/javax/swing/text/html/parser/gnuDTD.java b/gnu/javax/swing/text/html/parser/gnuDTD.java index 1f4b3ec6a..5924e0fb9 100644 --- a/gnu/javax/swing/text/html/parser/gnuDTD.java +++ b/gnu/javax/swing/text/html/parser/gnuDTD.java @@ -390,7 +390,6 @@ public class gnuDTD allowed.add(allowed_values [ i ]); } } - ; AttributeList attr = new AttributeList(name, type, modifier, default_value, allowed, null); diff --git a/gnu/javax/swing/text/html/parser/support/Parser.java b/gnu/javax/swing/text/html/parser/support/Parser.java index 3a407310e..c0d1e636e 100644 --- a/gnu/javax/swing/text/html/parser/support/Parser.java +++ b/gnu/javax/swing/text/html/parser/support/Parser.java @@ -1382,7 +1382,7 @@ public class Parser if (c == '\r') buffer.append(' '); // CR replaced by space else if (c == '\n') - ; // LF ignored + { /* LF ignored */ } else if (c == '\t') buffer.append(' '); // Tab replaced by space else diff --git a/gnu/xml/pipeline/DomConsumer.java b/gnu/xml/pipeline/DomConsumer.java index bdbf92818..da527b965 100644 --- a/gnu/xml/pipeline/DomConsumer.java +++ b/gnu/xml/pipeline/DomConsumer.java @@ -365,7 +365,7 @@ public class DomConsumer implements EventConsumer throws SAXException { SAXParseException e; - ErrorHandler errHandler = consumer.getErrorHandler ();; + ErrorHandler errHandler = consumer.getErrorHandler (); if (locator == null) e = new SAXParseException (message, null, null, -1, -1, x); diff --git a/gnu/xml/util/XCat.java b/gnu/xml/util/XCat.java index 0f1633870..f3704cd25 100644 --- a/gnu/xml/util/XCat.java +++ b/gnu/xml/util/XCat.java @@ -274,7 +274,7 @@ public class XCat implements EntityResolver2 InputSource retval; retval = catalogs [i].resolve (usingPublic, publicId, systemId); if (retval != null) - return retval;; + return retval; } } catch (DoneDelegation x) { // done! diff --git a/java/beans/XMLEncoder.java b/java/beans/XMLEncoder.java index feff68bd3..7242d0c69 100644 --- a/java/beans/XMLEncoder.java +++ b/java/beans/XMLEncoder.java @@ -248,7 +248,7 @@ public class XMLEncoder extends Encoder scanEngine.writeObject(o); - if (get(o) == null); + if (get(o) == null) super.writeObject(o); accessCounter--; diff --git a/java/io/StreamTokenizer.java b/java/io/StreamTokenizer.java index b4695ab3d..711bc7581 100644 --- a/java/io/StreamTokenizer.java +++ b/java/io/StreamTokenizer.java @@ -329,7 +329,8 @@ public class StreamTokenizer if ((ch = in.read()) == '/' && slashSlash) { while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) - ; + continue; + if (ch != TT_EOF) in.unread(ch); return nextToken(); // Recursive, but not too deep in normal cases @@ -430,7 +431,8 @@ public class StreamTokenizer else if (isComment(ch)) { while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) - ; + continue; + if (ch != TT_EOF) in.unread(ch); return nextToken(); // Recursive, but not too deep in normal cases. diff --git a/java/lang/Character.java b/java/lang/Character.java index b9c6f24e7..506033f31 100644 --- a/java/lang/Character.java +++ b/java/lang/Character.java @@ -156,7 +156,7 @@ public final class Character implements Serializable, Comparable<Character> private final String canonicalName; /** Enumeration for the <code>forName()</code> method */ - private enum NameType { CANONICAL, NO_SPACES, CONSTANT; }; + private enum NameType { CANONICAL, NO_SPACES, CONSTANT; } /** * Constructor for strictly defined blocks. diff --git a/java/lang/StrictMath.java b/java/lang/StrictMath.java index ec74ca413..78c341f0f 100644 --- a/java/lang/StrictMath.java +++ b/java/lang/StrictMath.java @@ -2278,8 +2278,8 @@ public final strictfp class StrictMath j |= iq[i]; if (j == 0) // Need recomputation. { - int k; - for (k = 1; iq[jk - k] == 0; k++); // k = no. of terms needed. + int k; // k = no. of terms needed. + for (k = 1; iq[jk - k] == 0; k++) continue; for (i = jz + 1; i <= jz + k; i++) // Add q[jz+1] to q[jz+k]. { diff --git a/java/lang/String.java b/java/lang/String.java index 28b77c0aa..4bec7aa1e 100644 --- a/java/lang/String.java +++ b/java/lang/String.java @@ -1593,7 +1593,7 @@ public final class String return ""; while (value[begin++] <= '\u0020'); int end = limit; - while (value[--end] <= '\u0020'); + while (value[--end] <= '\u0020') continue; return substring(begin - offset - 1, end - offset + 1); } diff --git a/java/math/BigInteger.java b/java/math/BigInteger.java index c897d8bf4..379fe9d71 100644 --- a/java/math/BigInteger.java +++ b/java/math/BigInteger.java @@ -171,7 +171,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> { int i; for (i = magnitude.length - 1; i >= 0 && magnitude[i] == 0; --i) - ; + continue; if (i >= 0) throw new NumberFormatException(); return; @@ -573,7 +573,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> long y_ext = y.words[i - 1] < 0 ? 0xffffffffL : 0; for (; i < x.ival; i++) { - carry += ((long) x.words[i] & 0xffffffffL) + y_ext;; + carry += ((long) x.words[i] & 0xffffffffL) + y_ext; result.words[i] = (int) carry; carry >>>= 32; } @@ -1912,8 +1912,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> private static void setBitOp(BigInteger result, int op, BigInteger x, BigInteger y) { - if (y.words == null) ; - else if (x.words == null || x.ival < y.ival) + if ((y.words != null) && (x.words == null || x.ival < y.ival)) { BigInteger temp = x; x = y; y = temp; op = swappedOp(op); diff --git a/java/net/Proxy.java b/java/net/Proxy.java index 7b4ef2992..d58502293 100644 --- a/java/net/Proxy.java +++ b/java/net/Proxy.java @@ -57,7 +57,7 @@ public class Proxy * For compatability with Sun's JDK */ private static final long serialVersionUID = -2231209257930100533L; - }; + } public static final Proxy NO_PROXY = new Proxy(Type.DIRECT, null); diff --git a/java/rmi/activation/ActivationID.java b/java/rmi/activation/ActivationID.java index c4bbcd285..e1cc8a712 100644 --- a/java/rmi/activation/ActivationID.java +++ b/java/rmi/activation/ActivationID.java @@ -174,7 +174,7 @@ public class ActivationID { out.writeObject(uid); out.writeObject(activator); - }; + } /** * Compare by .equals if both a and b are not null, compare directly if at diff --git a/java/rmi/server/UnicastRemoteObject.java b/java/rmi/server/UnicastRemoteObject.java index 31bf88023..6ef3432b5 100644 --- a/java/rmi/server/UnicastRemoteObject.java +++ b/java/rmi/server/UnicastRemoteObject.java @@ -239,11 +239,12 @@ public class UnicastRemoteObject extends RemoteServer (UnicastServerRef) ((RemoteObject) obj).getRef(); return sref.unexportObject(obj, force); } - else + // FIXME + /* else { - // FIXME ; } + */ return true; } diff --git a/java/text/BreakIterator.java b/java/text/BreakIterator.java index 7ba116870..475352847 100644 --- a/java/text/BreakIterator.java +++ b/java/text/BreakIterator.java @@ -341,7 +341,7 @@ public abstract class BreakIterator implements Cloneable if (following (pos) == DONE) last (); while (previous () >= pos) - ; + continue; return current (); } diff --git a/java/text/DecimalFormat.java b/java/text/DecimalFormat.java index 529e57133..24c397ae8 100644 --- a/java/text/DecimalFormat.java +++ b/java/text/DecimalFormat.java @@ -439,8 +439,8 @@ public class DecimalFormat extends NumberFormat FieldPosition pos = (FieldPosition) attributes.get(i); Format.Field attribute = pos.getFieldAttribute(); - as.addAttribute(attribute, attribute, pos.getBeginIndex(), pos - .getEndIndex()); + as.addAttribute(attribute, attribute, pos.getBeginIndex(), + pos.getEndIndex()); } // return the CharacterIterator from AttributedString @@ -723,25 +723,25 @@ public class DecimalFormat extends NumberFormat // now we have to check the suffix, done here after number parsing // or the index will not be updated correctly... - boolean isNegativeSuffix = str.endsWith(this.negativeSuffix); - boolean isPositiveSuffix = str.endsWith(this.positiveSuffix); + boolean hasNegativeSuffix = str.endsWith(this.negativeSuffix); + boolean hasPositiveSuffix = str.endsWith(this.positiveSuffix); boolean positiveEqualsNegative = negativeSuffix.equals(positiveSuffix); positiveLen = positiveSuffix.length(); negativeLen = negativeSuffix.length(); - if (isNegative && !isNegativeSuffix) + if (isNegative && !hasNegativeSuffix) { pos.setErrorIndex(i); return null; } - else if (isNegativeSuffix && + else if (hasNegativeSuffix && !positiveEqualsNegative && (negativeLen > positiveLen)) { isNegative = true; } - else if (!isPositiveSuffix) + else if (!hasPositiveSuffix) { pos.setErrorIndex(i); return null; diff --git a/java/text/MessageFormat.java b/java/text/MessageFormat.java index 3d428ac7e..ab71cecea 100644 --- a/java/text/MessageFormat.java +++ b/java/text/MessageFormat.java @@ -82,70 +82,72 @@ public class MessageFormat extends Format // Recompute the locale-based formatter. void setLocale (Locale loc) { - if (type == null) - ; - else if (type.equals("number")) + if (type != null) { - formatClass = java.lang.Number.class; - - if (style == null) - format = NumberFormat.getInstance(loc); - else if (style.equals("currency")) - format = NumberFormat.getCurrencyInstance(loc); - else if (style.equals("percent")) - format = NumberFormat.getPercentInstance(loc); - else if (style.equals("integer")) - { - NumberFormat nf = NumberFormat.getNumberInstance(loc); - nf.setMaximumFractionDigits(0); - nf.setGroupingUsed(false); - format = nf; - } - else - { - format = NumberFormat.getNumberInstance(loc); - DecimalFormat df = (DecimalFormat) format; - df.applyPattern(style); - } - } - else if (type.equals("time") || type.equals("date")) - { - formatClass = java.util.Date.class; - - int val = DateFormat.DEFAULT; - boolean styleIsPattern = false; - if (style == null) - ; - else if (style.equals("short")) - val = DateFormat.SHORT; - else if (style.equals("medium")) - val = DateFormat.MEDIUM; - else if (style.equals("long")) - val = DateFormat.LONG; - else if (style.equals("full")) - val = DateFormat.FULL; - else - styleIsPattern = true; - - if (type.equals("time")) - format = DateFormat.getTimeInstance(val, loc); - else - format = DateFormat.getDateInstance(val, loc); - - if (styleIsPattern) - { - SimpleDateFormat sdf = (SimpleDateFormat) format; - sdf.applyPattern(style); - } - } - else if (type.equals("choice")) - { - formatClass = java.lang.Number.class; - - if (style == null) - throw new - IllegalArgumentException ("style required for choice format"); - format = new ChoiceFormat (style); + if (type.equals("number")) + { + formatClass = java.lang.Number.class; + + if (style == null) + format = NumberFormat.getInstance(loc); + else if (style.equals("currency")) + format = NumberFormat.getCurrencyInstance(loc); + else if (style.equals("percent")) + format = NumberFormat.getPercentInstance(loc); + else if (style.equals("integer")) + { + NumberFormat nf = NumberFormat.getNumberInstance(loc); + nf.setMaximumFractionDigits(0); + nf.setGroupingUsed(false); + format = nf; + } + else + { + format = NumberFormat.getNumberInstance(loc); + DecimalFormat df = (DecimalFormat) format; + df.applyPattern(style); + } + } + else if (type.equals("time") || type.equals("date")) + { + formatClass = java.util.Date.class; + + int val = DateFormat.DEFAULT; + boolean styleIsPattern = false; + if (style != null) + { + if (style.equals("short")) + val = DateFormat.SHORT; + else if (style.equals("medium")) + val = DateFormat.MEDIUM; + else if (style.equals("long")) + val = DateFormat.LONG; + else if (style.equals("full")) + val = DateFormat.FULL; + else + styleIsPattern = true; + } + + if (type.equals("time")) + format = DateFormat.getTimeInstance(val, loc); + else + format = DateFormat.getDateInstance(val, loc); + + if (styleIsPattern) + { + SimpleDateFormat sdf = (SimpleDateFormat) format; + sdf.applyPattern(style); + } + } + else if (type.equals("choice")) + { + formatClass = java.lang.Number.class; + + if (style == null) + throw new + IllegalArgumentException ("style required for choice format"); + format = new ChoiceFormat (style); + } } } } diff --git a/java/util/BitSet.java b/java/util/BitSet.java index e4f923b7f..e595a969b 100644 --- a/java/util/BitSet.java +++ b/java/util/BitSet.java @@ -477,7 +477,7 @@ public class BitSet implements Cloneable, Serializable // Set i to highest index that contains a non-zero value. int i; for (i = bits.length - 1; i >= 0 && bits[i] == 0; --i) - ; + continue; // if i < 0 all bits are cleared. if (i < 0) diff --git a/java/util/Collections.java b/java/util/Collections.java index 3b8c2fc29..8c22dff8f 100644 --- a/java/util/Collections.java +++ b/java/util/Collections.java @@ -706,14 +706,14 @@ public class Collections { if (!forward) itr.next(); // Changing direction first. - for ( ; i != pos; i++, o = itr.next()); + for ( ; i != pos; i++, o = itr.next()) continue; forward = true; } else { if (forward) itr.previous(); // Changing direction first. - for ( ; i != pos; i--, o = itr.previous()); + for ( ; i != pos; i--, o = itr.previous()) continue; forward = false; } final int d = compare(o, key, c); diff --git a/java/util/Date.java b/java/util/Date.java index 5c43bf3c1..8671e0b0f 100644 --- a/java/util/Date.java +++ b/java/util/Date.java @@ -847,7 +847,7 @@ public class Date hour += 12; } else if (parseDayOfWeek(tok)) - ; // Ignore it; throw the token away. + { /* Ignore it; throw the token away. */ } else if (tok.equals("UT") || tok.equals("UTC") || tok.equals("GMT")) localTimezone = false; else if (tok.startsWith("UT") || tok.startsWith("GMT")) diff --git a/java/util/EnumMap.java b/java/util/EnumMap.java index 477dff8e0..f9e711b16 100644 --- a/java/util/EnumMap.java +++ b/java/util/EnumMap.java @@ -220,7 +220,7 @@ public class EnumMap<K extends Enum<K>, V> { ++count; for (++index; store[index] == emptySlot; ++index) - ; + continue; return enumClass.getEnumConstants()[index]; } @@ -278,7 +278,7 @@ public class EnumMap<K extends Enum<K>, V> { ++count; for (++index; store[index] == emptySlot; ++index) - ; + continue; return store[index]; } @@ -326,7 +326,7 @@ public class EnumMap<K extends Enum<K>, V> { ++count; for (++index; store[index] == emptySlot; ++index) - ; + continue; // FIXME: we could just return something that // only knows the index. That would be cleaner. return new AbstractMap.SimpleEntry<K, V>(enumClass.getEnumConstants()[index], diff --git a/java/util/PriorityQueue.java b/java/util/PriorityQueue.java index 703d7471d..199c074b0 100644 --- a/java/util/PriorityQueue.java +++ b/java/util/PriorityQueue.java @@ -161,7 +161,8 @@ public class PriorityQueue<E> extends AbstractQueue<E> implements Serializable public E next() { while (storage[++index] == null) - ; + continue; + ++count; return storage[index]; } diff --git a/java/util/StringTokenizer.java b/java/util/StringTokenizer.java index 0b59abe2f..aa27168da 100644 --- a/java/util/StringTokenizer.java +++ b/java/util/StringTokenizer.java @@ -181,13 +181,15 @@ public class StringTokenizer implements Enumeration<Object> { if (retDelims) return str.substring(pos, ++pos); - while (++pos < len && delim.indexOf(str.charAt(pos)) >= 0); + while (++pos < len && delim.indexOf(str.charAt(pos)) >= 0) + continue; } if (pos < len) { int start = pos; - while (++pos < len && delim.indexOf(str.charAt(pos)) < 0); - + while (++pos < len && delim.indexOf(str.charAt(pos)) < 0) + continue; + return str.substring(start, pos); } throw new NoSuchElementException(); diff --git a/java/util/regex/Pattern.java b/java/util/regex/Pattern.java index d716fa4e6..25120a8c7 100644 --- a/java/util/regex/Pattern.java +++ b/java/util/regex/Pattern.java @@ -246,7 +246,7 @@ public final class Pattern implements Serializable { String t = input.subSequence(start, input.length()).toString(); if ("".equals(t) && limit == 0) - ; // Don't add. + { /* Don't add. */ } else list.add(t); } diff --git a/java/util/zip/DeflaterEngine.java b/java/util/zip/DeflaterEngine.java index 51587165e..5afdb5836 100644 --- a/java/util/zip/DeflaterEngine.java +++ b/java/util/zip/DeflaterEngine.java @@ -377,7 +377,7 @@ class DeflaterEngine implements DeflaterConstants && window[++scan] == window[++match] && window[++scan] == window[++match] && window[++scan] == window[++match] - && scan < strend); + && scan < strend) continue; if (scan > best_end) { // if (DeflaterConstants.DEBUGGING && ins_h == 0) diff --git a/java/util/zip/DeflaterHuffman.java b/java/util/zip/DeflaterHuffman.java index 32c10b6de..46384973f 100644 --- a/java/util/zip/DeflaterHuffman.java +++ b/java/util/zip/DeflaterHuffman.java @@ -197,7 +197,7 @@ class DeflaterHuffman { /* Find the first bit length which could increase: */ while (bl_counts[--incrBitLen] == 0) - ; + continue; /* Move this node one down and remove a corresponding * amount of overflow nodes. diff --git a/java/util/zip/ZipInputStream.java b/java/util/zip/ZipInputStream.java index 4539828c2..e9eea42df 100644 --- a/java/util/zip/ZipInputStream.java +++ b/java/util/zip/ZipInputStream.java @@ -237,7 +237,8 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants /* We don't know how much we must skip, read until end. */ byte[] tmp = new byte[2048]; while (read(tmp) > 0) - ; + continue; + /* read will close this entry */ return; } diff --git a/javax/imageio/ImageWriteParam.java b/javax/imageio/ImageWriteParam.java index 4d8efc37a..f4794a375 100644 --- a/javax/imageio/ImageWriteParam.java +++ b/javax/imageio/ImageWriteParam.java @@ -278,7 +278,7 @@ public class ImageWriteParam extends IIOParam public String[] getCompressionQualityDescriptions() { checkNotExplicitCompression(); - checkCompressionTypesSet();; + checkCompressionTypesSet(); return null; } @@ -286,7 +286,7 @@ public class ImageWriteParam extends IIOParam public float[] getCompressionQualityValues() { checkNotExplicitCompression(); - checkCompressionTypesSet();; + checkCompressionTypesSet(); return null; } diff --git a/javax/imageio/spi/ServiceRegistry.java b/javax/imageio/spi/ServiceRegistry.java index 4848bc6db..3051a813b 100644 --- a/javax/imageio/spi/ServiceRegistry.java +++ b/javax/imageio/spi/ServiceRegistry.java @@ -957,6 +957,6 @@ public class ServiceRegistry * criteria; <code>false</code> if it does not match. */ boolean filter(Object provider); - }; + } } diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java index 0b01578e9..a5fe5f0cf 100644 --- a/javax/naming/InitialContext.java +++ b/javax/naming/InitialContext.java @@ -87,7 +87,7 @@ public class InitialContext implements Context colon_list.add(Context.OBJECT_FACTORIES); colon_list.add(Context.URL_PKG_PREFIXES); colon_list.add(Context.STATE_FACTORIES); - }; + } /** * The properties that are searched in the agreed places in the diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java index 3120c1bac..6c0669f5b 100644 --- a/javax/swing/JComponent.java +++ b/javax/swing/JComponent.java @@ -1927,7 +1927,8 @@ public abstract class JComponent extends Container implements Serializable int i = getComponentCount() - 1; if (paintChild != null && paintChild.isOpaque()) { - for (; i >= 0 && getComponent(i) != paintChild; i--); + for (; i >= 0 && getComponent(i) != paintChild; i--) + continue; } for (; i >= 0; i--) { @@ -2188,7 +2189,8 @@ public abstract class JComponent extends Container implements Serializable { int count = c.getComponentCount(); int i = 0; - for (; i < count && c.getComponent(i) != child; i++); + for (; i < count && c.getComponent(i) != child; i++) + continue; if (jc.isCompletelyObscured(i, paintX, paintY, paintW, paintH)) diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java index 38b0761f0..d6b87764f 100644 --- a/javax/swing/JEditorPane.java +++ b/javax/swing/JEditorPane.java @@ -712,7 +712,7 @@ public class JEditorPane extends JTextComponent public JEditorPane(URL url) throws IOException { init(); - setEditorKit(createEditorKitForContentType("text/html"));; + setEditorKit(createEditorKitForContentType("text/html")); setPage(url); } diff --git a/javax/swing/JFormattedTextField.java b/javax/swing/JFormattedTextField.java index 054752550..36554857e 100644 --- a/javax/swing/JFormattedTextField.java +++ b/javax/swing/JFormattedTextField.java @@ -415,7 +415,7 @@ public class JFormattedTextField extends JTextField // to create a new formatter. Object oldValue = this.value; - this.value = formatter.stringToValue(getText());; + this.value = formatter.stringToValue(getText()); editValid = true; firePropertyChange("value", oldValue, this.value); diff --git a/javax/swing/JToolTip.java b/javax/swing/JToolTip.java index 3153894da..16bdd2d7e 100644 --- a/javax/swing/JToolTip.java +++ b/javax/swing/JToolTip.java @@ -181,7 +181,7 @@ public class JToolTip extends JComponent implements Accessible { StringBuffer sb = new StringBuffer(super.paramString()); sb.append(",tiptext="); - if (text != null); + if (text != null) sb.append(text); return sb.toString(); } diff --git a/javax/swing/colorchooser/DefaultHSBChooserPanel.java b/javax/swing/colorchooser/DefaultHSBChooserPanel.java index 71d6c75b5..112d02166 100644 --- a/javax/swing/colorchooser/DefaultHSBChooserPanel.java +++ b/javax/swing/colorchooser/DefaultHSBChooserPanel.java @@ -778,7 +778,6 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel if (locked == HLOCKED) { slider.setMaximum(359); - ; slider.setValue(((Number) hSpinner.getValue()).intValue()); slider.setInverted(true); } diff --git a/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/javax/swing/plaf/basic/BasicTabbedPaneUI.java index 0d1fa1eed..fe360214c 100644 --- a/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -1364,7 +1364,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants calcRect.height -= tabAreaInsets.top + tabAreaInsets.bottom; int height = 0; - int runHeight = tabAreaInsets.top + insets.top;; + int runHeight = tabAreaInsets.top + insets.top; int fontHeight = fm.getHeight(); int left = insets.left + tabAreaInsets.left; for (int i = 0; i < tabCount; i++) diff --git a/javax/swing/plaf/metal/MetalFileChooserUI.java b/javax/swing/plaf/metal/MetalFileChooserUI.java index 824f1d802..2121cc696 100644 --- a/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -441,7 +441,7 @@ public class MetalFileChooserUI filechooser.revalidate(); filechooser.repaint(); } - }; + } /** * A combo box model containing the selected directory and all its parent diff --git a/javax/swing/table/JTableHeader.java b/javax/swing/table/JTableHeader.java index 482317ff0..4661748d0 100644 --- a/javax/swing/table/JTableHeader.java +++ b/javax/swing/table/JTableHeader.java @@ -570,7 +570,7 @@ public class JTableHeader extends JComponent if (comp != null) comp.setVisible(b); } - }; + } public AccessibleRole getAccessibleRole() { diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java index 966316995..72178f840 100644 --- a/javax/swing/text/AbstractDocument.java +++ b/javax/swing/text/AbstractDocument.java @@ -2093,7 +2093,7 @@ public abstract class AbstractDocument implements Document, Serializable /** * The child elements of this BranchElement. */ - private Element[] children;; + private Element[] children; /** * The number of children in the branch element. diff --git a/javax/swing/text/AsyncBoxView.java b/javax/swing/text/AsyncBoxView.java index 90447f86e..327c2b895 100644 --- a/javax/swing/text/AsyncBoxView.java +++ b/javax/swing/text/AsyncBoxView.java @@ -307,7 +307,7 @@ public class AsyncBoxView private int updateChildOffsets(float targetOffset) { int n = getViewCount(); - int targetIndex = n - 1;; + int targetIndex = n - 1; int pos = lastValidOffset.getChildView().getStartOffset(); int startIndex = getViewIndexAtPosition(pos, Position.Bias.Forward); float start = lastValidOffset.getMajorOffset(); diff --git a/javax/swing/text/DefaultStyledDocument.java b/javax/swing/text/DefaultStyledDocument.java index 3156ca67f..d877034cf 100644 --- a/javax/swing/text/DefaultStyledDocument.java +++ b/javax/swing/text/DefaultStyledDocument.java @@ -1126,7 +1126,8 @@ public class DefaultStyledDocument extends AbstractDocument implements int p; for (p = 0; p < data.length && data[p].getType() == ElementSpec.EndTagType; - p++); + p++) continue; + Edit edit = insertPath[insertPath.length - p - 1]; edit.index--; edit.removed.add(0, edit.e.getElement(edit.index)); diff --git a/javax/swing/text/FieldView.java b/javax/swing/text/FieldView.java index 0a078e53d..e357a1e05 100644 --- a/javax/swing/text/FieldView.java +++ b/javax/swing/text/FieldView.java @@ -91,7 +91,7 @@ public class FieldView extends PlainView horizontalVisibility.addChangeListener(new ChangeListener(){ public void stateChanged(ChangeEvent event) { getContainer().repaint(); - }; + } }); // It turned out that the span calculated at this point is wrong diff --git a/javax/swing/text/JTextComponent.java b/javax/swing/text/JTextComponent.java index 68ba1f428..8e70fe2bb 100644 --- a/javax/swing/text/JTextComponent.java +++ b/javax/swing/text/JTextComponent.java @@ -1821,7 +1821,7 @@ public abstract class JTextComponent extends JComponent public boolean getScrollableTracksViewportWidth() { - boolean res = false;; + boolean res = false; Container c = getParent(); if (c instanceof JViewport) res = ((JViewport) c).getExtentSize().width > getPreferredSize().width; diff --git a/javax/swing/text/html/CSSParser.java b/javax/swing/text/html/CSSParser.java index 0bf76eb80..f6e0573d8 100644 --- a/javax/swing/text/html/CSSParser.java +++ b/javax/swing/text/html/CSSParser.java @@ -315,7 +315,7 @@ class CSSParser try { if (!parsingDeclaration) - while(getNextStatement()); + while(getNextStatement()) continue; else parseDeclarationBlock(); } diff --git a/org/omg/CORBA/ORB.java b/org/omg/CORBA/ORB.java index 89bc53764..506859174 100644 --- a/org/omg/CORBA/ORB.java +++ b/org/omg/CORBA/ORB.java @@ -280,8 +280,7 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; - + /** * The support for {@link DynAny} and derived interfaces * has never been implemented in Sun's java releases, @@ -296,7 +295,6 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; /** * The support for {@link DynArray} @@ -313,7 +311,6 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; /** * The support for {@link DynEnum} @@ -330,7 +327,6 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; /** * The support for {@link DynSequence} @@ -347,7 +343,6 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; /** * The support for {@link DynStruct} and derived interfaces @@ -364,8 +359,7 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; - + /** * The support for {@link DynUnion} and derived interfaces * has never been implemented in Sun's java releases, @@ -381,7 +375,6 @@ public abstract class ORB { throw new NO_IMPLEMENT(); } - ; /** * Create a typecode, defining the given enumeration. diff --git a/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java b/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java index 1f6fee0ff..466b93cff 100644 --- a/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java +++ b/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java @@ -134,7 +134,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes { new AnnotationValueAnnotationRule()); RULES.add("*/annotationValueEnum", new AnnotationValueEnumRule()); RULES.add("*/annotationValueArray", new AnnotationValueArrayRule()); - }; + } private static interface OpcodeGroup { public static final int INSN = 0; diff --git a/tools/gnu/classpath/tools/appletviewer/TagParser.java b/tools/gnu/classpath/tools/appletviewer/TagParser.java index b5bdca70f..56bb1bb87 100644 --- a/tools/gnu/classpath/tools/appletviewer/TagParser.java +++ b/tools/gnu/classpath/tools/appletviewer/TagParser.java @@ -130,7 +130,7 @@ public class TagParser { ArrayList allTags = new ArrayList(); if (document == null) - return null;; + return null; recurseDocument(document.getChildNodes()); diff --git a/tools/gnu/classpath/tools/jarsigner/Main.java b/tools/gnu/classpath/tools/jarsigner/Main.java index 0cff2fd85..d62e46814 100644 --- a/tools/gnu/classpath/tools/jarsigner/Main.java +++ b/tools/gnu/classpath/tools/jarsigner/Main.java @@ -123,7 +123,7 @@ public class Main private CallbackHandler handler; /** The command line parser. */ private ToolParser cmdLineParser; - protected ArrayList fileAndAlias = new ArrayList();; + protected ArrayList fileAndAlias = new ArrayList(); private Main() { diff --git a/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java b/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java index 390117a05..402727ff3 100644 --- a/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java +++ b/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java @@ -238,6 +238,6 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements ClassNotFoundException { // Write no fields. - }; + } } |