+
diff --git a/design/architecture/mkdep.pl b/design/architecture/mkdep.pl
old file mode 100644
new file mode 100755
index 7724235..7724235 100755
diff --git a/etc/MANIFEST-findbugs-annotations.MF b/etc/MANIFEST-findbugs-annotations.MF
index 4213b2b..18c6120 100644
--- a/etc/MANIFEST-findbugs-annotations.MF
+++ b/etc/MANIFEST-findbugs-annotations.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: FindbugsAnnotations
Bundle-SymbolicName: findbugsAnnotations
-Bundle-Version: 2.0.3
+Bundle-Version: 3.0.1
Export-Package: edu.umd.cs.findbugs.annotations,
javax.annotation,
javax.annotation.concurrent,
diff --git a/etc/MANIFEST-findbugs-internal-annotations.MF b/etc/MANIFEST-findbugs-internal-annotations.MF
index 5f9b9a3..c8e6f40 100644
--- a/etc/MANIFEST-findbugs-internal-annotations.MF
+++ b/etc/MANIFEST-findbugs-internal-annotations.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: FindbugsInternalAnnotations
Bundle-SymbolicName: findbugsInternalAnnotations
-Bundle-Version: 2.0.3
+Bundle-Version: 3.0.1
Export-Package: edu.umd.cs.findbugs.annotations
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/etc/MANIFEST-findbugs.MF b/etc/MANIFEST-findbugs.MF
index 9ac9bfc..b29d6f8 100644
--- a/etc/MANIFEST-findbugs.MF
+++ b/etc/MANIFEST-findbugs.MF
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
diff --git a/etc/MANIFEST-findbugsGUI.MF b/etc/MANIFEST-findbugsGUI.MF
index 0837342..cccce16 100644
--- a/etc/MANIFEST-findbugsGUI.MF
+++ b/etc/MANIFEST-findbugsGUI.MF
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
-Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
+Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
diff --git a/etc/bugcollection.xsd b/etc/bugcollection.xsd
index d46c452..b6d665b 100644
--- a/etc/bugcollection.xsd
+++ b/etc/bugcollection.xsd
@@ -1,471 +1,476 @@
-
- This scheme describes the XML format used by FindBugs to store the results
- of analysis.
-
-
-
-
-
-
-
-
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ This scheme describes the XML format used by FindBugs to store the results
+ of analysis.
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Each BugInstance can have a sequence of
- annotations
-
-
-
-
-
-
-
-
-
- This annotation describes a
- class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This annotation describes a
- method
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This annotation describes a local
- variable
-
-
-
-
-
-
-
-
-
-
-
-
-
- This annotation describes a
- field
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Each BugInstance can have a sequence of
+ annotations
+
+
+
+
+
+
+
+
+
+ This annotation describes a
+ class
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This annotation describes a
+ type
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This annotation describes a
+ method
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This annotation describes a local
+ variable
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This annotation describes a
+ field
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ use="optional"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -473,6 +478,7 @@
+
@@ -491,157 +497,169 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/bugrank.txt b/etc/bugrank.txt
index e3a1ccb..690a51c 100644
--- a/etc/bugrank.txt
+++ b/etc/bugrank.txt
@@ -1,5 +1,6 @@
+2 BugPattern SF_SWITCH_NO_DEFAULT
-2 BugPattern RV_RETURN_VALUE_IGNORED
+-3 BugPattern DM_INVALID_MIN_MAX
-4 BugPattern RV_EXCEPTION_NOT_THROWN
-2 BugPattern NP_LOAD_OF_KNOWN_NULL_VALUE
+1 BugPattern EQ_OVERRIDING_EQUALS_NOT_SYMMETRIC
@@ -26,6 +27,7 @@
-6 BugPattern NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT
+5 BugPattern SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING
-4 BugPattern ICAST_BAD_SHIFT_AMOUNT
++5 BugPattern BSHIFT_WRONG_ADD_PRIORITY
-2 BugPattern DMI_INVOKING_HASHCODE_ON_ARRAY
+3 BugPattern UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR
+4 BugPattern VA_FORMAT_STRING_ILLEGAL
@@ -53,8 +55,8 @@
+5 BugPattern SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE
+4 BugPattern RE_BAD_SYNTAX_FOR_REGULAR_EXPRESSION
-2 BugPattern NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE
--3 BugPattern INT_BAD_COMPARISON_WITH_NONNEGATIVE_VALUE
-8 BugPattern LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE
++2 BugPattern RANGE_STRING_INDEX
+2 BugPattern ICAST_INT_CAST_TO_FLOAT_PASSED_TO_ROUND
+2 BugPattern RV_ABSOLUTE_VALUE_OF_HASHCODE
-3 BugPattern RE_POSSIBLE_UNINTENDED_PATTERN
@@ -109,6 +111,9 @@
-2 BugPattern PZ_DONT_REUSE_ENTRY_OBJECTS_IN_ITERATORS
-2 BugPattern DMI_ENTRY_SETS_MAY_REUSE_ENTRY_OBJECTS
+3 BugPattern RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE
++5 BugPattern CAA_COVARIANT_ARRAY_ELEMENT_STORE
+-1 BugPattern UC_USELESS_CONDITION
+-1 BugPattern UC_USELESS_CONDITION_TYPE
-4 BugKind FB
-4 BugKind EC
+1 BugKind RCN
diff --git a/etc/diffBugSummaries b/etc/diffBugSummaries
old file mode 100644
new file mode 100755
index 798fe15..798fe15 100755
diff --git a/etc/doc.properties b/etc/doc.properties
index 6961fb3..ccdf8d7 100644
--- a/etc/doc.properties
+++ b/etc/doc.properties
@@ -6,18 +6,20 @@
| |
\n\
\n\
| Docs and Info |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
\n\
| |
\n\
\n\
@@ -30,15 +32,15 @@
| |
\n\
\n\
| Development |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
- | |
\n\
- |
\n\
- |
\n\
- |
\n\
- |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
+ | |
\n\
\n\
doc.html.footer= \n\
@@ -50,7 +52,7 @@
\n\
Send comments to \n\
\n\
- 
+
doc.html.googleanalytics= \n\