summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
authorMike Conway <michael.c.conway@gmail.com>2011-11-02 13:49:34 (GMT)
committer Mike Conway <michael.c.conway@gmail.com>2011-11-02 13:49:34 (GMT)
commitee0efd92a2560c1ed6eba74b632daf5d0e71e13e (patch)
tree75877469ac56c53b7702a7a535022c581077b998 /idrop-lite
parent782da940a3052c2684274de5a93d917e7e156bba (diff)
downloadQCG-Data-ee0efd92a2560c1ed6eba74b632daf5d0e71e13e.zip
QCG-Data-ee0efd92a2560c1ed6eba74b632daf5d0e71e13e.tar.gz
QCG-Data-ee0efd92a2560c1ed6eba74b632daf5d0e71e13e.tar.bz2
[#514] upgrade upload and idrop-web integration for temp-only password
Diffstat (limited to 'idrop-lite')
-rw-r--r--idrop-lite/pom.xml2
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.form3
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java42
-rw-r--r--idrop-lite/src/main/resources/org/irods/jargon/idrop/lite/Bundle.properties2
4 files changed, 41 insertions, 8 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index 47edb1f..b5dc08d 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -10,7 +10,7 @@
<artifactId>idrop-lite</artifactId>
<packaging>jar</packaging>
<name>idrop-lite</name>
- <version>1.0.0-beta2-SNAPSHOT</version>
+ <version>1.0.0-beta3-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
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 ac490aa..6c6bb71 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
@@ -824,9 +824,6 @@
<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.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[200, 17]"/>
- </Property>
</Properties>
</Component>
</SubComponents>
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 1c4a255..d1c2bef 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
@@ -62,6 +62,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
private LocalFileTree fileUploadTree = null;
private IRODSTree irodsTree = null;
private Integer mode;
+ private Integer displayMode;
private String host;
private Integer port;
private String zone;
@@ -123,6 +124,14 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
this.tempPswd = getParameter("password");
this.absPath = getParameter("absPath");
+ if (getParameter("displayMode") == null) {
+ this.displayMode = 0;
+ log.info("normal (all modes) display mode");
+ } else {
+ this.displayMode = Integer.valueOf(getParameter("displayMode"));
+ log.info("setting display mode to {}", displayMode);
+ }
+
log.debug("creating account with applet params");
log.info("mode:{}", mode);
log.info("host:{}", host);
@@ -195,6 +204,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
case 2:
log.info("processLogin: using temp-only with cache");
+
if (!tempOnlyAccount()) {
showMessageFromOperation("Permanent Password Mode: login error - unable to log in, or invalid user id");
return false;
@@ -285,8 +295,35 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
}
private void doPostInitWork() {
- populateUploadDestination();
- setupUploadTable();
+
+
+ switch (displayMode) {
+ case 1:
+ log.info(">>>>>>>>> local/irods display mode 1");
+ pnlTabbedMain.remove(1);
+ pnlTabbedMain.remove(1);
+ break;
+ case 2:
+ log.info(">>>>>>>>>upload picker display mode");
+ pnlTabbedMain.remove(0);
+ pnlTabbedMain.remove(1);
+ populateUploadDestination();
+ setupUploadTable();
+ break;
+ case 3:
+ log.info(">>>>>>>>>shopping cart display mode 3");
+ pnlTabbedMain.remove(0);
+ pnlTabbedMain.remove(0);
+ break;
+ default:
+ log.info(">>>>>>>>> no display mode, showing all tabs");
+ populateUploadDestination();
+ setupUploadTable();
+ }
+
+
+
+
}
public void buildTargetTree() {
@@ -1412,7 +1449,6 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
jLabel4.setFont(new java.awt.Font("Lucida Grande", 0, 14)); // NOI18N
jLabel4.setText(org.openide.util.NbBundle.getMessage(iDropLiteApplet.class, "iDropLiteApplet.jLabel4.text")); // NOI18N
- jLabel4.setPreferredSize(new java.awt.Dimension(200, 17));
jPanel6.add(jLabel4);
gridBagConstraints = new java.awt.GridBagConstraints();
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 7bd8a40..c89e7a6 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
@@ -30,5 +30,5 @@ iDropLiteApplet.jPanel1.TabConstraints.tabTitle=tab4
iDropLiteApplet.jLabel3.AccessibleContext.accessibleName=Move files from your local file tree
iDropLiteApplet.jPanel5.TabConstraints.tabTitle=tab4
iDropLiteApplet.jLabel3.text=Local File Tree View
-iDropLiteApplet.jLabel4.text=xxxiRODS Upload Table View
+iDropLiteApplet.jLabel4.text=iRODS Upload Table View
iDropLiteApplet.jLabel3.AccessibleContext.accessibleName_1=Local File Tree View