I've found a number of Empty control-flow statement that ecj (or better,
Eclipse) complains and don't compile.
I've fixed them all, but there are a couple of cases in which doing this
has surfaced some other problems.
For example:
javax.swing.JTooltip:
protected String paramString()
{
StringBuffer sb = new StringBuffer(super.paramString());
sb.append(",tiptext=");
if (text != null); <--------
sb.append(text);
return sb.toString();
}
Look at the semicolon.
Another example:
java.beans.XMLEncoder
public void writeObject(Object o)
{
accessCounter++;
scanEngine.writeObject(o);
if (get(o) == null); <--------
super.writeObject(o);
accessCounter--;
}
Another tricky method is gnu.java.nio.charset.ByteCharset.decodeLoop:
if((c = lookup[(int) (b & 0xFF)]) == NONE);
// return CoderResult.unmappableForLength (1);
out.put (c);
fixed as
c = lookup[(int) (b & 0xFF)];
out.put (c);
I have not committed yet, to wait if this patch adds or fixes
regressions.
Comments welcomed as always.
Ciao,
Mario
--------------- Long ChangeLog Follow ----------------
2006-12-16 Mario Torre <[EMAIL PROTECTED]>
* java/util/regex/Pattern.java (split): fixed Empty control-flow
statement.
* javax/naming/InitialContext.java: likewise.
* gnu/javax/swing/text/html/css/CSSParser.java (parseSelector):
likewise.
(parseValue): likewise.
* javax/swing/table/JTableHeader.java (AccessibleJTableHeader):
likewise.
* gnu/xml/pipeline/DomConsumer.java (Handler.fatal): likewise.
* java/io/StreamTokenizer.java (nextToken): likewise.
* java/rmi/activation/ActivationID.java: likewise.
* gnu/javax/swing/text/html/parser/gnuDTD.java (attr): likewise.
* gnu/java/awt/font/opentype/truetype/VirtualMachine.java (execute):
likewise.
* gnu/java/nio/charset/ByteCharset.java (Decoder.decodeLoop): likewise.
* gnu/javax/swing/text/html/parser/support/Parser.java
(readTillTokenE):
likewise.
* gnu/java/awt/print/PostScriptGraphics2D.java (spoolPostScript):
likewise.
* gnu/java/awt/print/JavaPrinterGraphics.java (spoolPostScript):
likewise.
* java/net/Proxy.java: likewise.
* javax/imageio/ImageWriteParam.java
(getCompressionQualityDescriptions):
likewise.
(getCompressionQualityValues): likewise.
* examples/gnu/classpath/examples/swing/NavigationFilterDemo.java
(WordFilter.getNextVisualPositionFrom): likewise.
* gnu/java/awt/peer/qt/QtToolkit.java (QtToolkit): likewise.
* javax/swing/colorchooser/DefaultHSBChooserPanel.java (updateSlider):
likewise.
* tools/gnu/classpath/tools/jarsigner/Main.java: likewise.
* java/rmi/server/UnicastRemoteObject.java (unexportObject):
likewise.
* gnu/CORBA/DynAn/gnuDynValue.java: likewise.
* tools/gnu/classpath/tools/appletviewer/TagParser.java
(parseAppletTags):
likewise.
* gnu/xml/util/XCat.java (resolveEntity): likewise.
* javax/imageio/spi/ServiceRegistry.java: likewise.
* 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/CollationElementIterator.java: likewise.
(CollationElementIterator): 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):
* javax/swing/text/FieldView.java (checkContainer):
likewise.
* javax/swing/text/AsyncBoxView.java (ChildLocator.updateChildOffsets):
likewise.
* java/text/DecimalFormat.java (formatToCharacterIterator):
(parse): small refactoring.
--
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: javax/swing/text/AsyncBoxView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AsyncBoxView.java,v
retrieving revision 1.4
diff -u -r1.4 AsyncBoxView.java
--- javax/swing/text/AsyncBoxView.java 25 Apr 2006 09:13:28 -0000 1.4
+++ javax/swing/text/AsyncBoxView.java 16 Dec 2006 15:46:45 -0000
@@ -307,7 +307,7 @@
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();
Index: javax/swing/text/FieldView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/FieldView.java,v
retrieving revision 1.18
diff -u -r1.18 FieldView.java
--- javax/swing/text/FieldView.java 2 Sep 2006 11:29:12 -0000 1.18
+++ javax/swing/text/FieldView.java 16 Dec 2006 15:46:48 -0000
@@ -91,7 +91,7 @@
horizontalVisibility.addChangeListener(new ChangeListener(){
public void stateChanged(ChangeEvent event) {
getContainer().repaint();
- };
+ }
});
// It turned out that the span calculated at this point is wrong
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/JTextComponent.java,v
retrieving revision 1.61
diff -u -r1.61 JTextComponent.java
--- javax/swing/text/JTextComponent.java 7 Aug 2006 19:20:04 -0000 1.61
+++ javax/swing/text/JTextComponent.java 16 Dec 2006 15:46:49 -0000
@@ -1821,7 +1821,7 @@
public boolean getScrollableTracksViewportWidth()
{
- boolean res = false;;
+ boolean res = false;
Container c = getParent();
if (c instanceof JViewport)
res = ((JViewport) c).getExtentSize().width > getPreferredSize().width;
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.66
diff -u -r1.66 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java 13 Dec 2006 20:29:50 -0000 1.66
+++ javax/swing/text/AbstractDocument.java 16 Dec 2006 15:46:44 -0000
@@ -2093,7 +2093,7 @@
/**
* The child elements of this BranchElement.
*/
- private Element[] children;;
+ private Element[] children;
/**
* The number of children in the branch element.
Index: javax/swing/text/DefaultStyledDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultStyledDocument.java,v
retrieving revision 1.71
diff -u -r1.71 DefaultStyledDocument.java
--- javax/swing/text/DefaultStyledDocument.java 10 Dec 2006 20:25:48 -0000 1.71
+++ javax/swing/text/DefaultStyledDocument.java 16 Dec 2006 15:46:47 -0000
@@ -1126,7 +1126,8 @@
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));
Index: gnu/java/lang/management/BeanImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/lang/management/BeanImpl.java,v
retrieving revision 1.8
diff -u -r1.8 BeanImpl.java
--- gnu/java/lang/management/BeanImpl.java 11 Dec 2006 01:54:39 -0000 1.8
+++ gnu/java/lang/management/BeanImpl.java 16 Dec 2006 15:45:54 -0000
@@ -506,7 +506,7 @@
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",
Index: java/math/BigInteger.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/math/BigInteger.java,v
retrieving revision 1.30
diff -u -r1.30 BigInteger.java
--- java/math/BigInteger.java 10 Dec 2006 20:25:45 -0000 1.30
+++ java/math/BigInteger.java 16 Dec 2006 15:46:11 -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;
@@ -573,7 +573,7 @@
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 @@
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);
Index: gnu/javax/security/auth/login/ConfigFileParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/security/auth/login/ConfigFileParser.java,v
retrieving revision 1.6
diff -u -r1.6 ConfigFileParser.java
--- gnu/javax/security/auth/login/ConfigFileParser.java 25 Jun 2006 22:45:26 -0000 1.6
+++ gnu/javax/security/auth/login/ConfigFileParser.java 16 Dec 2006 15:45:55 -0000
@@ -122,7 +122,9 @@
initParser(r);
while (parseAppOrOtherEntry())
- ; // do nothing
+ {
+ /* do nothing */
+ }
}
private void initParser(Reader r) throws IOException
@@ -157,7 +159,9 @@
List lmis = new ArrayList();
while (parseACE(lmis))
- ; // do nothing
+ {
+ /* do nothing */
+ }
c = cft.nextToken();
if (c != '}')
Index: gnu/CORBA/Poa/gnuPOA.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/Poa/gnuPOA.java,v
retrieving revision 1.8
diff -u -r1.8 gnuPOA.java
--- gnu/CORBA/Poa/gnuPOA.java 10 Dec 2006 20:25:41 -0000 1.8
+++ gnu/CORBA/Poa/gnuPOA.java 16 Dec 2006 15:45:48 -0000
@@ -1348,7 +1348,6 @@
{
return name;
}
- ;
/**
* Return the parent of this POA.
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JEditorPane.java,v
retrieving revision 1.45
diff -u -r1.45 JEditorPane.java
--- javax/swing/JEditorPane.java 8 Dec 2006 14:00:47 -0000 1.45
+++ javax/swing/JEditorPane.java 16 Dec 2006 15:46:33 -0000
@@ -712,7 +712,7 @@
public JEditorPane(URL url) throws IOException
{
init();
- setEditorKit(createEditorKitForContentType("text/html"));;
+ setEditorKit(createEditorKitForContentType("text/html"));
setPage(url);
}
Index: javax/swing/JToolTip.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToolTip.java,v
retrieving revision 1.15
diff -u -r1.15 JToolTip.java
--- javax/swing/JToolTip.java 23 Aug 2006 22:03:23 -0000 1.15
+++ javax/swing/JToolTip.java 16 Dec 2006 15:46:34 -0000
@@ -181,7 +181,7 @@
{
StringBuffer sb = new StringBuffer(super.paramString());
sb.append(",tiptext=");
- if (text != null);
+ if (text != null)
sb.append(text);
return sb.toString();
}
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.150
diff -u -r1.150 JComponent.java
--- javax/swing/JComponent.java 13 Dec 2006 20:29:50 -0000 1.150
+++ javax/swing/JComponent.java 16 Dec 2006 15:46:32 -0000
@@ -1927,7 +1927,8 @@
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 @@
{
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))
Index: javax/swing/JFormattedTextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JFormattedTextField.java,v
retrieving revision 1.20
diff -u -r1.20 JFormattedTextField.java
--- javax/swing/JFormattedTextField.java 1 Jun 2006 04:38:49 -0000 1.20
+++ javax/swing/JFormattedTextField.java 16 Dec 2006 15:46:34 -0000
@@ -415,7 +415,7 @@
// 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);
Index: java/lang/StrictMath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/StrictMath.java,v
retrieving revision 1.15
diff -u -r1.15 StrictMath.java
--- java/lang/StrictMath.java 3 Aug 2006 19:04:58 -0000 1.15
+++ java/lang/StrictMath.java 16 Dec 2006 15:46:07 -0000
@@ -2278,8 +2278,8 @@
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].
{
Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.83
diff -u -r1.83 String.java
--- java/lang/String.java 10 Dec 2006 20:25:44 -0000 1.83
+++ java/lang/String.java 16 Dec 2006 15:46:10 -0000
@@ -1593,7 +1593,7 @@
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);
}
Index: java/lang/Character.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Character.java,v
retrieving revision 1.47
diff -u -r1.47 Character.java
--- java/lang/Character.java 10 Dec 2006 20:25:44 -0000 1.47
+++ java/lang/Character.java 16 Dec 2006 15:46:05 -0000
@@ -156,7 +156,7 @@
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.
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.57
diff -u -r1.57 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java 12 Oct 2006 12:50:43 -0000 1.57
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java 16 Dec 2006 15:46:39 -0000
@@ -1364,7 +1364,7 @@
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++)
Index: javax/swing/text/html/CSSParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/CSSParser.java,v
retrieving revision 1.4
diff -u -r1.4 CSSParser.java
--- javax/swing/text/html/CSSParser.java 10 Dec 2006 20:25:48 -0000 1.4
+++ javax/swing/text/html/CSSParser.java 16 Dec 2006 15:46:50 -0000
@@ -315,7 +315,7 @@
try
{
if (!parsingDeclaration)
- while(getNextStatement());
+ while(getNextStatement()) continue;
else
parseDeclarationBlock();
}
Index: java/util/Date.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Date.java,v
retrieving revision 1.24
diff -u -r1.24 Date.java
--- java/util/Date.java 10 Dec 2006 20:25:46 -0000 1.24
+++ java/util/Date.java 16 Dec 2006 15:46:24 -0000
@@ -847,7 +847,7 @@
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"))
Index: java/util/BitSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/BitSet.java,v
retrieving revision 1.21
diff -u -r1.21 BitSet.java
--- java/util/BitSet.java 10 Dec 2006 20:25:46 -0000 1.21
+++ java/util/BitSet.java 16 Dec 2006 15:46:16 -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.2
diff -u -r1.2 EnumMap.java
--- java/util/EnumMap.java 10 Dec 2006 20:25:46 -0000 1.2
+++ java/util/EnumMap.java 16 Dec 2006 15:46:25 -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: java/util/PriorityQueue.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/PriorityQueue.java,v
retrieving revision 1.2
diff -u -r1.2 PriorityQueue.java
--- java/util/PriorityQueue.java 10 Dec 2006 20:25:46 -0000 1.2
+++ java/util/PriorityQueue.java 16 Dec 2006 15:46:25 -0000
@@ -161,7 +161,8 @@
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.16
diff -u -r1.16 StringTokenizer.java
--- java/util/StringTokenizer.java 10 Dec 2006 20:25:46 -0000 1.16
+++ java/util/StringTokenizer.java 16 Dec 2006 15:46:25 -0000
@@ -181,13 +181,15 @@
{
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();
Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.46
diff -u -r1.46 Collections.java
--- java/util/Collections.java 15 Dec 2006 22:27:25 -0000 1.46
+++ java/util/Collections.java 16 Dec 2006 15:46:23 -0000
@@ -706,14 +706,14 @@
{
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);
Index: gnu/java/beans/encoder/ScanEngine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/beans/encoder/ScanEngine.java,v
retrieving revision 1.1
diff -u -r1.1 ScanEngine.java
--- gnu/java/beans/encoder/ScanEngine.java 8 Jan 2006 19:31:37 -0000 1.1
+++ gnu/java/beans/encoder/ScanEngine.java 16 Dec 2006 15:45:54 -0000
@@ -153,7 +153,7 @@
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.
Index: java/beans/XMLEncoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/XMLEncoder.java,v
retrieving revision 1.2
diff -u -r1.2 XMLEncoder.java
--- java/beans/XMLEncoder.java 24 Jan 2006 16:57:57 -0000 1.2
+++ java/beans/XMLEncoder.java 16 Dec 2006 15:46:00 -0000
@@ -248,7 +248,7 @@
scanEngine.writeObject(o);
- if (get(o) == null);
+ if (get(o) == null)
super.writeObject(o);
accessCounter--;
Index: java/text/DecimalFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormat.java,v
retrieving revision 1.31
diff -u -r1.31 DecimalFormat.java
--- java/text/DecimalFormat.java 2 Dec 2006 01:00:26 -0000 1.31
+++ java/text/DecimalFormat.java 16 Dec 2006 15:46:14 -0000
@@ -439,8 +439,8 @@
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 @@
// 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;
Index: java/text/BreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/BreakIterator.java,v
retrieving revision 1.12
diff -u -r1.12 BreakIterator.java
--- java/text/BreakIterator.java 20 Jul 2005 08:10:07 -0000 1.12
+++ java/text/BreakIterator.java 16 Dec 2006 15:46:12 -0000
@@ -341,7 +341,7 @@
if (following (pos) == DONE)
last ();
while (previous () >= pos)
- ;
+ continue;
return current ();
}
Index: java/text/MessageFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/MessageFormat.java,v
retrieving revision 1.23
diff -u -r1.23 MessageFormat.java
--- java/text/MessageFormat.java 10 Dec 2006 20:25:46 -0000 1.23
+++ java/text/MessageFormat.java 16 Dec 2006 15:46:15 -0000
@@ -82,70 +82,72 @@
// 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);
+ }
}
}
}
Index: gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SSLRSASignatureImpl.java
--- gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java 10 Dec 2006 20:25:42 -0000 1.2
+++ gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java 16 Dec 2006 15:45:55 -0000
@@ -188,7 +188,7 @@
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)
{
Index: gnu/javax/net/ssl/provider/SSLEngineImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java,v
retrieving revision 1.2
diff -u -r1.2 SSLEngineImpl.java
--- gnu/javax/net/ssl/provider/SSLEngineImpl.java 10 Dec 2006 20:25:42 -0000 1.2
+++ gnu/javax/net/ssl/provider/SSLEngineImpl.java 16 Dec 2006 15:45:55 -0000
@@ -99,7 +99,7 @@
private Mode mode;
- private enum Mode { SERVER, CLIENT };
+ private enum Mode { SERVER, CLIENT }
SSLEngineImpl (SSLContextImpl contextImpl, String host, int port)
{
Index: gnu/javax/imageio/png/PNGICCProfile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/imageio/png/PNGICCProfile.java,v
retrieving revision 1.1
diff -u -r1.1 PNGICCProfile.java
--- gnu/javax/imageio/png/PNGICCProfile.java 19 Jul 2006 16:49:18 -0000 1.1
+++ gnu/javax/imageio/png/PNGICCProfile.java 16 Dec 2006 15:45:54 -0000
@@ -61,7 +61,7 @@
{
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");
Index: tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ASMContentHandler.java
--- tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java 7 Dec 2006 17:01:01 -0000 1.1.1.1
+++ tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java 16 Dec 2006 15:46:53 -0000
@@ -134,7 +134,7 @@
new AnnotationValueAnnotationRule());
RULES.add("*/annotationValueEnum", new AnnotationValueEnumRule());
RULES.add("*/annotationValueArray", new AnnotationValueArrayRule());
- };
+ }
private static interface OpcodeGroup {
public static final int INSN = 0;
Index: javax/swing/plaf/metal/MetalFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,v
retrieving revision 1.26
diff -u -r1.26 MetalFileChooserUI.java
--- javax/swing/plaf/metal/MetalFileChooserUI.java 2 Aug 2006 21:46:16 -0000 1.26
+++ javax/swing/plaf/metal/MetalFileChooserUI.java 16 Dec 2006 15:46:40 -0000
@@ -441,7 +441,7 @@
filechooser.revalidate();
filechooser.repaint();
}
- };
+ }
/**
* A combo box model containing the selected directory and all its parent
Index: org/omg/CORBA/ORB.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/omg/CORBA/ORB.java,v
retrieving revision 1.28
diff -u -r1.28 ORB.java
--- org/omg/CORBA/ORB.java 10 Dec 2006 20:25:49 -0000 1.28
+++ org/omg/CORBA/ORB.java 16 Dec 2006 15:46:51 -0000
@@ -280,8 +280,7 @@
{
throw new NO_IMPLEMENT();
}
- ;
-
+
/**
* The support for [EMAIL PROTECTED] DynAny} and derived interfaces
* has never been implemented in Sun's java releases,
@@ -296,7 +295,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for [EMAIL PROTECTED] DynArray}
@@ -313,7 +311,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for [EMAIL PROTECTED] DynEnum}
@@ -330,7 +327,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for [EMAIL PROTECTED] DynSequence}
@@ -347,7 +343,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* The support for [EMAIL PROTECTED] DynStruct} and derived interfaces
@@ -364,8 +359,7 @@
{
throw new NO_IMPLEMENT();
}
- ;
-
+
/**
* The support for [EMAIL PROTECTED] DynUnion} and derived interfaces
* has never been implemented in Sun's java releases,
@@ -381,7 +375,6 @@
{
throw new NO_IMPLEMENT();
}
- ;
/**
* Create a typecode, defining the given enumeration.
Index: java/util/zip/DeflaterHuffman.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterHuffman.java,v
retrieving revision 1.7
diff -u -r1.7 DeflaterHuffman.java
--- java/util/zip/DeflaterHuffman.java 30 Aug 2005 15:53:17 -0000 1.7
+++ java/util/zip/DeflaterHuffman.java 16 Dec 2006 15:46:27 -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.16
diff -u -r1.16 ZipInputStream.java
--- java/util/zip/ZipInputStream.java 30 Aug 2005 21:47:44 -0000 1.16
+++ java/util/zip/ZipInputStream.java 16 Dec 2006 15:46:27 -0000
@@ -237,7 +237,8 @@
/* 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.10
diff -u -r1.10 DeflaterEngine.java
--- java/util/zip/DeflaterEngine.java 10 Dec 2006 20:25:46 -0000 1.10
+++ java/util/zip/DeflaterEngine.java 16 Dec 2006 15:46:26 -0000
@@ -377,7 +377,7 @@
&& 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)
Index: gnu/javax/swing/text/html/CharacterAttributeTranslator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java,v
retrieving revision 1.6
diff -u -r1.6 CharacterAttributeTranslator.java
--- gnu/javax/swing/text/html/CharacterAttributeTranslator.java 10 Dec 2006 20:25:43 -0000 1.6
+++ gnu/javax/swing/text/html/CharacterAttributeTranslator.java 16 Dec 2006 15:45:55 -0000
@@ -74,7 +74,7 @@
colorMap.put("teal" , "#008080");
colorMap.put("white" , "#FFFFFF");
colorMap.put("yellow" , "#FFFF00");
- };
+ }
/**
* Convert the color string represenation into java.awt.Color. The valid
Index: gnu/java/io/Base64InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/Base64InputStream.java,v
retrieving revision 1.4
diff -u -r1.4 Base64InputStream.java
--- gnu/java/io/Base64InputStream.java 2 Jul 2005 20:32:12 -0000 1.4
+++ gnu/java/io/Base64InputStream.java 16 Dec 2006 15:45:54 -0000
@@ -139,7 +139,7 @@
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 @@
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;
Index: tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java,v
retrieving revision 1.1
diff -u -r1.1 ActivationSystemImpl.java
--- tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java 22 Sep 2006 22:53:18 -0000 1.1
+++ tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java 16 Dec 2006 15:46:54 -0000
@@ -238,6 +238,6 @@
ClassNotFoundException
{
// Write no fields.
- };
+ }
}
Index: javax/imageio/spi/ServiceRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/spi/ServiceRegistry.java,v
retrieving revision 1.6
diff -u -r1.6 ServiceRegistry.java
--- javax/imageio/spi/ServiceRegistry.java 10 Dec 2006 20:25:46 -0000 1.6
+++ javax/imageio/spi/ServiceRegistry.java 16 Dec 2006 15:46:28 -0000
@@ -957,6 +957,6 @@
* criteria; <code>false</code> if it does not match.
*/
boolean filter(Object provider);
- };
+ }
}
Index: gnu/xml/util/XCat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/util/XCat.java,v
retrieving revision 1.2
diff -u -r1.2 XCat.java
--- gnu/xml/util/XCat.java 2 Jul 2005 20:32:21 -0000 1.2
+++ gnu/xml/util/XCat.java 16 Dec 2006 15:46:00 -0000
@@ -274,7 +274,7 @@
InputSource retval;
retval = catalogs [i].resolve (usingPublic, publicId, systemId);
if (retval != null)
- return retval;;
+ return retval;
}
} catch (DoneDelegation x) {
// done!
Index: tools/gnu/classpath/tools/appletviewer/TagParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java,v
retrieving revision 1.2
diff -u -r1.2 TagParser.java
--- tools/gnu/classpath/tools/appletviewer/TagParser.java 29 Nov 2006 20:48:31 -0000 1.2
+++ tools/gnu/classpath/tools/appletviewer/TagParser.java 16 Dec 2006 15:46:53 -0000
@@ -130,7 +130,7 @@
{
ArrayList allTags = new ArrayList();
if (document == null)
- return null;;
+ return null;
recurseDocument(document.getChildNodes());
Index: gnu/CORBA/DynAn/gnuDynValue.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/CORBA/DynAn/gnuDynValue.java,v
retrieving revision 1.4
diff -u -r1.4 gnuDynValue.java
--- gnu/CORBA/DynAn/gnuDynValue.java 28 Oct 2005 13:21:48 -0000 1.4
+++ gnu/CORBA/DynAn/gnuDynValue.java 16 Dec 2006 15:45:45 -0000
@@ -172,7 +172,6 @@
else
return super.current_member_kind();
}
- ;
/** @inheritDoc */
public String current_member_name() throws TypeMismatch, InvalidValue
@@ -182,7 +181,6 @@
else
return super.current_member_name();
}
- ;
/** @inheritDoc */
public NameDynAnyPair[] get_members_as_dyn_any() throws InvalidValue
@@ -191,7 +189,6 @@
throw new InvalidValue(ISNULL);
return super.gnu_get_members_as_dyn_any();
}
- ;
/** @inheritDoc */
public NameValuePair[] get_members() throws InvalidValue
@@ -201,7 +198,6 @@
else
return super.gnu_get_members();
}
- ;
/** @inheritDoc */
public void set_members_as_dyn_any(NameDynAnyPair[] value)
@@ -210,7 +206,6 @@
super.set_members_as_dyn_any(value);
isNull = false;
}
- ;
/** @inheritDoc */
public void set_members(NameValuePair[] value)
@@ -219,7 +214,6 @@
super.set_members(value);
isNull = false;
}
- ;
/** @inheritDoc */
public boolean is_null()
Index: java/rmi/server/UnicastRemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/UnicastRemoteObject.java,v
retrieving revision 1.14
diff -u -r1.14 UnicastRemoteObject.java
--- java/rmi/server/UnicastRemoteObject.java 20 Feb 2006 08:49:37 -0000 1.14
+++ java/rmi/server/UnicastRemoteObject.java 16 Dec 2006 15:46:12 -0000
@@ -239,11 +239,12 @@
(UnicastServerRef) ((RemoteObject) obj).getRef();
return sref.unexportObject(obj, force);
}
- else
+ // FIXME
+ /* else
{
- // FIXME
;
}
+ */
return true;
}
Index: tools/gnu/classpath/tools/jarsigner/Main.java
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/gnu/classpath/tools/jarsigner/Main.java,v
retrieving revision 1.14
diff -u -r1.14 Main.java
--- tools/gnu/classpath/tools/jarsigner/Main.java 22 Sep 2006 01:01:26 -0000 1.14
+++ tools/gnu/classpath/tools/jarsigner/Main.java 16 Dec 2006 15:46:54 -0000
@@ -123,7 +123,7 @@
private CallbackHandler handler;
/** The command line parser. */
private ToolParser cmdLineParser;
- protected ArrayList fileAndAlias = new ArrayList();;
+ protected ArrayList fileAndAlias = new ArrayList();
private Main()
{
Index: javax/swing/colorchooser/DefaultHSBChooserPanel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java,v
retrieving revision 1.5
diff -u -r1.5 DefaultHSBChooserPanel.java
--- javax/swing/colorchooser/DefaultHSBChooserPanel.java 2 Jul 2005 20:32:49 -0000 1.5
+++ javax/swing/colorchooser/DefaultHSBChooserPanel.java 16 Dec 2006 15:46:35 -0000
@@ -778,7 +778,6 @@
if (locked == HLOCKED)
{
slider.setMaximum(359);
- ;
slider.setValue(((Number) hSpinner.getValue()).intValue());
slider.setInverted(true);
}
Index: gnu/java/awt/peer/qt/QtToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtToolkit.java,v
retrieving revision 1.9
diff -u -r1.9 QtToolkit.java
--- gnu/java/awt/peer/qt/QtToolkit.java 26 Jul 2006 20:08:08 -0000 1.9
+++ gnu/java/awt/peer/qt/QtToolkit.java 16 Dec 2006 15:45:49 -0000
@@ -163,7 +163,8 @@
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 );
Index: examples/gnu/classpath/examples/swing/NavigationFilterDemo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java,v
retrieving revision 1.2
diff -u -r1.2 NavigationFilterDemo.java
--- examples/gnu/classpath/examples/swing/NavigationFilterDemo.java 13 May 2006 11:48:17 -0000 1.2
+++ examples/gnu/classpath/examples/swing/NavigationFilterDemo.java 16 Dec 2006 15:45:45 -0000
@@ -183,7 +183,7 @@
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.
Index: javax/imageio/ImageWriteParam.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/ImageWriteParam.java,v
retrieving revision 1.6
diff -u -r1.6 ImageWriteParam.java
--- javax/imageio/ImageWriteParam.java 4 Apr 2006 00:49:51 -0000 1.6
+++ javax/imageio/ImageWriteParam.java 16 Dec 2006 15:46:27 -0000
@@ -278,7 +278,7 @@
public String[] getCompressionQualityDescriptions()
{
checkNotExplicitCompression();
- checkCompressionTypesSet();;
+ checkCompressionTypesSet();
return null;
}
@@ -286,7 +286,7 @@
public float[] getCompressionQualityValues()
{
checkNotExplicitCompression();
- checkCompressionTypesSet();;
+ checkCompressionTypesSet();
return null;
}
Index: java/net/Proxy.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Proxy.java,v
retrieving revision 1.2
diff -u -r1.2 Proxy.java
--- java/net/Proxy.java 10 Dec 2006 20:25:45 -0000 1.2
+++ java/net/Proxy.java 16 Dec 2006 15:46:12 -0000
@@ -57,7 +57,7 @@
* For compatability with Sun's JDK
*/
private static final long serialVersionUID = -2231209257930100533L;
- };
+ }
public static final Proxy NO_PROXY = new Proxy(Type.DIRECT, null);
Index: gnu/java/awt/print/JavaPrinterGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/print/JavaPrinterGraphics.java,v
retrieving revision 1.6
diff -u -r1.6 JavaPrinterGraphics.java
--- gnu/java/awt/print/JavaPrinterGraphics.java 29 May 2006 16:17:38 -0000 1.6
+++ gnu/java/awt/print/JavaPrinterGraphics.java 16 Dec 2006 15:45:51 -0000
@@ -135,7 +135,7 @@
{
int index = 0;
while(spoolPage(out, printable, pageFormat, index++) ==
- Printable.PAGE_EXISTS);
+ Printable.PAGE_EXISTS) continue;
}
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.2
diff -u -r1.2 PostScriptGraphics2D.java
--- gnu/java/awt/print/PostScriptGraphics2D.java 15 Jun 2006 08:42:55 -0000 1.2
+++ gnu/java/awt/print/PostScriptGraphics2D.java 16 Dec 2006 15:45:51 -0000
@@ -191,7 +191,7 @@
{
int index = 0;
while(spoolPage(out, printable, pageFormat, index++) ==
- Printable.PAGE_EXISTS);
+ Printable.PAGE_EXISTS) continue;
}
out.println("%%Trailer");
out.println("%%EOF");
Index: gnu/java/nio/charset/ByteCharset.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/ByteCharset.java,v
retrieving revision 1.3
diff -u -r1.3 ByteCharset.java
--- gnu/java/nio/charset/ByteCharset.java 25 Sep 2006 19:19:47 -0000 1.3
+++ gnu/java/nio/charset/ByteCharset.java 16 Dec 2006 15:45:54 -0000
@@ -115,8 +115,9 @@
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);
}
Index: gnu/javax/swing/text/html/parser/support/Parser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/swing/text/html/parser/support/Parser.java,v
retrieving revision 1.16
diff -u -r1.16 Parser.java
--- gnu/javax/swing/text/html/parser/support/Parser.java 3 Dec 2006 23:16:37 -0000 1.16
+++ gnu/javax/swing/text/html/parser/support/Parser.java 16 Dec 2006 15:45:57 -0000
@@ -1382,7 +1382,7 @@
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
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.2
diff -u -r1.2 VirtualMachine.java
--- gnu/java/awt/font/opentype/truetype/VirtualMachine.java 9 Jun 2006 09:35:50 -0000 1.2
+++ gnu/java/awt/font/opentype/truetype/VirtualMachine.java 16 Dec 2006 15:45:49 -0000
@@ -499,8 +499,7 @@
// FIXME: SECURITY: Possible denial-of-service attack
// via instructions that have an endless loop.
while (instructions.hasRemaining()
- && executeInstruction(instructions))
- ;
+ && executeInstruction(instructions)) continue;
}
Index: gnu/javax/swing/text/html/parser/gnuDTD.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/javax/swing/text/html/parser/gnuDTD.java,v
retrieving revision 1.3
diff -u -r1.3 gnuDTD.java
--- gnu/javax/swing/text/html/parser/gnuDTD.java 2 Jul 2005 20:32:15 -0000 1.3
+++ gnu/javax/swing/text/html/parser/gnuDTD.java 16 Dec 2006 15:45:57 -0000
@@ -390,7 +390,6 @@
allowed.add(allowed_values [ i ]);
}
}
- ;
AttributeList attr =
new AttributeList(name, type, modifier, default_value, allowed, null);
Index: java/rmi/activation/ActivationID.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationID.java,v
retrieving revision 1.9
diff -u -r1.9 ActivationID.java
--- java/rmi/activation/ActivationID.java 23 Mar 2006 16:12:56 -0000 1.9
+++ java/rmi/activation/ActivationID.java 16 Dec 2006 15:46:12 -0000
@@ -174,7 +174,7 @@
{
out.writeObject(uid);
out.writeObject(activator);
- };
+ }
/**
* Compare by .equals if both a and b are not null, compare directly if at
Index: java/io/StreamTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/StreamTokenizer.java,v
retrieving revision 1.20
diff -u -r1.20 StreamTokenizer.java
--- java/io/StreamTokenizer.java 22 Nov 2005 13:27:33 -0000 1.20
+++ java/io/StreamTokenizer.java 16 Dec 2006 15:46:01 -0000
@@ -329,7 +329,8 @@
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 @@
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.
Index: gnu/xml/pipeline/DomConsumer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/pipeline/DomConsumer.java,v
retrieving revision 1.4
diff -u -r1.4 DomConsumer.java
--- gnu/xml/pipeline/DomConsumer.java 24 Dec 2005 14:14:48 -0000 1.4
+++ gnu/xml/pipeline/DomConsumer.java 16 Dec 2006 15:45:58 -0000
@@ -365,7 +365,7 @@
throws SAXException
{
SAXParseException e;
- ErrorHandler errHandler = consumer.getErrorHandler ();;
+ ErrorHandler errHandler = consumer.getErrorHandler ();
if (locator == null)
e = new SAXParseException (message, null, null, -1, -1, x);
Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/JTableHeader.java,v
retrieving revision 1.18
diff -u -r1.18 JTableHeader.java
--- javax/swing/table/JTableHeader.java 31 May 2006 22:03:15 -0000 1.18
+++ javax/swing/table/JTableHeader.java 16 Dec 2006 15:46:41 -0000
@@ -570,7 +570,7 @@
if (comp != null)
comp.setVisible(b);
}
- };
+ }
public AccessibleRole getAccessibleRole()
{
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.4
diff -u -r1.4 CSSParser.java
--- gnu/javax/swing/text/html/css/CSSParser.java 17 Nov 2006 22:12:11 -0000 1.4
+++ gnu/javax/swing/text/html/css/CSSParser.java 16 Dec 2006 15:45:57 -0000
@@ -308,7 +308,7 @@
{
// FIXME: Handle block and ATKEYWORD.
boolean success = parseAny(s);
- while (parseAny(s));
+ while (parseAny(s)) continue;
return success;
}
@@ -329,7 +329,7 @@
boolean ret = parseAny(sel);
if (ret)
{
- while (parseAny(sel));
+ while (parseAny(sel)) continue;
}
return ret;
}
Index: javax/naming/InitialContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v
retrieving revision 1.11
diff -u -r1.11 InitialContext.java
--- javax/naming/InitialContext.java 10 Dec 2006 20:25:47 -0000 1.11
+++ javax/naming/InitialContext.java 16 Dec 2006 15:46:29 -0000
@@ -87,7 +87,7 @@
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
Index: java/util/regex/Pattern.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/regex/Pattern.java,v
retrieving revision 1.18
diff -u -r1.18 Pattern.java
--- java/util/regex/Pattern.java 25 Jul 2006 14:34:51 -0000 1.18
+++ java/util/regex/Pattern.java 16 Dec 2006 15:46:25 -0000
@@ -246,7 +246,7 @@
{
String t = input.subSequence(start, input.length()).toString();
if ("".equals(t) && limit == 0)
- ; // Don't add.
+ { /* Don't add. */ }
else
list.add(t);
}
