[zhyi~subversion:57] Jar Dependency Walker:

[zhyi@kenai.com]

Project:    zhyi
Repository: subversion
Revision:   57
Author:     zhyi
Date:       2009-12-12 11:53:35 UTC
Link:       

Log Message:
------------
Jar Dependency Walker:
Removed duplications in the summary field.


Revisions:
----------
57


Modified Paths:
---------------
JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.form
JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.java


Diffs:
------
Index: JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.java
===================================================================
--- JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.java     
  (revision 56)
+++ JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.java     
  (revision 57)
@@ -27,6 +27,8 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.Vector;
 import java.util.jar.JarFile;
 import javax.swing.DefaultListModel;
@@ -124,7 +126,7 @@
             }
         });
 
-        updateResult(new Result());
+        updateResult(new Vector<Vector<String>>(), new HashSet<String>());
         resultTableScrollPane.setViewportView(resultTable);
 
         summaryLabel.setText("Summary:");
@@ -228,12 +230,13 @@
 
     private void goButtonActionPerformed(ActionEvent evt) 
{//GEN-FIRST:event_goButtonActionPerformed
         goButton.setEnabled(false);
-        new SwingWorker<Result, Void>() {
+        new SwingWorker<Void, Void>() {
 
+            private Vector<Vector<String>> data = new 
Vector<Vector<String>>();
+            private Set<String> summary = new HashSet<String>();
+
             @Override
-            protected Result doInBackground() throws Exception {
-                Result result = new Result();
-                Vector<Vector<String>> results = new 
Vector<Vector<String>>();
+            protected Void doInBackground() throws Exception {
                 Enumeration<?> e = listModel.elements();
                 while (e.hasMoreElements()) {
                     JarFileWrapper jarWrapper = (JarFileWrapper) 
e.nextElement();
@@ -242,18 +245,18 @@
                     row.add(jarWrapper.toString());
                     String libs = 
jar.getManifest().getMainAttributes().getValue("Class-Path");
                     row.add(libs);
-                    result.data.add(row);
-                    result.summary += (libs + " ");
+                    data.add(row);
+                    for (String lib : libs.split("\\s")) {
+                        summary.add(lib);
+                    }
                 }
-                result.summary = result.summary.substring(
-                        0, result.summary.length() - 1);
-                return result;
+                return null;
             }
 
             @Override
             protected void done() {
                 try {
-                    updateResult(get());
+                    updateResult(data, summary);
                 } catch (Exception ex) {
                     JOptionPane.showMessageDialog(
                             JarDependencyWalkerFrame.this,
@@ -280,8 +283,8 @@
                 "About Jar Dependency Walker", 
JOptionPane.INFORMATION_MESSAGE);
     }//GEN-LAST:event_jButton1ActionPerformed
 
-    private void updateResult(Result result) {
-        resultTable.setModel(new DefaultTableModel(result.data, columnNames) 
{
+    private void updateResult(Vector<Vector<String>> data, Set<String> 
summary) {
+        resultTable.setModel(new DefaultTableModel(data, columnNames) {
 
             @Override
             public boolean isCellEditable(int row, int column) {
@@ -293,7 +296,12 @@
         TableColumnModel columnModel = resultTable.getColumnModel();
         columnModel.getColumn(0).setPreferredWidth(150);
         columnModel.getColumn(1).setPreferredWidth(tableWidth - 150);
-        summaryTextField.setText(result.summary);
+
+        StringBuilder sb = new StringBuilder();
+        for (String s : summary) {
+            sb.append(" " + s);
+        }
+        summaryTextField.setText(sb.length() > 0 ? sb.substring(1) : "");
     }
 
     public static void main(String[] args) {
@@ -326,11 +334,4 @@
     private JTextField summaryTextField;
     // End of variables declaration//GEN-END:variables
 
-    private class Result {
-
-        private Vector<Vector<String>> data = new Vector<Vector<String>>();
-        private String summary = "";
-
-    }
-
 }
Index: JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.form
===================================================================
--- JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.form     
  (revision 56)
+++ JarDependencyWalker/src/com/zhyi/jdw/ui/JarDependencyWalkerFrame.form     
  (revision 57)
@@ -151,7 +151,7 @@
       <SubComponents>
         <Component class="javax.swing.JTable" name="resultTable">
           <AuxValues>
-            <AuxValue name="JavaCodeGenerator_InitCodePre" 
type="java.lang.String" value="updateResult(new Result());"/>
+            <AuxValue name="JavaCodeGenerator_InitCodePre" 
type="java.lang.String" value="updateResult(new 
Vector&lt;Vector&lt;String&gt;&gt;(), new HashSet&lt;String&gt;());"/>
           </AuxValues>
         </Component>
       </SubComponents>