--- findbugs-1.2.1/src/java/edu/umd/cs/findbugs/detect/FindBadCast.java.orig	2007-07-06 06:16:25.000000000 +0200
+++ findbugs-1.2.1/src/java/edu/umd/cs/findbugs/detect/FindBadCast.java	2007-07-06 06:16:47.000000000 +0200
@@ -25,7 +25,7 @@
 import org.apache.bcel.Repository;
 import org.apache.bcel.classfile.*;
 
-public @java.lang.Deprecated class FindBadCast extends BytecodeScanningDetector implements  StatelessDetector {
+public class FindBadCast extends BytecodeScanningDetector implements  StatelessDetector {
 
 
 	private HashSet<String> castTo = new HashSet<String>();
--- findbugs-1.2.1/src/java/edu/umd/cs/findbugs/ml/ConvertToARFF.java.orig	2007-07-06 06:18:49.000000000 +0200
+++ findbugs-1.2.1/src/java/edu/umd/cs/findbugs/ml/ConvertToARFF.java	2007-07-06 06:19:08.000000000 +0200
@@ -587,7 +587,7 @@
 	public void scan(Document document, final String appName) throws MissingNodeException, IOException {
 		List<Element> bugInstanceList = getBugInstanceList(document);
 
-		for (final Element element : bugInstanceList) {
+		for (Element element : bugInstanceList) {
 			scanAttributeList(new AttributeCallback() {
 				public void apply(Attribute attribute) throws MissingNodeException {
 					attribute.scan(element, appName);
--- findbugs-1.2.1/src/java/edu/umd/cs/findbugs/DetectorFactoryCollection.java.orig	2007-07-06 06:15:44.000000000 +0200
+++ findbugs-1.2.1/src/java/edu/umd/cs/findbugs/DetectorFactoryCollection.java	2007-07-06 06:16:00.000000000 +0200
@@ -247,7 +247,7 @@
 		determinePlugins();
 
 		int numLoaded = 0;
-		for (final URL url : pluginList) {
+		for (URL url : pluginList) {
 			try {
 				if (FindBugs.DEBUG) System.out.println("Loading plugin: " + url.toString());
 				PluginLoader pluginLoader =
--- findbugs-1.2.1/src/java5/edu/umd/cs/findbugs/gui2/AboutDialog.java.orig	2007-07-06 06:18:21.000000000 +0200
+++ findbugs-1.2.1/src/java5/edu/umd/cs/findbugs/gui2/AboutDialog.java	2007-07-06 06:18:32.000000000 +0200
@@ -77,7 +77,6 @@
 	 * Process an HTML page to replace certain substitution patterns.
 	 * Right now, we just expand @VERSION@.
 	 */
-	@edu.umd.cs.findbugs.annotations.SuppressWarnings("OS_OPEN_STREAM")
 	private void processPage(javax.swing.JEditorPane pane, String fileName) throws IOException {
 		InputStream in = null;
 		BufferedReader reader = null;
--- findbugs-1.2.1/src/java/edu/umd/cs/findbugs/gui/AboutDialog.java.orig	2007-07-06 06:38:34.000000000 +0200
+++ findbugs-1.2.1/src/java/edu/umd/cs/findbugs/gui/AboutDialog.java	2007-07-06 06:38:42.000000000 +0200
@@ -77,7 +77,6 @@
 	 * Process an HTML page to replace certain substitution patterns.
 	 * Right now, we just expand @VERSION@.
 	 */
-	@edu.umd.cs.findbugs.annotations.SuppressWarnings("OS_OPEN_STREAM")
 	private void processPage(javax.swing.JEditorPane pane, String fileName) throws IOException {
 		InputStream in = null;
 		BufferedReader reader = null;
--- findbugs-1.2.1/src/java/edu/umd/cs/findbugs/ml/ConvertToARFF.java.orig	2007-07-06 06:38:23.000000000 +0200
+++ findbugs-1.2.1/src/java/edu/umd/cs/findbugs/ml/ConvertToARFF.java	2007-07-06 06:38:53.000000000 +0200
@@ -635,7 +635,7 @@
 			throws MissingNodeException, IOException {
 		List<Element> bugInstanceList = getBugInstanceList(document);
 
-		for (final Element element : bugInstanceList) {
+		for (Element element : bugInstanceList) {
 			scanAttributeList(new AttributeCallback() {
 				boolean first = true;