update jaxen from 1.1 beta4 to 1.1.1

add pmd to find problems
fix first errors that was reported by pmd

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@11010 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -787,7 +787,25 @@
             </fileset>
         </copy>
     </target>
-	
+
+    <!-- checkcode.pmd ========================================================================= -->
+    <target name="checkcode.pmd" description="Checkcode with pmd.">
+		<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
+        	<classpath>
+				<pathelement location="${basedir}/build/lib/pmd.jar" />
+				<pathelement location="${basedir}/build/lib/asm.jar" />
+            	<pathelement location="${basedir}/build/lib/merge/jaxen.jar" />
+        	</classpath>
+		</taskdef>
+		<pmd shortFilenames="true">
+			<ruleset>migrating</ruleset>
+			<formatter type="html" toFile="target/pmd_report.html" />
+			<fileset dir="src/">
+				<include name="**/*.java" />
+			</fileset>
+		</pmd>
+    </target>
+
 </project>
 
 

build/lib/versions.txt

@@ -4,6 +4,8 @@ ant-contrib.jar			 			| ?			 	 		| Apache			| http://ant-contrib.sourceforge.net
 i4jruntime.jar			 			| ?			 			| Commercial		| http://www.ej-technologies.com
 jarbundler-1.4.jar		 			| ?			 	 		| GPL				| http://informagen.com/JarBundler/index.html
 pack200task.jar			 			| ?			 	 		| Sun				| https://java-pack200-ant-task.dev.java.net/
+pmd.jar					 			| 4.2.5		 	 		| BSD				| https://pmd.sf.net
+asm.jar					 			| 3.1		 	 		| BSD				| https://pmd.sf.net
 dist/activation.jar					| ? 			 		| Sun				| http://java.sun.com/javase/technologies/desktop/javabeans/jaf/downloads/index.html
 dist/asterisk-im-client.jar			| 1.2.0			 		| GPL				| http://igniterealtime.org/
 dist/dom4j.jar						| ? 			 		| BSD				| http://www.dom4j.org/
@@ -26,6 +28,6 @@ dist/xstream.jar					| ? 			 		| ?					| http://xstream.codehaus.org/
 merge/commons-codec.jar				| 1.3			 		| Apache			| http://commons.apache.org/codec/
 merge/commons-httpclient.jar		| ? 			 		| Apache			| http://hc.apache.org/
 merge/commons-logging.jar			| ? 			 		| Apache			| http://commons.apache.org/logging/
-merge/jaxen.jar						| ? 			 		| ?					| http://jaxen.codehaus.org/
+merge/jaxen.jar						| 1.1.1 		 		| BSD				| http://jaxen.codehaus.org/
 merge/looks.jar						| ? 			 		| BSD				| http://www.jgoodies.com/downloads/libraries.html
 merge/updater.jar					| ? 			 		| ?					| Jive?

src/java/org/jivesoftware/LoginDialog.java

@@ -198,7 +198,8 @@ public final class LoginDialog {
      * Define Login Panel implementation.
      */
     private final class LoginPanel extends JPanel implements KeyListener, ActionListener, FocusListener, CallbackHandler {
-        private final JLabel usernameLabel = new JLabel();
+		private static final long serialVersionUID = 2445523786538863459L;
+		private final JLabel usernameLabel = new JLabel();
         private final JTextField usernameField = new JTextField();
 
         private final JLabel passwordLabel = new JLabel();
@@ -1095,7 +1096,8 @@ public final class LoginDialog {
      * Defines the background to use with the Login panel.
      */
     public class LoginBackgroundPanel extends JPanel {
-        final ImageIcon icons = Default.getImageIcon(Default.LOGIN_DIALOG_BACKGROUND_IMAGE);
+		private static final long serialVersionUID = -2449309600851007447L;
+		final ImageIcon icons = Default.getImageIcon(Default.LOGIN_DIALOG_BACKGROUND_IMAGE);
 
         /**
          * Empty constructor.
@@ -1123,7 +1125,8 @@ public final class LoginDialog {
      */
     public class ImagePanel extends JPanel {
 
-        private final ImageIcon icons = Default.getImageIcon(Default.MAIN_IMAGE);
+		private static final long serialVersionUID = -1778389077647562606L;
+		private final ImageIcon icons = Default.getImageIcon(Default.MAIN_IMAGE);
 
         /**
          * Uses the Spark logo to paint as the background.
@@ -1213,7 +1216,7 @@ public final class LoginDialog {
                 for (Enumeration e2 = record.getAll() ; e2.hasMoreElements() ; ) {
                     String sRecord = (String)e2.nextElement();
                     String [] sRecParts = sRecord.split(" ");
-                    Integer pri = new Integer(sRecParts[0]);
+                    Integer pri = Integer.valueOf(sRecParts[0]);
                     if(priorities.contains(pri)) {
                         List<String> recs = records.get(pri);
                         if(recs == null) recs = new ArrayList<String>();
@@ -1227,7 +1230,7 @@ public final class LoginDialog {
                 }
             }
             Collections.sort(priorities);
-            List l = records.get(priorities.get(0));
+            List<String> l = records.get(priorities.get(0));
             String toprec = (String)l.get(0);
             String [] sRecParts = toprec.split(" ");
             return sRecParts[3];

src/java/org/jivesoftware/sparkimpl/updater/SparkVersion.java

@@ -122,7 +122,7 @@ public class SparkVersion extends IQ {
                         version.setVersion(parser.nextText());
                     }
                     else if (parser.getName().equals("updatedTime")) {
-                        Long time = new Long(parser.nextText());
+                        Long time = Long.valueOf(parser.nextText());
                         version.setUpdateTime(time);
                     }
                     else if (parser.getName().equals("downloadURL")) {