[#1013] null appended to url path in browse view download links

5 files changed, 22 insertions, 209 deletions

diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index ec7c1d6..f09d811 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,4 +1,4 @@
 package org.irods.jargon.idrop.lite;
 public final class Version {
- public static String VERSION="20121009-1605";
+ public static String VERSION="20121009-2022";
 }
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
index f343c7e..f3dd78c 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/AboutDialog.java
@@ -16,7 +16,12 @@ import javax.swing.KeyStroke;
  */
 public class AboutDialog extends javax.swing.JDialog {
 
-    /** Creates new form AboutDialog */
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 2532724831957628628L;
+
+	/** Creates new form AboutDialog */
     public AboutDialog(final java.awt.Frame parent, final boolean modal) {
         super(parent, modal);
         initComponents();
@@ -28,7 +33,7 @@ public class AboutDialog extends javax.swing.JDialog {
      * WARNING: Do NOT modify this code. The content of this method is always
      * regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
+    
     // <editor-fold defaultstate="collapsed"
 	// desc="Generated Code">//GEN-BEGIN:initComponents
 	private void initComponents() {
@@ -107,7 +112,12 @@ public class AboutDialog extends javax.swing.JDialog {
                 java.awt.event.KeyEvent.VK_ENTER, 0);
         Action enterAction = new AbstractAction() {
 
-            @Override
+            /**
+			 * 
+			 */
+			private static final long serialVersionUID = -2548141664399058996L;
+
+			@Override
             public void actionPerformed(final ActionEvent e) {
                 disposeOfAbout();
             }
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index 422f7aa..77ba72f 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 public class LoginDialog extends JDialog {
 
     private static final long serialVersionUID = 1L;
-    private JDialog parentDialog = null;
     private IDROPCore idropCore = null;
     public static org.slf4j.Logger log = LoggerFactory.getLogger(LoginDialog.class);
 
@@ -37,7 +36,6 @@ public class LoginDialog extends JDialog {
         if (idropCore == null) {
             throw new IllegalArgumentException("null idropCore");
         }
-        this.parentDialog = parentDialog;
         this.idropCore = idropCore;
         initComponents();
 
@@ -198,6 +196,7 @@ public class LoginDialog extends JDialog {
             irodsAccount.setAuthenticationScheme(IRODSAccount.AuthScheme.PAM);
         } 
         
+        
         IRODSFileSystem irodsFileSystem = null;
 
         /*
@@ -257,7 +256,12 @@ public class LoginDialog extends JDialog {
         KeyStroke enter = KeyStroke.getKeyStroke(
                 java.awt.event.KeyEvent.VK_ENTER, 0);
         Action enterAction = new AbstractAction() {
-            @Override
+            /**
+			 * 
+			 */
+			private static final long serialVersionUID = 3468144821565093455L;
+
+			@Override
             public void actionPerformed(final ActionEvent e) {
                 processLogin();
             }
@@ -272,7 +276,7 @@ public class LoginDialog extends JDialog {
      * WARNING: Do NOT modify this code. The content of this method is always
      * regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
+    
     // <editor-fold defaultstate="collapsed"
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IRODSFileService.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IRODSFileService.java
index a9e69c3..db54453 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IRODSFileService.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IRODSFileService.java
@@ -1,6 +1,5 @@
 package org.irods.jargon.idrop.desktop.systraygui.services;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -18,12 +17,8 @@ import org.irods.jargon.core.pub.domain.Collection;
 import org.irods.jargon.core.pub.domain.Resource;
 import org.irods.jargon.core.pub.io.IRODSFile;
 import org.irods.jargon.core.pub.io.IRODSFileFactory;
-import org.irods.jargon.core.query.AVUQueryElement;
-import org.irods.jargon.core.query.AVUQueryOperatorEnum;
 import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry;
-import org.irods.jargon.core.query.JargonQueryException;
 import org.irods.jargon.core.query.MetaDataAndDomainData;
-import org.irods.jargon.core.query.RodsGenQueryEnum;
 import org.irods.jargon.core.rule.IRODSRuleExecResult;
 import org.irods.jargon.idrop.exceptions.IdropException;
 import org.slf4j.LoggerFactory;
@@ -42,12 +37,6 @@ public class IRODSFileService {
     private final IRODSAccount irodsAccount;
     private final IRODSFileSystem irodsFileSystem;
 
-    private IRODSFileService() {
-        irodsAccount = null;
-        irodsFileSystem = null;
-        // not to be invoked, thus private
-    }
-
     public IRODSFileService(final IRODSAccount irodsAccount,
             final IRODSFileSystem irodsFileSystem) throws IdropException {
         if (irodsAccount == null) {
@@ -230,70 +219,6 @@ public class IRODSFileService {
     }
 
     /**
-     * Method will return a listing of collections with a given metadata value,
-     * in this case the marker attribute for the result of a virus scan.
-     * 
-     * @param parentCollectionAbsolutePath
-     *            <code>String</code> with the absolute path to the parent
-     *            collection.
-     * @return <code>List<MetaDataAndDomainData></code> with the results of the
-     *         query.
-     * @throws IdropException
-     */
-    public List<MetaDataAndDomainData> getVirusStatusForParentCollection(
-            final String parentCollectionAbsolutePath) throws IdropException {
-        return getProcessingResultMetadataForCollection(
-                parentCollectionAbsolutePath,
-                "PolicyDrivenService:PolicyProcessingResultAttribute:VirusScan");
-    }
-
-    /**
-     * Method will return a listing of the marker values for a data object for
-     * fixity check status
-     * 
-     * @param parentCollectionAbsolutePath
-     *            <code>String</code> with the absolute path to the parent
-     *            collection.
-     * @return <code>MetaDataAndDomainData</code> with the results of the query
-     *         or null.
-     * @throws IdropException
-     */
-    public MetaDataAndDomainData getFixityStatusForDataObject(
-            final String parentCollectionAbsolutePath,
-            final String dataObjectName) throws IdropException {
-        List<MetaDataAndDomainData> metaDataList = getProcessingResultMetadataForDataObject(
-                parentCollectionAbsolutePath, dataObjectName, "CHECKSUM%");
-        if (metaDataList.size() > 0) {
-            return metaDataList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Method will return a listing of the marker values for a data object for
-     * virus scan status
-     * 
-     * @param parentCollectionAbsolutePath
-     *            <code>String</code> with the absolute path to the parent
-     *            collection.
-     * @return <code>MetaDataAndDomainData</code> with the results of the query
-     *         or null.
-     * @throws IdropException
-     */
-    public MetaDataAndDomainData getVirusStatusForDataObject(
-            final String parentCollectionAbsolutePath,
-            final String dataObjectName) throws IdropException {
-        List<MetaDataAndDomainData> metaDataList = getProcessingResultMetadataForDataObject(
-                parentCollectionAbsolutePath, dataObjectName, "VIRUS_SCAN%");
-        if (metaDataList.size() > 0) {
-            return metaDataList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    /**
      * Get a list of the AVU metadata for the given collection
      * 
      * @param irodsAbsolutePath
@@ -372,131 +297,6 @@ public class IRODSFileService {
     }
 
     /**
-     * Method will return a listing of collections with a given metadata value,
-     * in this case the marker attribute for the result of a fixity check.
-     * 
-     * @param parentCollectionAbsolutePath
-     *            <code>String</code> with the absolute path to the parent
-     *            collection.
-     * @return <code>List<MetaDataAndDomainData></code> with the results of the
-     *         query.
-     * @throws IdropException
-     */
-    public List<MetaDataAndDomainData> getFixityStatusForParentCollection(
-            final String parentCollectionAbsolutePath) throws IdropException {
-        return getProcessingResultMetadataForCollection(
-                parentCollectionAbsolutePath,
-                "PolicyDrivenService:PolicyProcessingResultAttribute:FixityCheck");
-    }
-
-    public List<MetaDataAndDomainData> getProcessingResultMetadataForCollection(
-            final String parentCollectionAbsolutePath,
-            final String markerAttribute) throws IdropException {
-        if (parentCollectionAbsolutePath == null
-                || parentCollectionAbsolutePath.isEmpty()) {
-            throw new IdropException(
-                    "null or empty parentCollectionAbsolutePath");
-        }
-
-        if (markerAttribute == null || markerAttribute.isEmpty()) {
-            throw new IdropException("null or empty markerAttribute");
-        }
-
-        List<AVUQueryElement> queryElements = new ArrayList<AVUQueryElement>();
-        try {
-            queryElements.add(AVUQueryElement.instanceForValueQuery(
-                    AVUQueryElement.AVUQueryPart.ATTRIBUTE,
-                    AVUQueryOperatorEnum.EQUAL, markerAttribute));
-        } catch (JargonQueryException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException(ex);
-        }
-
-        StringBuilder sb = new StringBuilder();
-        sb.append(RodsGenQueryEnum.COL_COLL_NAME.getName());
-        sb.append(" LIKE ");
-        sb.append("'");
-        sb.append(parentCollectionAbsolutePath);
-        sb.append("%");
-        sb.append("'");
-
-        try {
-            final CollectionAO collectionAO = irodsFileSystem.getIRODSAccessObjectFactory().getCollectionAO(irodsAccount);
-            return collectionAO.findMetadataValuesByMetadataQueryWithAdditionalWhere(
-                    queryElements, sb.toString(),0);
-        } catch (JargonException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException("exception processing rule", ex);
-        } catch (JargonQueryException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException("query exception processing rule", ex);
-        } finally {
-            try {
-                irodsFileSystem.close(irodsAccount);
-            } catch (JargonException ex) {
-                Logger.getLogger(IRODSFileService.class.getName()).log(
-                        Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    public List<MetaDataAndDomainData> getProcessingResultMetadataForDataObject(
-            final String parentCollectionAbsolutePath,
-            final String dataObjectName, final String markerAttribute)
-            throws IdropException {
-
-        if (parentCollectionAbsolutePath == null
-                || parentCollectionAbsolutePath.isEmpty()) {
-            throw new IdropException(
-                    "null or empty parentCollectionAbsolutePath");
-        }
-
-        if (dataObjectName == null || dataObjectName.isEmpty()) {
-            throw new IdropException("null or empty dataObjectName");
-        }
-
-        if (markerAttribute == null || markerAttribute.isEmpty()) {
-            throw new IdropException("null or empty markerAttribute");
-        }
-
-        List<AVUQueryElement> queryElements = new ArrayList<AVUQueryElement>();
-        try {
-            queryElements.add(AVUQueryElement.instanceForValueQuery(
-                    AVUQueryElement.AVUQueryPart.ATTRIBUTE,
-                    AVUQueryOperatorEnum.LIKE, markerAttribute));
-        } catch (JargonQueryException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException(ex);
-        }
-
-        try {
-            final DataObjectAO dataObjectAO = irodsFileSystem.getIRODSAccessObjectFactory().getDataObjectAO(irodsAccount);
-            return dataObjectAO.findMetadataValuesForDataObjectUsingAVUQuery(
-                    queryElements, parentCollectionAbsolutePath,
-                    dataObjectName);
-        } catch (JargonException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException("exception processing rule", ex);
-        } catch (JargonQueryException ex) {
-            Logger.getLogger(IRODSFileService.class.getName()).log(
-                    Level.SEVERE, null, ex);
-            throw new IdropException("query exception processing rule", ex);
-        } finally {
-            try {
-                irodsFileSystem.close(irodsAccount);
-            } catch (JargonException ex) {
-                Logger.getLogger(IRODSFileService.class.getName()).log(
-                        Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    /**
      * For a given data object, get a list of the resources for that object
      * 
      * @param irodsCollectionAbsolutePath
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
index 936bbd7..4242ad2 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
@@ -24,7 +24,6 @@ import org.irods.jargon.transfer.engine.ConfigurationService;
 import org.irods.jargon.transfer.engine.synch.ConflictingSynchException;
 import org.irods.jargon.transfer.engine.synch.SynchException;
 import org.irods.jargon.transfer.engine.synch.SynchManagerService;
-import org.openide.util.Exceptions;
 import org.slf4j.LoggerFactory;
 
 /**