summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java14
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java121
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadDataObj.java53
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadFromURLDialog.java18
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/finder/IRODSFinderDialog.java58
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form421
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java314
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteCore.java13
-rw-r--r--idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties4
-rw-r--r--idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/finder/Bundle.properties1
10 files changed, 635 insertions, 382 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
index dbb656e..9c2b137 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
@@ -229,7 +229,8 @@ public class IRODSTreeTransferHandler extends TransferHandler {
private void processDropOfTreeSelectionModel(final Transferable transferable, final IRODSNode parent,
final DataFlavor dataFlavor) {
- final List<File> sourceFiles = new ArrayList<File>();
+ //final List<File> sourceFiles = new ArrayList<File>();
+ final List<UploadDataObj> sourceFiles = new ArrayList<UploadDataObj>();
CollectionAndDataObjectListingEntry putTarget = (CollectionAndDataObjectListingEntry) parent.getUserObject();
final String targetIrodsFileAbsolutePath;
@@ -247,7 +248,7 @@ public class IRODSTreeTransferHandler extends TransferHandler {
for (TreePath treePath : treePaths) {
LocalFileNode lastPathComponent = (LocalFileNode) treePath.getLastPathComponent();
- sourceFiles.add((File) lastPathComponent.getUserObject());
+ sourceFiles.add(new UploadDataObj((File) lastPathComponent.getUserObject()));
}
} catch (UnsupportedFlavorException ex) {
@@ -271,7 +272,7 @@ public class IRODSTreeTransferHandler extends TransferHandler {
sb.append(targetIrodsFileAbsolutePath);
} else {
sb.append("Would you like to put the file ");
- sb.append(sourceFiles.get(0).getAbsolutePath());
+ sb.append(sourceFiles.get(0).getFile().getAbsolutePath());
sb.append(" to iRODS at ");
sb.append(targetIrodsFileAbsolutePath);
}
@@ -385,6 +386,11 @@ public class IRODSTreeTransferHandler extends TransferHandler {
log.error("no source files in transfer");
throw new IdropRuntimeException("no source files in transfer");
}
+ // copy sourceFiles into ArrayList of UploadDataObjs
+ List<UploadDataObj> uploadData = new ArrayList<UploadDataObj>();
+ for (File file : sourceFiles) {
+ uploadData.add(new UploadDataObj(file));
+ }
StringBuilder sb = new StringBuilder();
@@ -414,7 +420,7 @@ public class IRODSTreeTransferHandler extends TransferHandler {
try {
//currentTransferRunner = new PutTransferRunner(idropGui, targetIrodsFileAbsolutePath,
//sourceFiles, idropGui.getiDropCore().getTransferControlBlock());
- currentTransferRunner = new PutTransferRunner(idropGui, targetIrodsFileAbsolutePath, sourceFiles);
+ currentTransferRunner = new PutTransferRunner(idropGui, targetIrodsFileAbsolutePath, uploadData);
final Thread transferThread = new Thread(currentTransferRunner);
log.info("launching transfer thread");
transferThread.start();
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
index abf7645..4729fff 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/PutTransferRunner.java
@@ -1,9 +1,15 @@
package org.irods.jargon.idrop.lite;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.List;
import org.irods.jargon.core.exception.JargonException;
+import org.irods.jargon.core.packinstr.TransferOptions;
import org.irods.jargon.core.pub.DataTransferOperations;
import org.irods.jargon.core.transfer.DefaultTransferControlBlock;
import org.irods.jargon.core.transfer.TransferControlBlock;
@@ -12,14 +18,15 @@ import org.slf4j.LoggerFactory;
public class PutTransferRunner implements Runnable {
public static org.slf4j.Logger log = LoggerFactory.getLogger(IRODSTreeTransferHandler.class);
- private final List<File> sourceFiles;
+// private final List<File> sourceFiles = null;
+ private final List<UploadDataObj> sourceFiles;
private final String targetIrodsFileAbsolutePath;
private final iDropLiteApplet idropGui;
private TransferControlBlock transferControlBlock;
public PutTransferRunner(final iDropLiteApplet gui,
final String targetPath,
- final List<File> files)
+ final List<UploadDataObj> files)
throws JargonException {
if (files == null) {
@@ -42,42 +49,88 @@ public class PutTransferRunner implements Runnable {
@Override
public void run() {
- for (File transferFile : sourceFiles) {
- log.info("process a put from source: {}", transferFile.getAbsolutePath());
+ //for (File transferFile : sourceFiles) {
+ for (UploadDataObj uploadData : sourceFiles) {
+ if(uploadData.isURL) { // this is an import from URL
+
+ log.info("process a put from an url: {}", uploadData.getFileName());
+
+ // handle overall cancel if requested by client
+ if(idropGui.isTransferCancelled()) {
+ log.info("put transfer cancelled by client");
+ idropGui.setTransferCancelled(false);
+ break;
+ }
+
+ String localSourceAbsolutePath = uploadData.getFileName();
+ String sourceResource = idropGui.getIrodsAccount().getDefaultStorageResource();
+
+ // need to create new Transfer Control Block for each transfer since it needs to be reset
+ // on how many files there are to transfer and how many have been transferred so far
+ TransferControlBlock tcb = null;;
+ try {
+ tcb = DefaultTransferControlBlock.instance();
+ TransferOptions transferOptions = idropGui.getiDropCore().getIrodsFileSystem().getIrodsSession().buildTransferOptionsBasedOnJargonProperties();
+ transferOptions.setIntraFileStatusCallbacks(true);
+ tcb.setTransferOptions(transferOptions);
+ idropGui.getiDropCore().setTransferControlBlock(tcb);
+ this.transferControlBlock = tcb;
+ } catch (JargonException ex) {
+ java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
+ java.util.logging.Level.SEVERE, null, ex);
+ idropGui.showIdropException(ex);
+ }
+ log.info("initiating put transfer");
+ try {
+ idropGui.getiDropCore().getTransferManager().putOperationURL(localSourceAbsolutePath,
+ targetIrodsFileAbsolutePath, sourceResource, idropGui, tcb);
+ } catch (JargonException ex) {
+ java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
+ java.util.logging.Level.SEVERE, null, ex);
+ idropGui.showIdropException(ex);
+ } finally {
+ idropGui.getiDropCore().getIrodsFileSystem().closeAndEatExceptions();
+ }
+ }
+ else { // this is just a regular local file or folder
+
+ log.info("process a put from source: {}", uploadData.getFile().getAbsolutePath());
- // handle overall cancel if requested by client
- if(idropGui.isTransferCancelled()) {
- log.info("put transfer cancelled by client");
- idropGui.setTransferCancelled(false);
- break;
- }
+ // handle overall cancel if requested by client
+ if(idropGui.isTransferCancelled()) {
+ log.info("put transfer cancelled by client");
+ idropGui.setTransferCancelled(false);
+ break;
+ }
- String localSourceAbsolutePath = transferFile.getAbsolutePath();
- String sourceResource = idropGui.getIrodsAccount().getDefaultStorageResource();
+ //String localSourceAbsolutePath = transferFile.getAbsolutePath();
+ String localSourceAbsolutePath = uploadData.getFile().getAbsolutePath();
+ String sourceResource = idropGui.getIrodsAccount().getDefaultStorageResource();
- // need to create new Transfer Control Block for each transfer since it needs to be reset
- // on how many files there are to transfer and how many have been transferred so far
- TransferControlBlock tcb = null;;
- try {
- tcb = DefaultTransferControlBlock.instance();
- idropGui.getiDropCore().setTransferControlBlock(tcb);
- this.transferControlBlock = tcb;
- } catch (JargonException ex) {
- java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
- java.util.logging.Level.SEVERE, null, ex);
- idropGui.showIdropException(ex);
- }
- log.info("initiating put transfer");
- try {
- idropGui.getiDropCore().getTransferManager().putOperation(localSourceAbsolutePath,
+ // need to create new Transfer Control Block for each transfer since it needs to be reset
+ // on how many files there are to transfer and how many have been transferred so far
+ TransferControlBlock tcb = null;;
+ try {
+ tcb = DefaultTransferControlBlock.instance();
+ idropGui.getiDropCore().setTransferControlBlock(tcb);
+ this.transferControlBlock = tcb;
+ } catch (JargonException ex) {
+ java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
+ java.util.logging.Level.SEVERE, null, ex);
+ idropGui.showIdropException(ex);
+ }
+ log.info("initiating put transfer");
+ try {
+ idropGui.getiDropCore().getTransferManager().putOperation(localSourceAbsolutePath,
targetIrodsFileAbsolutePath, sourceResource, idropGui, transferControlBlock);
- } catch (JargonException ex) {
- java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
- java.util.logging.Level.SEVERE, null, ex);
- idropGui.showIdropException(ex);
- } finally {
- idropGui.getiDropCore().getIrodsFileSystem().closeAndEatExceptions();
- }
+ } catch (JargonException ex) {
+ java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
+ java.util.logging.Level.SEVERE, null, ex);
+ idropGui.showIdropException(ex);
+ } finally {
+ idropGui.getiDropCore().getIrodsFileSystem().closeAndEatExceptions();
+ }
+ }
}
}
}
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadDataObj.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadDataObj.java
new file mode 100644
index 0000000..dfe6a79
--- /dev/null
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadDataObj.java
@@ -0,0 +1,53 @@
+package org.irods.jargon.idrop.lite;
+
+import java.io.File;
+
+public class UploadDataObj {
+
+ private File sourceFile = null;
+ private String sourceFileName = null;
+ Boolean isURL = false;
+
+ public UploadDataObj(File file) {
+ this.sourceFile = file;
+ }
+
+ public UploadDataObj(File file, Boolean isURL) {
+ this.sourceFile = file;
+ this.isURL = isURL;
+ }
+
+ public UploadDataObj(String file) {
+ this.sourceFileName = file;
+ }
+
+ public UploadDataObj(String file, Boolean isURL) {
+ this.sourceFileName = file;
+ this.isURL = isURL;
+ }
+
+ public void setFile(File file) {
+ this.sourceFile = file;
+ }
+
+ public File getFile() {
+ return this.sourceFile;
+ }
+
+ public void setFileName(String name) {
+ this.sourceFileName = name;
+ }
+
+ public String getFileName() {
+ return this.sourceFileName;
+ }
+
+ public Boolean isURL() {
+ return this.isURL;
+ }
+
+ public void isURL(Boolean flag) {
+ this.isURL = flag;
+ }
+
+}
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadFromURLDialog.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadFromURLDialog.java
index 65e1565..7ae748f 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadFromURLDialog.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/UploadFromURLDialog.java
@@ -34,7 +34,7 @@ public class UploadFromURLDialog extends javax.swing.JDialog {
/** Creates new form UploadFromURLDialog */
public UploadFromURLDialog(final iDropLiteApplet parent, final boolean modal) {
//super(parent, modal);
- super((Frame)null, modal);
+ super(parent.getiDropCore().findAppletParentFrame(parent), modal);
initComponents();
Border empty_border = BorderFactory.createEmptyBorder (0,10,0,10);
jPanel1.setBorder(empty_border);
@@ -174,11 +174,19 @@ public class UploadFromURLDialog extends javax.swing.JDialog {
connection = url.openConnection();
fileSize = connection.getContentLength();
} catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ idropApplet.showMessageFromOperation("Please enter a valid URL");
+ return;
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ idropApplet.showMessageFromOperation("Please enter a valid URL");
+ return;
+ } catch (NullPointerException e) {
+ idropApplet.showMessageFromOperation("Please enter a valid URL");
+ return;
+ }
+
+ if(fileSize <= 0) {
+ idropApplet.showMessageFromOperation("Please enter a valid URL file for download");
+ return;
}
DefaultTableModel tm = idropApplet.getiDropCore().getUploadTableModel();
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/finder/IRODSFinderDialog.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/finder/IRODSFinderDialog.java
index c3de81c..8f3a208 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/finder/IRODSFinderDialog.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/finder/IRODSFinderDialog.java
@@ -1,5 +1,7 @@
package org.irods.jargon.idrop.lite.finder;
+import java.awt.Dimension;
+
import javax.swing.ListSelectionModel;
import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry;
import org.irods.jargon.idrop.lite.IdropRuntimeException;
@@ -41,6 +43,7 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
throw new IllegalArgumentException("null idropCore");
}
+ this.setTitle("Import Location");
this.idropCore = idropCore;
initComponents();
buildTargetTree();
@@ -122,8 +125,6 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
-
- topPanel = new javax.swing.JPanel();
treePanel = new javax.swing.JPanel();
pnlIrodsTreeToolbar = new javax.swing.JPanel();
btnRefreshTargetTree = new javax.swing.JButton();
@@ -132,22 +133,16 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
bottomPanel = new javax.swing.JPanel();
btnCancel = new javax.swing.JButton();
btnSelectFolder = new javax.swing.JButton();
+ lblInstruct = new javax.swing.JLabel();
+ westPanel = new javax.swing.JPanel();
+ eastPanel = new javax.swing.JPanel();
+
+ bottomPanel.setMinimumSize(new Dimension(100,40));
+ bottomPanel.setPreferredSize(new Dimension(100,40));
+ bottomPanel.setLayout(new java.awt.BorderLayout());
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- setModal(true);
-
- org.jdesktop.layout.GroupLayout topPanelLayout = new org.jdesktop.layout.GroupLayout(topPanel);
- topPanel.setLayout(topPanelLayout);
- topPanelLayout.setHorizontalGroup(
- topPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 593, Short.MAX_VALUE)
- );
- topPanelLayout.setVerticalGroup(
- topPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 484, Short.MAX_VALUE)
- );
-
- getContentPane().add(topPanel, java.awt.BorderLayout.CENTER);
+ setModal(true);;
treePanel.setLayout(new java.awt.BorderLayout());
@@ -162,7 +157,14 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
btnRefreshTargetTreeActionPerformed(evt);
}
});
- pnlIrodsTreeToolbar.add(btnRefreshTargetTree);
+
+ pnlIrodsTreeToolbar.setMinimumSize(new Dimension(100, 30));
+ pnlIrodsTreeToolbar.setPreferredSize(new Dimension(100, 30));
+ pnlIrodsTreeToolbar.setBorder(javax.swing.BorderFactory.createEmptyBorder(4, 4, 4, 0));
+ pnlIrodsTreeToolbar.setLayout(new java.awt.BorderLayout());
+ lblInstruct.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.lblInstruct.text")); // NOI18N
+ pnlIrodsTreeToolbar.add(lblInstruct, java.awt.BorderLayout.WEST);
+ //pnlIrodsTreeToolbar.add(btnRefreshTargetTree);
treePanel.add(pnlIrodsTreeToolbar, java.awt.BorderLayout.NORTH);
@@ -174,8 +176,11 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
treePanel.add(pnlIrodsTreeMaster, java.awt.BorderLayout.CENTER);
- getContentPane().add(treePanel, java.awt.BorderLayout.PAGE_START);
+ getContentPane().add(treePanel, java.awt.BorderLayout.CENTER);
+ westPanel.setPreferredSize(new Dimension(100,40));
+ westPanel.add(btnRefreshTargetTree);
+
btnCancel.setMnemonic('c');
btnCancel.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.btnCancel.text")); // NOI18N
btnCancel.addActionListener(new java.awt.event.ActionListener() {
@@ -183,7 +188,8 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
btnCancelActionPerformed(evt);
}
});
- bottomPanel.add(btnCancel);
+ eastPanel.setPreferredSize(new Dimension(200,40));
+ eastPanel.add(btnCancel);
btnSelectFolder.setMnemonic('s');
btnSelectFolder.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.btnSelectFolder.text")); // NOI18N
@@ -192,9 +198,12 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
btnSelectFolderActionPerformed(evt);
}
});
- bottomPanel.add(btnSelectFolder);
+ eastPanel.add(btnSelectFolder);
+
+ bottomPanel.add(westPanel, java.awt.BorderLayout.WEST);
+ bottomPanel.add(eastPanel, java.awt.BorderLayout.EAST);
- getContentPane().add(bottomPanel, java.awt.BorderLayout.PAGE_END);
+ getContentPane().add(bottomPanel, java.awt.BorderLayout.SOUTH);
pack();
}// </editor-fold>//GEN-END:initComponents
@@ -232,7 +241,8 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
return;
}
- this.selectedAbsolutePath = entry.getFormattedAbsolutePath();
+ this.selectedAbsolutePath = entry.getPathOrName();
+ //this.selectedAbsolutePath = entry.getFormattedAbsolutePath();
this.setVisible(false);
}//GEN-LAST:event_btnSelectFolderActionPerformed
@@ -245,8 +255,10 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
private javax.swing.JPanel pnlIrodsTreeMaster;
private javax.swing.JPanel pnlIrodsTreeToolbar;
private javax.swing.JScrollPane scrollIrodsTree;
- private javax.swing.JPanel topPanel;
private javax.swing.JPanel treePanel;
+ private javax.swing.JLabel lblInstruct;
+ private javax.swing.JPanel westPanel;
+ private javax.swing.JPanel eastPanel;
// End of variables declaration//GEN-END:variables
}
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form
index b939d50..f24a687 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form
@@ -19,12 +19,17 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-62,0,0,2,-68"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-74,0,0,2,-72"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="pnllSeems2BneededForCorrectResizing">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[720, 450]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -158,7 +163,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="396" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="392" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -391,12 +396,12 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tabIrodsViews" alignment="0" pref="379" max="32767" attributes="0"/>
+ <Component id="tabIrodsViews" alignment="0" pref="375" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="tabIrodsViews" alignment="0" pref="323" max="32767" attributes="0"/>
+ <Component id="tabIrodsViews" alignment="0" pref="311" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
@@ -475,7 +480,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="83" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="187" max="32767" attributes="0"/>
+ <EmptySpace pref="183" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -484,7 +489,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="84" max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="180" max="32767" attributes="0"/>
+ <EmptySpace pref="168" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -1008,7 +1013,7 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="298" max="32767" attributes="0"/>
+ <EmptySpace min="0" pref="296" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -1040,6 +1045,31 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
</Container>
+ <Container class="javax.swing.JPanel" name="jPanel5">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[283, 40]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="South"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="296" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="40" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ </Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlUploadCenterTools">
@@ -1134,7 +1164,7 @@
<Component class="javax.swing.JButton" name="btnUploadCancel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Lucida Grande" size="10" style="0"/>
+ <Font name="Lucida Grande" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -1324,6 +1354,149 @@
</Component>
</SubComponents>
</Container>
+ <Container class="javax.swing.JPanel" name="jPanel14">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[320, 40]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="Last"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+ <SubComponents>
+ <Container class="javax.swing.JPanel" name="pnlUploadToolStatus">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+ <EmptyBorder bottom="0" left="0" right="0" top="3"/>
+ </Border>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[210, 40]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[210, 40]"/>
+ </Property>
+ <Property name="requestFocusEnabled" type="boolean" value="false"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="West"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblUploadTotalFiles">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Lucida Grande" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.lblUploadTotalFiles.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="North"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblUploadTotalSize">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Lucida Grande" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.lblUploadTotalSize.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+ <EmptyBorder bottom="3" left="0" right="0" top="0"/>
+ </Border>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="South"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="jPanel17">
+ <Properties>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 40]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[106, 40]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="East"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="106" max="32767" attributes="0"/>
+ <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ <Component id="btnUploadBeginImport" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="40" max="32767" attributes="0"/>
+ <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace min="0" pref="5" max="32767" attributes="0"/>
+ <Component id="btnUploadBeginImport" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="0" pref="6" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JButton" name="btnUploadBeginImport">
+ <Properties>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+ <Font name="Lucida Grande" size="12" style="0"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadBeginImport.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[115, 29]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[115, 29]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[106, 29]"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadBeginImportActionPerformed"/>
+ </Events>
+ </Component>
+ </SubComponents>
+ </Container>
+ </SubComponents>
+ </Container>
</SubComponents>
</Container>
</SubComponents>
@@ -1337,7 +1510,7 @@
<Dimension value="[250, 30]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 40]"/>
+ <Dimension value="[700, 2]"/>
</Property>
</Properties>
<Constraints>
@@ -1348,123 +1521,23 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel14">
+ <Container class="javax.swing.JPanel" name="jPanel7">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[215, 0]"/>
+ <Dimension value="[0, 0]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[275, 40]"/>
+ <Dimension value="[310, 40]"/>
</Property>
- <Property name="requestFocusEnabled" type="boolean" value="false"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="2.2" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
- <Property name="columns" type="int" value="1"/>
- <Property name="rows" type="int" value="2"/>
- </Layout>
- </Container>
- <Container class="javax.swing.JPanel" name="pnlUploadToolStatus">
- <Properties>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[175, 32]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[175, 34]"/>
- </Property>
- <Property name="requestFocusEnabled" type="boolean" value="false"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.7" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.6" weightY="0.2"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="lblUploadTotalFiles">
- <Properties>
- <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Lucida Grande" size="12" style="0"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.lblUploadTotalFiles.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="North"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="lblUploadTotalSize">
- <Properties>
- <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Lucida Grande" size="12" style="0"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.lblUploadTotalSize.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="South"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
</Container>
- <Component class="javax.swing.JButton" name="btnUploadBeginImport">
- <Properties>
- <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Lucida Grande" size="12" style="0"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnUploadBeginImport.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[115, 29]"/>
- </Property>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[115, 29]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[115, 29]"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUploadBeginImportActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.5" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="btnOverallUploadCancel">
- <Properties>
- <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
- <Font name="Lucida Grande" size="12" style="0"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.btnOverallUploadCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnOverallUploadCancelActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="3" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
</SubComponents>
</Container>
</SubComponents>
@@ -1668,8 +1741,13 @@
<SubComponents>
<Container class="javax.swing.JPanel" name="pnlIdropWebModeDownloadTarget">
<Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+ <EmptyBorder bottom="2" left="2" right="2" top="2"/>
+ </Border>
+ </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 35]"/>
+ <Dimension value="[700, 40]"/>
</Property>
</Properties>
<Constraints>
@@ -1710,6 +1788,11 @@
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel6">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 60]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -1718,7 +1801,45 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel15">
+ <Container class="javax.swing.JPanel" name="jPanel16">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 24]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="North"/>
+ </Constraint>
+ </Constraints>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="686" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <EmptySpace min="0" pref="24" max="32767" attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlIdropWebModeProgressBar">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+ <EmptyBorder bottom="10" left="15" right="15" top="0"/>
+ </Border>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[40, 24]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[700, 24]"/>
+ </Property>
+ </Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
@@ -1727,37 +1848,9 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel16">
- <Properties>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 10]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="First"/>
- </Constraint>
- </Constraints>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="690" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="10" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- </Layout>
- </Container>
- <Component class="javax.swing.JLabel" name="jLabel1">
+ <Component class="javax.swing.JProgressBar" name="pbIdropWebModeDownloadProgress">
<Properties>
- <Property name="horizontalAlignment" type="int" value="0"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/lite/Bundle.properties" key="iDropLiteApplet.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
+ <Property name="stringPainted" type="boolean" value="true"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
@@ -1765,45 +1858,19 @@
</Constraint>
</Constraints>
</Component>
- <Container class="javax.swing.JPanel" name="pnlIdropWebModeProgressBar">
- <Properties>
- <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
- <EmptyBorder bottom="0" left="20" right="20" top="0"/>
- </Border>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 75]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="South"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Component class="javax.swing.JProgressBar" name="pbIdropWebModeDownloadProgress">
- <Properties>
- <Property name="stringPainted" type="boolean" value="true"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlIdropWebModeBeginDownload">
<Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+ <EmptyBorder bottom="3" left="3" right="3" top="3"/>
+ </Border>
+ </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[700, 35]"/>
+ <Dimension value="[700, 40]"/>
</Property>
</Properties>
<Constraints>
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
index 2a057cf..be2c352 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
@@ -193,7 +193,9 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
} catch (JargonException e1) {
Logger.getLogger(iDropLiteApplet.class.getName()).log(Level.SEVERE, null, e1);
}
- dataCache.setIrodsAccount(irodsAccount);
+ log.info("creating temporary irods account...");
+ IRODSAccount tmpAccount = new IRODSAccount(host, port, user, tempPswd, absPath, zone, defaultStorageResource);
+ dataCache.setIrodsAccount(tmpAccount);
try {
log.info("sending user name and key user:{}", user);
@@ -224,12 +226,15 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
switch (this.mode) {
case 1:
- log.info("processLogin: retrieving permanent password...");
- if (!retrievePermAccount()) {
- showMessageFromOperation("Temporary Password Mode: login error - unable to log in, or invalid user id");
- return false;
- }
- break;
+ showMessageFromOperation("Connection mode - 1 is not currently supported. Please configure another connection mode.");
+ return false;
+// Disable mode 1 for now
+// log.info("processLogin: retrieving permanent password...");
+// if (!retrievePermAccount()) {
+// showMessageFromOperation("Temporary Password Mode: login error - unable to log in, or invalid user id");
+// return false;
+// }
+// break;
case 0:
log.info("processLogin: creating account with provided permanent password...");
if (!createPermAccount()) {
@@ -293,12 +298,12 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
log.info("initiating startup sequence...");
-// log.info("creating irods file system instance...");
-// try {
-// irodsFileSystem = IRODSFileSystem.instance();
-// } catch (JargonException ex) {
-// Logger.getLogger(iDropLiteApplet.class.getName()).log(Level.SEVERE, null, ex);
-// }
+ log.info("creating irods file system instance...");
+ try {
+ irodsFileSystem = IRODSFileSystem.instance();
+ } catch (JargonException ex) {
+ Logger.getLogger(iDropLiteApplet.class.getName()).log(Level.SEVERE, null, ex);
+ }
//
// log.info("creating temporary irods account...");
// this.irodsAccount = new IRODSAccount(host, port, user, tempPswd, absPath, zone, defaultStorageResource);
@@ -359,6 +364,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
break;
default:
log.info(">>>>>>>>> no display mode, show local/rods display mode 1");
+ this.displayMode = 1;
cl.show(testCardPanel, "card2");
}
@@ -566,6 +572,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
return;
} else if (roots.size() == 1) {
scrollLocalDrives.setVisible(false);
+ pnlLocalRoots.setPreferredSize(new java.awt.Dimension(295, 39));
localFileModel = new LocalFileSystemModel(new LocalFileNode(
new File(roots.get(0))));
@@ -616,6 +623,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
return;
} else if (roots.size() == 1) {
scrollUploadLocalDrives.setVisible(false);
+ pnlUploadRoots.setPreferredSize(new java.awt.Dimension(295, 34));
localUploadFileModel = new LocalFileSystemModel(new LocalFileNode(
new File(roots.get(0))));
@@ -707,7 +715,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
@Override
public void run() {
- JOptionPane.showMessageDialog(thisIdropGui, messageFromOperation, "iDROP Message",
+ JOptionPane.showMessageDialog(iDropCore.findAppletParentFrame(thisIdropGui), messageFromOperation, "iDROP Message",
JOptionPane.INFORMATION_MESSAGE);
}
});
@@ -841,7 +849,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
if (ts.getTransferType() == TransferStatus.TransferType.SYNCH || ts.getTransferType() == TransferStatus.TransferType.REPLICATE) {
log.info("no need to notify tree for synch or replicate");
} else if (ts.getTransferType() == TransferStatus.TransferType.GET
- && ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION) {
+ && ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION
+ && idropGui.displayMode == 1) {
try {
((LocalFileSystemModel) idropGui.getFileTree().getModel()).notifyCompletionOfOperation(idropGui.getFileTree(), ts);
@@ -852,8 +861,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
} else if (ts.getTransferType() == TransferStatus.TransferType.COPY || ts.getTransferType() == TransferStatus.TransferType.PUT) {
if (ts.getTransferZone().equals(
iDropCore.getIrodsAccount().getZone()) && ts.getTransferHost().equals(iDropCore.getIrodsAccount().getHost())) {
- // don't do this for mode 3 (shopping cart mode)
- if(idropGui.displayMode != 3) {
+ // only do this for displayMode 1 - local and irods trees
+ if(idropGui.displayMode == 1) {
try {
// should leave PUT, and COPY
final IRODSOutlineModel irodsTreeModel = (IRODSOutlineModel) idropGui.irodsTree.getModel();
@@ -887,6 +896,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pbIdropWebModeDownloadProgress.setMinimum(0);
pbIdropWebModeDownloadProgress.setMaximum(ts.getTotalFilesToTransfer());
pbIdropWebModeDownloadProgress.setValue(0);
+
+ if ((tableRow >= 0)) {
+ TransferProgressInfo tpi = new TransferProgressInfo();
+ tblUploadTable1.getModel().setValueAt(tpi, tableRow, 2);
+ }
currentUploadFile = ts.getSourceFileAbsolutePath();
enableUploadButtons(false);
@@ -956,6 +970,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
return this.transferInProgress;
}
+ // these may not be needed any more because the overall cancel
+ // feature was removed by iPlant
public void setTransferCancelled(Boolean state) {
this.transferCancelled = state;
}
@@ -973,6 +989,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
}
});
}
+ // not needed? end
private final String abbreviateFileName(final String fileName) {
@@ -1124,7 +1141,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
}
private void collectDownloadTarget() {
- int ret = dlgLocalFileChooser.showOpenDialog(this.applet);
+ int ret = dlgLocalFileChooser.showOpenDialog(iDropCore.findAppletParentFrame(this));
//int ret = dlgLocalFileChooser.showSaveDialog(this.applet); // update this so you can create a folder???
if (ret == JFileChooser.APPROVE_OPTION) {
File path = dlgLocalFileChooser.getSelectedFile();
@@ -1176,6 +1193,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
} catch (JargonException e) {
log.error("could not create shopping cart");
Logger.getLogger(iDropLiteApplet.class.getName()).log(Level.SEVERE, null, e);
+ showMessageFromOperation("Cannot retrieve files from shopping cart");
}
if(cart.hasItems()) {
@@ -1407,6 +1425,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
btnUploadLocalRefresh = new javax.swing.JButton();
pnlUploadLocalDrivesFiller = new javax.swing.JPanel();
scrollUploadLocalTree = new javax.swing.JScrollPane();
+ jPanel5 = new javax.swing.JPanel();
pnlUploadCenterTools = new javax.swing.JPanel();
jPanel11 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel();
@@ -1421,13 +1440,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
jLabel8 = new javax.swing.JLabel();
btnBrowseIRODSUploadDest = new javax.swing.JButton();
txtIRODSUploadDest = new javax.swing.JTextField();
- pnlUploadToolbar = new javax.swing.JPanel();
jPanel14 = new javax.swing.JPanel();
pnlUploadToolStatus = new javax.swing.JPanel();
lblUploadTotalFiles = new javax.swing.JLabel();
lblUploadTotalSize = new javax.swing.JLabel();
+ jPanel17 = new javax.swing.JPanel();
btnUploadBeginImport = new javax.swing.JButton();
- btnOverallUploadCancel = new javax.swing.JButton();
+ pnlUploadToolbar = new javax.swing.JPanel();
+ jPanel7 = new javax.swing.JPanel();
pnlOperationMode3 = new javax.swing.JPanel();
pnlDownloadModeTarget = new javax.swing.JPanel();
jPanel1 = new javax.swing.JPanel();
@@ -1445,9 +1465,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
txtIdropWebModeDownloadTarget = new javax.swing.JTextField();
btnIdropWebModeTargetBrowse = new javax.swing.JButton();
jPanel6 = new javax.swing.JPanel();
- jPanel15 = new javax.swing.JPanel();
jPanel16 = new javax.swing.JPanel();
- jLabel1 = new javax.swing.JLabel();
pnlIdropWebModeProgressBar = new javax.swing.JPanel();
pbIdropWebModeDownloadProgress = new javax.swing.JProgressBar();
pnlIdropWebModeBeginDownload = new javax.swing.JPanel();
@@ -1456,6 +1474,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
setMinimumSize(new java.awt.Dimension(250, 200));
setPreferredSize(new java.awt.Dimension(700, 450));
+ pnllSeems2BneededForCorrectResizing.setPreferredSize(new java.awt.Dimension(720, 450));
pnllSeems2BneededForCorrectResizing.setLayout(new java.awt.GridLayout(1, 1));
testCardPanel.setLayout(new java.awt.CardLayout());
@@ -1507,7 +1526,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlSearchSizer.setLayout(pnlSearchSizerLayout);
pnlSearchSizerLayout.setHorizontalGroup(
pnlSearchSizerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 396, Short.MAX_VALUE)
+ .add(0, 392, Short.MAX_VALUE)
);
pnlSearchSizerLayout.setVerticalGroup(
pnlSearchSizerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1627,14 +1646,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
.add(pnlIrodsSearchLayout.createSequentialGroup()
.add(83, 83, 83)
.add(jLabel5)
- .addContainerGap(187, Short.MAX_VALUE))
+ .addContainerGap(183, Short.MAX_VALUE))
);
pnlIrodsSearchLayout.setVerticalGroup(
pnlIrodsSearchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(pnlIrodsSearchLayout.createSequentialGroup()
.add(84, 84, 84)
.add(jLabel5)
- .addContainerGap(180, Short.MAX_VALUE))
+ .addContainerGap(168, Short.MAX_VALUE))
);
tabIrodsViews.addTab(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.pnlIrodsSearch.TabConstraints.tabTitle"), pnlIrodsSearch); // NOI18N
@@ -1643,11 +1662,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIrodsTree.setLayout(pnlIrodsTreeLayout);
pnlIrodsTreeLayout.setHorizontalGroup(
pnlIrodsTreeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 379, Short.MAX_VALUE)
+ .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 375, Short.MAX_VALUE)
);
pnlIrodsTreeLayout.setVerticalGroup(
pnlIrodsTreeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 323, Short.MAX_VALUE)
+ .add(tabIrodsViews, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 311, Short.MAX_VALUE)
);
pnlSplitPaneLocalRemote.setRightComponent(pnlIrodsTree);
@@ -1871,7 +1890,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadLocalDrivesFiller.setLayout(pnlUploadLocalDrivesFillerLayout);
pnlUploadLocalDrivesFillerLayout.setHorizontalGroup(
pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 298, Short.MAX_VALUE)
+ .add(0, 296, Short.MAX_VALUE)
);
pnlUploadLocalDrivesFillerLayout.setVerticalGroup(
pnlUploadLocalDrivesFillerLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1887,6 +1906,21 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
scrollUploadLocalTree.setPreferredSize(new java.awt.Dimension(283, 400));
pnlUploadLocalTree.add(scrollUploadLocalTree, java.awt.BorderLayout.CENTER);
+ jPanel5.setPreferredSize(new java.awt.Dimension(283, 40));
+
+ org.jdesktop.layout.GroupLayout jPanel5Layout = new org.jdesktop.layout.GroupLayout(jPanel5);
+ jPanel5.setLayout(jPanel5Layout);
+ jPanel5Layout.setHorizontalGroup(
+ jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 296, Short.MAX_VALUE)
+ );
+ jPanel5Layout.setVerticalGroup(
+ jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 40, Short.MAX_VALUE)
+ );
+
+ pnlUploadLocalTree.add(jPanel5, java.awt.BorderLayout.SOUTH);
+
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
@@ -1939,7 +1973,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
});
jPanel12.add(btnUploadMove);
- btnUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 10));
+ btnUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 12));
btnUploadCancel.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadCancel.text")); // NOI18N
btnUploadCancel.setMinimumSize(new java.awt.Dimension(50, 40));
btnUploadCancel.setPreferredSize(new java.awt.Dimension(80, 40));
@@ -2060,36 +2094,12 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlUploadTable.add(pnlIRODSUploadDest, java.awt.BorderLayout.PAGE_START);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 1.6;
- gridBagConstraints.weighty = 0.2;
- pnlUploadTrees.add(pnlUploadTable, gridBagConstraints);
-
- pnlOperationMode2.add(pnlUploadTrees, java.awt.BorderLayout.CENTER);
-
- pnlUploadToolbar.setMaximumSize(new java.awt.Dimension(32767, 60));
- pnlUploadToolbar.setMinimumSize(new java.awt.Dimension(250, 30));
- pnlUploadToolbar.setPreferredSize(new java.awt.Dimension(700, 40));
- pnlUploadToolbar.setLayout(new java.awt.GridBagLayout());
-
- jPanel14.setMinimumSize(new java.awt.Dimension(215, 0));
- jPanel14.setPreferredSize(new java.awt.Dimension(275, 40));
- jPanel14.setRequestFocusEnabled(false);
- jPanel14.setLayout(new java.awt.GridLayout(2, 1));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 2.2;
- pnlUploadToolbar.add(jPanel14, gridBagConstraints);
+ jPanel14.setPreferredSize(new java.awt.Dimension(320, 40));
+ jPanel14.setLayout(new java.awt.BorderLayout());
- pnlUploadToolStatus.setMinimumSize(new java.awt.Dimension(175, 32));
- pnlUploadToolStatus.setPreferredSize(new java.awt.Dimension(175, 34));
+ pnlUploadToolStatus.setBorder(javax.swing.BorderFactory.createEmptyBorder(3, 0, 0, 0));
+ pnlUploadToolStatus.setMinimumSize(new java.awt.Dimension(210, 40));
+ pnlUploadToolStatus.setPreferredSize(new java.awt.Dimension(210, 40));
pnlUploadToolStatus.setRequestFocusEnabled(false);
pnlUploadToolStatus.setLayout(new java.awt.BorderLayout());
@@ -2099,46 +2109,78 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
lblUploadTotalSize.setFont(new java.awt.Font("Lucida Grande", 0, 12));
lblUploadTotalSize.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.lblUploadTotalSize.text")); // NOI18N
+ lblUploadTotalSize.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 3, 0));
pnlUploadToolStatus.add(lblUploadTotalSize, java.awt.BorderLayout.SOUTH);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- gridBagConstraints.weightx = 0.7;
- gridBagConstraints.insets = new java.awt.Insets(5, 10, 0, 0);
- pnlUploadToolbar.add(pnlUploadToolStatus, gridBagConstraints);
+ jPanel14.add(pnlUploadToolStatus, java.awt.BorderLayout.WEST);
+
+ jPanel17.setMinimumSize(new java.awt.Dimension(100, 40));
+ jPanel17.setPreferredSize(new java.awt.Dimension(106, 40));
btnUploadBeginImport.setFont(new java.awt.Font("Lucida Grande", 0, 12));
btnUploadBeginImport.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnUploadBeginImport.text")); // NOI18N
btnUploadBeginImport.setEnabled(false);
btnUploadBeginImport.setMaximumSize(new java.awt.Dimension(115, 29));
btnUploadBeginImport.setMinimumSize(new java.awt.Dimension(115, 29));
- btnUploadBeginImport.setPreferredSize(new java.awt.Dimension(115, 29));
+ btnUploadBeginImport.setPreferredSize(new java.awt.Dimension(106, 29));
btnUploadBeginImport.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnUploadBeginImportActionPerformed(evt);
}
});
+
+ org.jdesktop.layout.GroupLayout jPanel17Layout = new org.jdesktop.layout.GroupLayout(jPanel17);
+ jPanel17.setLayout(jPanel17Layout);
+ jPanel17Layout.setHorizontalGroup(
+ jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 106, Short.MAX_VALUE)
+ .add(jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel17Layout.createSequentialGroup()
+ .add(0, 0, Short.MAX_VALUE)
+ .add(btnUploadBeginImport, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(0, 0, Short.MAX_VALUE)))
+ );
+ jPanel17Layout.setVerticalGroup(
+ jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(0, 40, Short.MAX_VALUE)
+ .add(jPanel17Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel17Layout.createSequentialGroup()
+ .add(0, 5, Short.MAX_VALUE)
+ .add(btnUploadBeginImport, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(0, 6, Short.MAX_VALUE)))
+ );
+
+ jPanel14.add(jPanel17, java.awt.BorderLayout.EAST);
+
+ pnlUploadTable.add(jPanel14, java.awt.BorderLayout.PAGE_END);
+
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- gridBagConstraints.weightx = 0.5;
- pnlUploadToolbar.add(btnUploadBeginImport, gridBagConstraints);
+ gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+ gridBagConstraints.weightx = 1.6;
+ gridBagConstraints.weighty = 0.2;
+ pnlUploadTrees.add(pnlUploadTable, gridBagConstraints);
- btnOverallUploadCancel.setFont(new java.awt.Font("Lucida Grande", 0, 12));
- btnOverallUploadCancel.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnOverallUploadCancel.text")); // NOI18N
- btnOverallUploadCancel.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- btnOverallUploadCancelActionPerformed(evt);
- }
- });
+ pnlOperationMode2.add(pnlUploadTrees, java.awt.BorderLayout.CENTER);
+
+ pnlUploadToolbar.setMaximumSize(new java.awt.Dimension(32767, 60));
+ pnlUploadToolbar.setMinimumSize(new java.awt.Dimension(250, 30));
+ pnlUploadToolbar.setPreferredSize(new java.awt.Dimension(700, 2));
+ pnlUploadToolbar.setLayout(new java.awt.GridBagLayout());
+
+ jPanel7.setMinimumSize(new java.awt.Dimension(0, 0));
+ jPanel7.setPreferredSize(new java.awt.Dimension(310, 40));
+ jPanel7.setLayout(new java.awt.BorderLayout());
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 3;
+ gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
- pnlUploadToolbar.add(btnOverallUploadCancel, gridBagConstraints);
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 1.6;
+ gridBagConstraints.weighty = 0.2;
+ pnlUploadToolbar.add(jPanel7, gridBagConstraints);
pnlOperationMode2.add(pnlUploadToolbar, java.awt.BorderLayout.SOUTH);
@@ -2223,7 +2265,8 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIdropWebMode.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
pnlIdropWebMode.setLayout(new java.awt.BorderLayout());
- pnlIdropWebModeDownloadTarget.setPreferredSize(new java.awt.Dimension(700, 35));
+ pnlIdropWebModeDownloadTarget.setBorder(javax.swing.BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ pnlIdropWebModeDownloadTarget.setPreferredSize(new java.awt.Dimension(700, 40));
pnlIdropWebModeDownloadTarget.setLayout(new java.awt.BorderLayout());
txtIdropWebModeDownloadTarget.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.txtIdropWebModeDownloadTarget.text")); // NOI18N
@@ -2239,43 +2282,38 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
pnlIdropWebMode.add(pnlIdropWebModeDownloadTarget, java.awt.BorderLayout.NORTH);
+ jPanel6.setPreferredSize(new java.awt.Dimension(700, 60));
jPanel6.setLayout(new java.awt.BorderLayout());
- jPanel15.setLayout(new java.awt.BorderLayout());
-
- jPanel16.setPreferredSize(new java.awt.Dimension(700, 10));
+ jPanel16.setPreferredSize(new java.awt.Dimension(700, 24));
org.jdesktop.layout.GroupLayout jPanel16Layout = new org.jdesktop.layout.GroupLayout(jPanel16);
jPanel16.setLayout(jPanel16Layout);
jPanel16Layout.setHorizontalGroup(
jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 690, Short.MAX_VALUE)
+ .add(0, 686, Short.MAX_VALUE)
);
jPanel16Layout.setVerticalGroup(
jPanel16Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 10, Short.MAX_VALUE)
+ .add(0, 24, Short.MAX_VALUE)
);
- jPanel15.add(jPanel16, java.awt.BorderLayout.PAGE_START);
+ jPanel6.add(jPanel16, java.awt.BorderLayout.NORTH);
- jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- jLabel1.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel1.text")); // NOI18N
- jPanel15.add(jLabel1, java.awt.BorderLayout.CENTER);
-
- pnlIdropWebModeProgressBar.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 20, 0, 20));
- pnlIdropWebModeProgressBar.setPreferredSize(new java.awt.Dimension(700, 75));
+ pnlIdropWebModeProgressBar.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 15, 10, 15));
+ pnlIdropWebModeProgressBar.setMinimumSize(new java.awt.Dimension(40, 24));
+ pnlIdropWebModeProgressBar.setPreferredSize(new java.awt.Dimension(700, 24));
pnlIdropWebModeProgressBar.setLayout(new java.awt.BorderLayout());
pbIdropWebModeDownloadProgress.setStringPainted(true);
pnlIdropWebModeProgressBar.add(pbIdropWebModeDownloadProgress, java.awt.BorderLayout.CENTER);
- jPanel15.add(pnlIdropWebModeProgressBar, java.awt.BorderLayout.SOUTH);
-
- jPanel6.add(jPanel15, java.awt.BorderLayout.CENTER);
+ jPanel6.add(pnlIdropWebModeProgressBar, java.awt.BorderLayout.CENTER);
pnlIdropWebMode.add(jPanel6, java.awt.BorderLayout.CENTER);
- pnlIdropWebModeBeginDownload.setPreferredSize(new java.awt.Dimension(700, 35));
+ pnlIdropWebModeBeginDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(3, 3, 3, 3));
+ pnlIdropWebModeBeginDownload.setPreferredSize(new java.awt.Dimension(700, 40));
pnlIdropWebModeBeginDownload.setLayout(new java.awt.BorderLayout());
btnIdropWebModeBeginDownload.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.btnIdropWebModeBeginDownload.text")); // NOI18N
@@ -2320,22 +2358,24 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
int fileType = iDropLiteApplet.uploadFile;
TreePath [] paths = fileUploadTree.getSelectionPaths();
Object selectedDrive = lstUploadLocalDrives.getSelectedValue();
- for(TreePath path: paths) {
- DefaultTableModel tm = (DefaultTableModel)tblUploadTable1.getModel();
- // need to add selected drive to make file transfer work properly in windows browser
- String filePath = LocalFileUtils.makeLocalFilePath(path, selectedDrive);
- File localFile = new File(filePath);
- if(localFile.isDirectory()) {
- fileType = iDropLiteApplet.uploadFolder;
+ if(paths != null) {
+ for(TreePath path: paths) {
+ DefaultTableModel tm = (DefaultTableModel)tblUploadTable1.getModel();
+ // need to add selected drive to make file transfer work properly in windows browser
+ String filePath = LocalFileUtils.makeLocalFilePath(path, selectedDrive);
+ File localFile = new File(filePath);
+ if(localFile.isDirectory()) {
+ fileType = iDropLiteApplet.uploadFolder;
+ }
+ Object [] rowData = new Object[5];
+ rowData[0] = filePath;
+ rowData[1] = 0;
+ //rowData[2] = 0;
+ rowData[2] = new TransferProgressInfo(this.displayMode);
+ rowData[3] = Boolean.TRUE;
+ rowData[4] = fileType;
+ tm.addRow(rowData);
}
- Object [] rowData = new Object[5];
- rowData[0] = filePath;
- rowData[1] = 0;
- //rowData[2] = 0;
- rowData[2] = new TransferProgressInfo(this.displayMode);
- rowData[3] = Boolean.TRUE;
- rowData[4] = fileType;
- tm.addRow(rowData);
}
}//GEN-LAST:event_btnUploadMoveActionPerformed
@@ -2352,6 +2392,16 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private void btnBrowseIRODSUploadDestActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnBrowseIRODSUploadDestActionPerformed
IRODSFinderDialog finderDialog = new IRODSFinderDialog(true, iDropCore);
+ // get current size of applet
+ int width = this.getWidth();
+ int height = this.getHeight();
+ if(width < 500 || height < 500) {
+ finderDialog.setSize(width, height);
+ }
+ else {
+ finderDialog.setSize(500,500);
+ }
+ finderDialog.setLocationRelativeTo(iDropCore.findAppletParentFrame(this));
finderDialog.setVisible(true);
String targetPath = finderDialog.getSelectedAbsolutePath();
if(targetPath != null) {
@@ -2370,7 +2420,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private void btnUploadBeginImportActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnUploadBeginImportActionPerformed
PutTransferRunner currentTransferRunner = null;
- final List<File> sourceFiles = new ArrayList<File>();
+ final List<UploadDataObj> sourceFiles = new ArrayList<UploadDataObj>();
// make sure IRODS destination is legal
final String targetPath = txtIRODSUploadDest.getText();
@@ -2387,22 +2437,28 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
catch(Exception ex) {
JOptionPane.showMessageDialog(this, "Please enter a valid IRODS destination for upload.");
return;
+ } finally {
+ iDropCore.getIrodsFileSystem().closeAndEatExceptions();
}
// now go through and process selected import files from table
if(!isTransferInProgress()) {
- // collect list of files in the table
+ // collect list of files and/or URLS in the table
int rows = tblUploadTable1.getRowCount();
this.filesInTable = rows; // reset to 0 in overall status callback when all files have been transferred
for(int row=0; row<rows; row++) {
- sourceFiles.add(new File((String)tblUploadTable1.getValueAt(row, 0)));
+ if((Integer)tblUploadTable1.getValueAt(row, 4) == iDropLiteApplet.uploadURL) { // this is an URL
+ sourceFiles.add(new UploadDataObj((String)tblUploadTable1.getValueAt(row, 0), Boolean.TRUE));
+ }
+ else { // this is just a regular file or folder
+ sourceFiles.add(new UploadDataObj(new File((String)tblUploadTable1.getValueAt(row, 0))));
+ }
}
// set Upload button test to Cancel
try {
currentTransferRunner = new PutTransferRunner(applet, targetPath, sourceFiles);
- //currentTransferRunner = new PutTransferRunner(applet, targetPath, tblUploadTable1);
final Thread transferThread = new Thread(currentTransferRunner);
log.info("launching transfer thread");
// close so that transfer thread can grab account
@@ -2500,25 +2556,11 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
});
}//GEN-LAST:event_btnCancelDownloadActionPerformed
- private void btnOverallUploadCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnOverallUploadCancelActionPerformed
- java.awt.EventQueue.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- if(isTransferInProgress()) {
- setTransferCancelled(true);
- }
- }
-
- });
- }//GEN-LAST:event_btnOverallUploadCancelActionPerformed
-
private void btnUploadUrlActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnUploadUrlActionPerformed
-// UploadFromURLDialog dlgUploadFromURL = new UploadFromURLDialog(this, true);
-// dlgUploadFromURL.setLocation(
-// (int) (this.getLocation().getX() + this.getWidth() / 2),
-// (int) (this.getLocation().getY() + this.getHeight() / 2));
-// dlgUploadFromURL.setVisible(true);
+ UploadFromURLDialog dlgUploadFromURL = new UploadFromURLDialog(this, true);
+ dlgUploadFromURL.setSize(495,125);
+ dlgUploadFromURL.setLocationRelativeTo(iDropCore.findAppletParentFrame(this));
+ dlgUploadFromURL.setVisible(true);
}//GEN-LAST:event_btnUploadUrlActionPerformed
private void btnIdropWebModeTargetBrowseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnIdropWebModeTargetBrowseActionPerformed
@@ -2538,14 +2580,12 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private javax.swing.JButton btnIdropWebModeTargetBrowse;
private javax.swing.JButton btnIrodsTreeRefresh;
private javax.swing.JButton btnLocalRefresh;
- private javax.swing.JButton btnOverallUploadCancel;
private javax.swing.JToggleButton btnToggleLocalView;
private javax.swing.JButton btnUploadBeginImport;
private javax.swing.JButton btnUploadCancel;
private javax.swing.JButton btnUploadLocalRefresh;
private javax.swing.JButton btnUploadMove;
private javax.swing.JButton btnUploadUrl;
- private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLabel7;
@@ -2556,12 +2596,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private javax.swing.JPanel jPanel12;
private javax.swing.JPanel jPanel13;
private javax.swing.JPanel jPanel14;
- private javax.swing.JPanel jPanel15;
private javax.swing.JPanel jPanel16;
+ private javax.swing.JPanel jPanel17;
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel4;
+ private javax.swing.JPanel jPanel5;
private javax.swing.JPanel jPanel6;
+ private javax.swing.JPanel jPanel7;
private javax.swing.JPanel jPanel8;
private javax.swing.JPanel jPanel9;
private javax.swing.JScrollPane jScrollPane5;
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteCore.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteCore.java
index dab0dc0..0648273 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteCore.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteCore.java
@@ -5,6 +5,8 @@
package org.irods.jargon.idrop.lite;
+import java.awt.Container;
+import java.awt.Frame;
import java.util.Timer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -207,5 +209,16 @@ public class iDropLiteCore {
public DefaultTableModel getUploadTableModel() {
return this.tmUploadTable;
}
+
+ protected Frame findAppletParentFrame(iDropLiteApplet applet) {
+ Container c = applet;
+ while(c != null){
+ if (c instanceof Frame)
+ return (Frame)c;
+
+ c = c.getParent();
+ }
+ return (Frame)null;
+ }
}
diff --git a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties
index 6a7427a..46db311 100644
--- a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties
+++ b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties
@@ -22,7 +22,7 @@ iDropLiteApplet.btnIrodsTreeRefresh.text=Refresh
iDropLiteApplet.pnlIrodsSearch.TabConstraints.tabTitle=Search
iDropLiteApplet.btnUploadLocalRefresh.text=Refresh
iDropLiteApplet.btnUploadMove.text=>>
-iDropLiteApplet.btnUploadCancel.text=<html><center>Remove<br>All</center><html>\n
+iDropLiteApplet.btnUploadCancel.text=Clear
iDropLiteApplet.btnBrowseIRODSUploadDest.text=Change import location
iDropLiteApplet.txtIRODSUploadDest.text=
iDropLiteApplet.lblUploadTotalFiles.text=Total Files to Upload:
@@ -32,8 +32,6 @@ iDropLiteApplet.btnUploadUrl.text=Import file from URL
iDropLiteApplet.txtDownloadTarget.text=
iDropLiteApplet.bntBeginDownload.text=Begin Download
iDropLiteApplet.btnCancelDownload.text=Cancel
-iDropLiteApplet.btnOverallUploadCancel.text=Cancel
-iDropLiteApplet.jLabel1.text=Shopping Cart Download Progress
iDropLiteApplet.btnBrowseDownloadTarget.text=Browse
iDropLiteApplet.txtIdropWebModeDownloadTarget.text=
iDropLiteApplet.btnIdropWebModeTargetBrowse.text=Browse
diff --git a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/finder/Bundle.properties b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/finder/Bundle.properties
index 5dd2f57..0756883 100644
--- a/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/finder/Bundle.properties
+++ b/idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/finder/Bundle.properties
@@ -4,3 +4,4 @@ IRODSFinderDialog.btnSelectFolder.text=Select
# To change this template, choose Tools | Templates
# and open the template in the editor.
IRODSFinderDialog.btnCancel.text=Cancel
+IRODSFinderDialog.lblInstruct.text=Select location for your import(s) \ No newline at end of file