Il giorno mer, 20/12/2006 alle 12.50 +0100, Mario Torre ha scritto:
> I agree. Infact I was a bit afraid of such change, the continue indeed
> looks weird.
This patch fixes that. I'm still investigating how to make eclipse
happy.
Please note this line:
- if((c = lookup[(int) (b & 0xFF)]) == NONE);
- return CoderResult.unmappableForLength (1);
+ if((c = lookup[(int) (b & 0xFF)]) == NONE)
+ return CoderResult.unmappableForLength (1);
out.put (c);
I guess this was an error. I've just removed the ; here.
Ok to commit?
Mario
--------
2006-12-21 Mario Torre <[EMAIL PROTECTED]>
* gnu/javax/swing/text/html/css/CSSParser.java (parseSelector):
(parseValue): Reverted last change.
* java/text/BreakIterator.java (preceding): likewise.
* external/jsr166/java/util/AbstractQueue.java (clear): likewise.
* gnu/java/io/Base64InputStream.java (read): likewise.
* javax/swing/text/DefaultStyledDocument.java
(ElementBuffer.insertUpdate):
likewise.
* java/util/zip/DeflaterEngine.java (findLongestMatch): likewise.
* java/util/zip/ZipInputStream.java (closeEntry): likewise.
* java/util/zip/DeflaterHuffman.java (Tree.buildLength): likewise.
* java/io/StreamTokenizer.java (nextToken): likewise.
* gnu/javax/imageio/png/PNGICCProfile.java (PNGICCProfile): likewise.
* gnu/java/awt/font/opentype/truetype/VirtualMachine.java (execute):
likewise.
* gnu/java/nio/charset/ByteCharset.java (Decoder.decodeLoop): likewise.
Also fixed typo.
* gnu/java/awt/print/PostScriptGraphics2D.java (spoolPostScript):
likewise.
* gnu/java/awt/print/JavaPrinterGraphics.java (spoolPostScript):
likewise.
* gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java (engineVerify):
likewise.
* javax/swing/text/html/CSSParser.java:
(parse): likewise.
* java/lang/String.java (trim): likewise.
* java/lang/StrictMath.java (remPiOver2): likewise.
* gnu/java/awt/peer/qt/QtToolkit.java (QtToolkit): likewise.
* javax/swing/JComponent.java (paintImmediately2): likewise.
(paintChildren): likewise.
* java/util/EnumMap.java (..next): likewise.
* java/util/BitSet.java (length): likewise.
* java/util/Collections.java (binarySearch): likewise.
* java/util/StringTokenizer.java (nextToken): likewise.
* java/util/PriorityQueue.java (.next): likewise.
* java/math/BigInteger.java (BigInteger): likewise.
* gnu/java/lang/management/BeanImpl.java (translate): likewise.
--
Lima Software, SO.PR.IND. s.r.l.
http://www.limasoftware.net/
pgp key: http://subkeys.pgp.net/
Please, support open standards:
http://opendocumentfellowship.org/petition/
http://www.nosoftwarepatents.com/
### Eclipse Workspace Patch 1.0
#P classpath
Index: gnu/java/lang/management/BeanImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/lang/management/BeanImpl.java,v
retrieving revision 1.10
diff -u -r1.10 BeanImpl.java
--- gnu/java/lang/management/BeanImpl.java 19 Dec 2006 01:14:24 -0000 1.10
+++ gnu/java/lang/management/BeanImpl.java 20 Dec 2006 23:25:59 -0000
@@ -510,7 +510,8 @@
if (c.isArray())
{
int depth;
- for (depth = 0; c.getName().charAt(depth) == '['; ++depth) continue;
+ for (depth = 0; c.getName().charAt(depth) == '['; ++depth)
+ ;
OpenType ot = getTypeFromClass(c.getComponentType());
return new OpenMBeanParameterInfoSupport("TransParam",
"Translated parameter",
Index: java/math/BigInteger.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/math/BigInteger.java,v
retrieving revision 1.31
diff -u -r1.31 BigInteger.java
--- java/math/BigInteger.java 19 Dec 2006 01:14:29 -0000 1.31
+++ java/math/BigInteger.java 20 Dec 2006 23:26:07 -0000
@@ -171,7 +171,7 @@
{
int i;
for (i = magnitude.length - 1; i >= 0 && magnitude[i] == 0; --i)
- continue;
+ ;
if (i >= 0)
throw new NumberFormatException();
return;
Index: java/util/PriorityQueue.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/PriorityQueue.java,v
retrieving revision 1.3
diff -u -r1.3 PriorityQueue.java
--- java/util/PriorityQueue.java 19 Dec 2006 01:14:23 -0000 1.3
+++ java/util/PriorityQueue.java 20 Dec 2006 23:26:16 -0000
@@ -161,7 +161,7 @@
public E next()
{
while (storage[++index] == null)
- continue;
+ ;
++count;
return storage[index];
Index: java/util/StringTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/StringTokenizer.java,v
retrieving revision 1.17
diff -u -r1.17 StringTokenizer.java
--- java/util/StringTokenizer.java 19 Dec 2006 01:14:23 -0000 1.17
+++ java/util/StringTokenizer.java 20 Dec 2006 23:26:16 -0000
@@ -182,13 +182,13 @@
if (retDelims)
return str.substring(pos, ++pos);
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)
- continue;
+ ;
return str.substring(start, pos);
}
Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.47
diff -u -r1.47 Collections.java
--- java/util/Collections.java 19 Dec 2006 01:14:23 -0000 1.47
+++ java/util/Collections.java 20 Dec 2006 23:26:15 -0000
@@ -706,14 +706,16 @@
{
if (!forward)
itr.next(); // Changing direction first.
- for ( ; i != pos; i++, o = itr.next()) continue;
+ for ( ; i != pos; i++, o = itr.next())
+ ;
forward = true;
}
else
{
if (forward)
itr.previous(); // Changing direction first.
- for ( ; i != pos; i--, o = itr.previous()) continue;
+ for ( ; i != pos; i--, o = itr.previous())
+ ;
forward = false;
}
final int d = compare(o, key, c);
Index: java/util/BitSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/BitSet.java,v
retrieving revision 1.22
diff -u -r1.22 BitSet.java
--- java/util/BitSet.java 19 Dec 2006 01:14:23 -0000 1.22
+++ java/util/BitSet.java 20 Dec 2006 23:26:08 -0000
@@ -477,7 +477,7 @@
// 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)
Index: java/util/EnumMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/EnumMap.java,v
retrieving revision 1.3
diff -u -r1.3 EnumMap.java
--- java/util/EnumMap.java 19 Dec 2006 01:14:23 -0000 1.3
+++ java/util/EnumMap.java 20 Dec 2006 23:26:16 -0000
@@ -220,7 +220,7 @@
{
++count;
for (++index; store[index] == emptySlot; ++index)
- continue;
+ ;
return enumClass.getEnumConstants()[index];
}
@@ -278,7 +278,7 @@
{
++count;
for (++index; store[index] == emptySlot; ++index)
- continue;
+ ;
return store[index];
}
@@ -326,7 +326,7 @@
{
++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],
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.151
diff -u -r1.151 JComponent.java
--- javax/swing/JComponent.java 19 Dec 2006 01:14:22 -0000 1.151
+++ javax/swing/JComponent.java 20 Dec 2006 23:26:21 -0000
@@ -1928,7 +1928,7 @@
if (paintChild != null && paintChild.isOpaque())
{
for (; i >= 0 && getComponent(i) != paintChild; i--)
- continue;
+ ;
}
for (; i >= 0; i--)
{
@@ -2190,7 +2190,7 @@
int count = c.getComponentCount();
int i = 0;
for (; i < count && c.getComponent(i) != child; i++)
- continue;
+ ;
if (jc.isCompletelyObscured(i, paintX, paintY, paintW,
paintH))
Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.10
diff -u -r1.10 QtToolkit.java
--- gnu/java/awt/peer/qt/QtToolkit.java 19 Dec 2006 01:14:24 -0000 1.10
+++ gnu/java/awt/peer/qt/QtToolkit.java 20 Dec 2006 23:25:57 -0000
@@ -164,7 +164,8 @@
initToolkit();
// make sure the GUI thread has started.
- while (!guiThread.isRunning()) continue;
+ while (!guiThread.isRunning())
+ ;
if( graphicsEnv == null )
graphicsEnv = new QtGraphicsEnvironment( this );
Index: java/lang/StrictMath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/StrictMath.java,v
retrieving revision 1.16
diff -u -r1.16 StrictMath.java
--- java/lang/StrictMath.java 19 Dec 2006 01:14:23 -0000 1.16
+++ java/lang/StrictMath.java 20 Dec 2006 23:26:03 -0000
@@ -2279,7 +2279,8 @@
if (j == 0) // Need recomputation.
{
int k; // k = no. of terms needed.
- for (k = 1; iq[jk - k] == 0; k++) continue;
+ for (k = 1; iq[jk - k] == 0; k++)
+ ;
for (i = jz + 1; i <= jz + k; i++) // Add q[jz+1] to q[jz+k].
{
Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.84
diff -u -r1.84 String.java
--- java/lang/String.java 19 Dec 2006 01:14:23 -0000 1.84
+++ java/lang/String.java 20 Dec 2006 23:26:05 -0000
@@ -1592,8 +1592,10 @@
if (begin == limit)
return "";
while (value[begin++] <= '\u0020');
+
int end = limit;
- while (value[--end] <= '\u0020') continue;
+ while (value[--end] <= '\u0020')
+ ;
return substring(begin - offset - 1, end - offset + 1);
}
Index: javax/swing/text/html/CSSParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/CSSParser.java,v
retrieving revision 1.5
diff -u -r1.5 CSSParser.java
--- javax/swing/text/html/CSSParser.java 19 Dec 2006 01:14:23 -0000 1.5
+++ javax/swing/text/html/CSSParser.java 20 Dec 2006 23:26:24 -0000
@@ -315,7 +315,8 @@
try
{
if (!parsingDeclaration)
- while(getNextStatement()) continue;
+ while(getNextStatement())
+ ;
else
parseDeclarationBlock();
}
@@ -565,4 +566,4 @@
}
}
-
\ No newline at end of file
+
Index: gnu/java/awt/print/JavaPrinterGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/print/JavaPrinterGraphics.java,v
retrieving revision 1.7
diff -u -r1.7 JavaPrinterGraphics.java
--- gnu/java/awt/print/JavaPrinterGraphics.java 19 Dec 2006 01:14:23 -0000 1.7
+++ gnu/java/awt/print/JavaPrinterGraphics.java 20 Dec 2006 23:25:58 -0000
@@ -135,7 +135,8 @@
{
int index = 0;
while(spoolPage(out, printable, pageFormat, index++) ==
- Printable.PAGE_EXISTS) continue;
+ Printable.PAGE_EXISTS)
+ ;
}
out.println("%%Trailer");
out.println("%%EOF");
Index: gnu/java/awt/print/PostScriptGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/print/PostScriptGraphics2D.java,v
retrieving revision 1.3
diff -u -r1.3 PostScriptGraphics2D.java
--- gnu/java/awt/print/PostScriptGraphics2D.java 19 Dec 2006 01:14:23 -0000 1.3
+++ gnu/java/awt/print/PostScriptGraphics2D.java 20 Dec 2006 23:25:58 -0000
@@ -191,7 +191,8 @@
{
int index = 0;
while(spoolPage(out, printable, pageFormat, index++) ==
- Printable.PAGE_EXISTS) continue;
+ Printable.PAGE_EXISTS)
+ ;
}
out.println("%%Trailer");
out.println("%%EOF");
Index: gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java,v
retrieving revision 1.3
diff -u -r1.3 SSLRSASignatureImpl.java
--- gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java 19 Dec 2006 01:14:23 -0000 1.3
+++ gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java 20 Dec 2006 23:26:00 -0000
@@ -188,7 +188,8 @@
final byte[] eb = EB.toByteArray();
if (eb[0] == 0x00)
{
- for (i = 0; i < eb.length && eb[i] == 0x00; i++) continue;
+ for (i = 0; i < eb.length && eb[i] == 0x00; i++)
+ ;
}
else if (eb[0] == 0x01)
{
Index: gnu/java/nio/charset/ByteCharset.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/ByteCharset.java,v
retrieving revision 1.4
diff -u -r1.4 ByteCharset.java
--- gnu/java/nio/charset/ByteCharset.java 19 Dec 2006 01:14:25 -0000 1.4
+++ gnu/java/nio/charset/ByteCharset.java 20 Dec 2006 23:25:59 -0000
@@ -115,9 +115,8 @@
return CoderResult.OVERFLOW;
}
- //if((c = lookup[(int) (b & 0xFF)]) == NONE);
- // return CoderResult.unmappableForLength (1);
- c = lookup[(int) (b & 0xFF)];
+ if((c = lookup[(int) (b & 0xFF)]) == NONE)
+ return CoderResult.unmappableForLength (1);
out.put (c);
}
Index: gnu/java/awt/font/opentype/truetype/VirtualMachine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java,v
retrieving revision 1.3
diff -u -r1.3 VirtualMachine.java
--- gnu/java/awt/font/opentype/truetype/VirtualMachine.java 19 Dec 2006 01:14:25 -0000 1.3
+++ gnu/java/awt/font/opentype/truetype/VirtualMachine.java 20 Dec 2006 23:25:57 -0000
@@ -499,7 +499,8 @@
// FIXME: SECURITY: Possible denial-of-service attack
// via instructions that have an endless loop.
while (instructions.hasRemaining()
- && executeInstruction(instructions)) continue;
+ && executeInstruction(instructions))
+ ;
}
Index: gnu/javax/imageio/png/PNGICCProfile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/imageio/png/PNGICCProfile.java,v
retrieving revision 1.2
diff -u -r1.2 PNGICCProfile.java
--- gnu/javax/imageio/png/PNGICCProfile.java 19 Dec 2006 01:14:26 -0000 1.2
+++ gnu/javax/imageio/png/PNGICCProfile.java 20 Dec 2006 23:26:00 -0000
@@ -61,7 +61,9 @@
{
super( type, data, crc );
int i = 0;
- while( data[i++] != 0 ) continue;
+ while( data[i++] != 0 )
+ ;
+
try
{
name = new String(data, 0, i, "8859_1");
Index: java/io/StreamTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/StreamTokenizer.java,v
retrieving revision 1.21
diff -u -r1.21 StreamTokenizer.java
--- java/io/StreamTokenizer.java 19 Dec 2006 01:14:25 -0000 1.21
+++ java/io/StreamTokenizer.java 20 Dec 2006 23:26:01 -0000
@@ -329,7 +329,7 @@
if ((ch = in.read()) == '/' && slashSlash)
{
while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
- continue;
+ ;
if (ch != TT_EOF)
in.unread(ch);
@@ -431,7 +431,7 @@
else if (isComment(ch))
{
while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
- continue;
+ ;
if (ch != TT_EOF)
in.unread(ch);
Index: java/util/zip/DeflaterHuffman.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterHuffman.java,v
retrieving revision 1.8
diff -u -r1.8 DeflaterHuffman.java
--- java/util/zip/DeflaterHuffman.java 19 Dec 2006 01:14:22 -0000 1.8
+++ java/util/zip/DeflaterHuffman.java 20 Dec 2006 23:26:17 -0000
@@ -197,7 +197,7 @@
{
/* 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.
Index: java/util/zip/ZipInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipInputStream.java,v
retrieving revision 1.17
diff -u -r1.17 ZipInputStream.java
--- java/util/zip/ZipInputStream.java 19 Dec 2006 01:14:22 -0000 1.17
+++ java/util/zip/ZipInputStream.java 20 Dec 2006 23:26:18 -0000
@@ -237,7 +237,7 @@
/* 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;
Index: java/util/zip/DeflaterEngine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterEngine.java,v
retrieving revision 1.11
diff -u -r1.11 DeflaterEngine.java
--- java/util/zip/DeflaterEngine.java 19 Dec 2006 01:14:22 -0000 1.11
+++ java/util/zip/DeflaterEngine.java 20 Dec 2006 23:26:17 -0000
@@ -377,7 +377,8 @@
&& window[++scan] == window[++match]
&& window[++scan] == window[++match]
&& window[++scan] == window[++match]
- && scan < strend) continue;
+ && scan < strend)
+ ;
if (scan > best_end) {
// if (DeflaterConstants.DEBUGGING && ins_h == 0)
Index: javax/swing/text/DefaultStyledDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultStyledDocument.java,v
retrieving revision 1.72
diff -u -r1.72 DefaultStyledDocument.java
--- javax/swing/text/DefaultStyledDocument.java 19 Dec 2006 01:14:23 -0000 1.72
+++ javax/swing/text/DefaultStyledDocument.java 20 Dec 2006 23:26:24 -0000
@@ -1126,7 +1126,8 @@
int p;
for (p = 0;
p < data.length && data[p].getType() == ElementSpec.EndTagType;
- p++) continue;
+ p++)
+ ;
Edit edit = insertPath[insertPath.length - p - 1];
edit.index--;
Index: gnu/java/io/Base64InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/Base64InputStream.java,v
retrieving revision 1.5
diff -u -r1.5 Base64InputStream.java
--- gnu/java/io/Base64InputStream.java 19 Dec 2006 01:14:25 -0000 1.5
+++ gnu/java/io/Base64InputStream.java 20 Dec 2006 23:25:58 -0000
@@ -139,7 +139,9 @@
while (count < len)
{
int i;
- while (Character.isWhitespace((char) (i = in.read()))) continue;
+ while (Character.isWhitespace((char) (i = in.read())))
+ ;
+
int pos = BASE_64.indexOf((char) i);
if (pos >= 0)
{
@@ -174,12 +176,12 @@
throw new IOException("malformed Base-64 input");
case 2:
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())))
- continue;
+ ;
}
eof = true;
break;
Index: external/jsr166/java/util/AbstractQueue.java
===================================================================
RCS file: /cvsroot/classpath/classpath/external/jsr166/java/util/AbstractQueue.java,v
retrieving revision 1.4
diff -u -r1.4 AbstractQueue.java
--- external/jsr166/java/util/AbstractQueue.java 19 Dec 2006 01:14:23 -0000 1.4
+++ external/jsr166/java/util/AbstractQueue.java 20 Dec 2006 23:25:55 -0000
@@ -117,7 +117,7 @@
*/
public void clear() {
while (poll() != null)
- continue;
+ ;
}
/**
Index: java/text/BreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/BreakIterator.java,v
retrieving revision 1.13
diff -u -r1.13 BreakIterator.java
--- java/text/BreakIterator.java 19 Dec 2006 01:14:23 -0000 1.13
+++ java/text/BreakIterator.java 20 Dec 2006 23:26:08 -0000
@@ -341,7 +341,7 @@
if (following (pos) == DONE)
last ();
while (previous () >= pos)
- continue;
+ ;
return current ();
}
Index: gnu/javax/swing/text/html/css/CSSParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/swing/text/html/css/CSSParser.java,v
retrieving revision 1.5
diff -u -r1.5 CSSParser.java
--- gnu/javax/swing/text/html/css/CSSParser.java 19 Dec 2006 01:14:24 -0000 1.5
+++ gnu/javax/swing/text/html/css/CSSParser.java 20 Dec 2006 23:26:00 -0000
@@ -308,7 +308,9 @@
{
// FIXME: Handle block and ATKEYWORD.
boolean success = parseAny(s);
- while (parseAny(s)) continue;
+ while (parseAny(s))
+ ;
+
return success;
}
@@ -329,7 +331,8 @@
boolean ret = parseAny(sel);
if (ret)
{
- while (parseAny(sel)) continue;
+ while (parseAny(sel))
+ ;
}
return ret;
}
