This fixes a number of issues spotted by FindBugs:
2008-09-01 Andrew John Hughes <[EMAIL PROTECTED]>
* gnu/java/util/regex/RETokenStart.java:
(getMaximumLength()): Add Override annotation.
(matchThis(CharIndexed, REMatch)): Likewise.
(returnsFixedLengthMatches()): Renamed from
returnsFixedLengthmatches and added Override
annotation.
(findFixedLengthMatches(CharIndexed,REMatch,int)):
Add Override annotation.
(dump(CPStringBuilder)): Likewise.
* gnu/javax/print/ipp/IppRequest.java:
(RequestWriter.writeOperationAttributes(AttributeSet)):
Throw exception, don't just create and drop it.
* javax/management/MBeanServerPermission.java:
(MBeanServerPermissionCollection.add(Permission)): Compare
against individual Strings not the entire array, and
store the result of replace.
* javax/swing/text/html/StyleSheet.java:
(setBaseFontSize(size)): Store result of trim().
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/java/util/regex/RETokenStart.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenStart.java,v
retrieving revision 1.3
diff -u -u -r1.3 RETokenStart.java
--- gnu/java/util/regex/RETokenStart.java 5 May 2008 20:58:08 -0000
1.3
+++ gnu/java/util/regex/RETokenStart.java 1 Sep 2008 14:47:01 -0000
@@ -55,10 +55,12 @@
this.check_java_line_terminators = b;
}
+ @Override
int getMaximumLength() {
- return 0;
+ return 0;
}
-
+
+ @Override
REMatch matchThis(CharIndexed input, REMatch mymatch) {
// charAt(index-n) may be unknown on a Reader/InputStream. FIXME
// Match after a newline if in multiline mode
@@ -110,13 +112,16 @@
mymatch : null;
}
- boolean returnsFixedLengthmatches() { return true; }
+ @Override
+ boolean returnsFixedLengthMatches() { return true; }
+ @Override
int findFixedLengthMatches(CharIndexed input, REMatch mymatch, int max) {
if (matchThis(input, mymatch) != null) return max;
else return 0;
}
+ @Override
void dump(CPStringBuilder os) {
os.append('^');
}
Index: gnu/javax/print/ipp/IppRequest.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/print/ipp/IppRequest.java,v
retrieving revision 1.3
diff -u -u -r1.3 IppRequest.java
--- gnu/javax/print/ipp/IppRequest.java 9 Jul 2006 10:21:18 -0000 1.3
+++ gnu/javax/print/ipp/IppRequest.java 1 Sep 2008 14:47:03 -0000
@@ -469,7 +469,7 @@
}
else
{
- new IppException("Unknown target operation attribute combination.");
+ throw new IppException("Unknown target operation attribute
combination.");
}
writeAttributes(attributes);
Index: javax/management/MBeanServerPermission.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/management/MBeanServerPermission.java,v
retrieving revision 1.2
diff -u -u -r1.2 MBeanServerPermission.java
--- javax/management/MBeanServerPermission.java 25 Aug 2008 22:29:17 -0000
1.2
+++ javax/management/MBeanServerPermission.java 1 Sep 2008 14:47:07 -0000
@@ -306,13 +306,14 @@
String cps = cp[b].trim();
if (cps.equals(nps))
found = true;
- if (np.equals("newMBeanServer")
+ if (nps.equals("newMBeanServer")
&& createms != -1)
found = true;
- if (np.equals("createMBeanServer")
+ if (nps.equals("createMBeanServer")
&& newms != -1)
- finalString.replace("newMBeanServer",
- "createMBeanServer");
+ finalString =
+ finalString.replace("newMBeanServer",
+ "createMBeanServer");
}
if (!found)
finalString += "," + nps;
Index: javax/swing/text/html/StyleSheet.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/html/StyleSheet.java,v
retrieving revision 1.27
diff -u -u -r1.27 StyleSheet.java
--- javax/swing/text/html/StyleSheet.java 28 Feb 2008 23:50:12 -0000
1.27
+++ javax/swing/text/html/StyleSheet.java 1 Sep 2008 14:47:11 -0000
@@ -1071,7 +1071,7 @@
*/
public void setBaseFontSize(String size)
{
- size.trim();
+ size = size.trim();
int temp = 0;
try
{
