summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgosiaw <magnolia1973@gazeta.pl>2013-11-14 08:46:17 (GMT)
committer gosiaw <magnolia1973@gazeta.pl>2013-11-14 08:46:17 (GMT)
commit957bb98b55f50d08b608dff799eefe13014cacee (patch)
treedc430e9e65b6ff73e304c40e139c58787af84759
parent94685e444301e7e64d8989438a0e2631779e34e6 (diff)
downloadQCG-Data-957bb98b55f50d08b608dff799eefe13014cacee.zip
QCG-Data-957bb98b55f50d08b608dff799eefe13014cacee.tar.gz
QCG-Data-957bb98b55f50d08b608dff799eefe13014cacee.tar.bz2
Panels in GDropLoginDialog reorganized
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropAuthScheme.java5
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.form510
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.java1108
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/gdrop/Bundle.properties76
5 files changed, 862 insertions, 839 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropAuthScheme.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropAuthScheme.java
index 9c4b2cf..30b1f03 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropAuthScheme.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropAuthScheme.java
@@ -13,7 +13,10 @@ public enum GDropAuthScheme {
/**
*
*/
- GSI,
+ PEM,
+ P12,
+ KEYSTORE,
+ PROXY,
/**
*
*/
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.form
index 56025e8..2e8b19a 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.form
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+ <NonVisualComponents>
+ <Component class="javax.swing.JFileChooser" name="jFileChooser1">
+ </Component>
+ </NonVisualComponents>
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
</Properties>
@@ -18,15 +22,15 @@
<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,-128,0,0,1,-42"/>
+ <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,-15,0,0,1,-111"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="pnlStandardLogin">
+ <Container class="javax.swing.JPanel" name="pnlBasicLoginParameters">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[450, 300]"/>
+ <Dimension value="[450, 250]"/>
</Property>
</Properties>
<Constraints>
@@ -40,7 +44,7 @@
<Component class="javax.swing.JLabel" name="lblHost">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHost.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHost.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -71,7 +75,7 @@
<Component class="javax.swing.JLabel" name="lblPort">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPort.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPort.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -102,7 +106,7 @@
<Component class="javax.swing.JLabel" name="lblZone">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZone.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZone.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -133,7 +137,7 @@
<Component class="javax.swing.JLabel" name="lblUsername">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblUsername.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblUsername.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -161,75 +165,10 @@
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JLabel" name="lblPassword">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="4" 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>
- <Component class="javax.swing.JPasswordField" name="txtPassword">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPassword.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="[180, 25]"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtPasswordActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="4" 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>
- <Component class="javax.swing.JLabel" name="lblVerifyPassword">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblVerifyPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="5" 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>
- <Component class="javax.swing.JPasswordField" name="txtVerifyPassword">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtVerifyPassword.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="[180, 25]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="5" 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>
<Component class="javax.swing.JLabel" name="lblAuthScheme">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblAuthScheme.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblAuthScheme.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -318,7 +257,7 @@
<Component class="javax.swing.JTextField" name="txtInitialPath">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtInitialPath.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtInitialPath.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="[180, 25]"/>
@@ -336,7 +275,7 @@
<Component class="javax.swing.JLabel" name="lblComment">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblComment.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblComment.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -349,7 +288,7 @@
</Constraint>
</Constraints>
</Component>
- <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+ <Container class="javax.swing.JScrollPane" name="jScrollPane">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[180, 60]"/>
@@ -377,24 +316,24 @@
</Container>
</SubComponents>
</Container>
- <Container class="javax.swing.JPanel" name="pnlGSILogin">
+ <Container class="javax.swing.JPanel" name="pnlStandardLogin">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[450, 300]"/>
+ <Dimension value="[450, 100]"/>
</Property>
</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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" 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>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
- <Component class="javax.swing.JLabel" name="lblHost1">
+ <Component class="javax.swing.JLabel" name="lblPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHost1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -403,29 +342,32 @@
</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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="4" 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>
- <Component class="javax.swing.JLabel" name="lblHostAddress1">
+ <Component class="javax.swing.JPasswordField" name="txtPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHostAddress1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPassword.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="[180, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtPasswordActionPerformed"/>
+ </Events>
<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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="4" 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>
- <Component class="javax.swing.JLabel" name="lblPort1">
+ <Component class="javax.swing.JLabel" name="lblVerifyPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPort1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblVerifyPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -434,14 +376,14 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" 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"/>
+ <GridBagConstraints gridX="0" gridY="5" 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>
- <Component class="javax.swing.JTextField" name="txtPort1">
+ <Component class="javax.swing.JPasswordField" name="txtVerifyPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPort1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtVerifyPassword.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="[180, 25]"/>
@@ -449,316 +391,331 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="1" 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"/>
+ <GridBagConstraints gridX="1" gridY="5" 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>
- <Component class="javax.swing.JLabel" name="lblZone1">
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlPEMLogin">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[450, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" 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>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblPEMCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZone1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPEMCert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" 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"/>
+ <GridBagConstraints gridX="0" 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>
- <Component class="javax.swing.JLabel" name="lblZoneValue1">
+ <Component class="javax.swing.JTextField" name="txtPEMCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZoneValue1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPEMCert.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="[180, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="txtPEMCertMousePressed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtPEMCertActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="2" 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"/>
+ <GridBagConstraints gridX="-1" gridY="-1" 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>
- <Component class="javax.swing.JLabel" name="lblAuthSchemeGSI">
+ <Component class="javax.swing.JLabel" name="lblPEMKey">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblAuthSchemeGSI.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPEMKey.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="6" 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"/>
+ <GridBagConstraints gridX="0" gridY="1" 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>
- <Component class="javax.swing.JComboBox" name="cbAuthSchemeGSI">
+ <Component class="javax.swing.JTextField" name="txtPEMKey">
<Properties>
- <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
- <StringArray count="4">
- <StringItem index="0" value="Item 1"/>
- <StringItem index="1" value="Item 2"/>
- <StringItem index="2" value="Item 3"/>
- <StringItem index="3" value="Item 4"/>
- </StringArray>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPEMKey.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="[180, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbAuthSchemeGSIActionPerformed"/>
- </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="6" 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"/>
+ <GridBagConstraints gridX="1" gridY="1" 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>
- <Component class="javax.swing.JLabel" name="lblDefaultResource1">
+ <Component class="javax.swing.JLabel" name="lblPEMCertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblDefaultResource1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPEMCertPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="7" 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"/>
+ <GridBagConstraints gridX="0" gridY="2" 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>
- <Component class="javax.swing.JTextField" name="txtDefaultResource1">
+ <Component class="javax.swing.JPasswordField" name="txtPEMCertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtDefaultResource1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPEMCertPassword.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="[180, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtDefaultResource1ActionPerformed"/>
- </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="7" 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"/>
+ <GridBagConstraints gridX="1" gridY="2" 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>
- <Component class="javax.swing.JLabel" name="lblStartingCollection1">
+ <Component class="javax.swing.JButton" name="btnChoosePEMCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblStartingCollection1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.btnChoosePEMCert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[40, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChoosePEMCertActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="8" 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"/>
+ <GridBagConstraints gridX="2" 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>
- <Component class="javax.swing.JTextField" name="txtInitialPath1">
+ <Component class="javax.swing.JButton" name="btnChoosePEMKey">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtInitialPath1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.btnChoosePEMKey.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="[180, 25]"/>
+ <Dimension value="[40, 25]"/>
</Property>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtInitialPath1ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChoosePEMKeyActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="8" 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"/>
+ <GridBagConstraints gridX="2" gridY="1" 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>
- <Component class="javax.swing.JLabel" name="lblComment1">
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlP12Login">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[450, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" 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>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblP12Cert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblComment1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblP12Cert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="9" 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"/>
+ <GridBagConstraints gridX="0" 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>
- <Container class="javax.swing.JScrollPane" name="jScrollPane2">
+ <Component class="javax.swing.JTextField" name="txtP12Cert">
<Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtP12Cert.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="[180, 60]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="txtP12CertMousePressed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtP12CertActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="9" gridWidth="1" gridHeight="3" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" 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>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextField" name="txtComment1">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtComment1.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="[180, 25]"/>
- </Property>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="pnlKeyFSLogin">
- <Properties>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[450, 300]"/>
- </Property>
- </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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="lblHost2">
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblP12CertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHost2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblP12CertPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" 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>
- <Component class="javax.swing.JLabel" name="lblHostAddress2">
+ <Component class="javax.swing.JPasswordField" name="txtP12CertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblHostAddress2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtP12CertPassword.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="[180, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</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="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="2" 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>
- <Component class="javax.swing.JLabel" name="lblPort2">
+ <Component class="javax.swing.JButton" name="btnChooseP12Cert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblPort2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.btnChooseP12Cert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[40, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseP12CertActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" 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"/>
+ <GridBagConstraints gridX="2" 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>
- <Component class="javax.swing.JTextField" name="txtPort2">
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlKeystoreLogin">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[450, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" 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>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblKeystoreBrowser">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtPort2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblKeystoreBrowser.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="[180, 25]"/>
+ <Dimension value="[150, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="1" 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"/>
+ <GridBagConstraints gridX="0" 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>
- <Component class="javax.swing.JLabel" name="lblZone2">
+ <Component class="javax.swing.JLabel" name="lblKeystoreCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZone2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblKeystoreCert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[150, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" 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"/>
+ <GridBagConstraints gridX="0" gridY="1" 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>
- <Component class="javax.swing.JLabel" name="lblZoneValue2">
+ <Component class="javax.swing.JLabel" name="lblKeystoreCertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblZoneValue2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblKeystoreCertPassword.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="[180, 25]"/>
+ <Dimension value="[150, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="2" 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"/>
+ <GridBagConstraints gridX="0" gridY="2" 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>
- <Component class="javax.swing.JLabel" name="lblAuthSchemeKeyFS">
+ <Component class="javax.swing.JPasswordField" name="txtKeystoreCertPassword">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblAuthSchemeKeyFS.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtKeystoreCertPassword.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="3" 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"/>
+ <GridBagConstraints gridX="1" gridY="2" 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>
- <Component class="javax.swing.JComboBox" name="cbAuthSchemeKeyFS">
+ <Component class="javax.swing.JComboBox" name="cbKeystoreBrowser">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
@@ -772,83 +729,116 @@
<Dimension value="[180, 25]"/>
</Property>
</Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cbAuthSchemeKeyFSActionPerformed"/>
- </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="3" 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"/>
+ <GridBagConstraints gridX="1" 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>
- <Component class="javax.swing.JLabel" name="lblDefaultResource2">
+ <Component class="javax.swing.JComboBox" name="cbKeystoreCert">
<Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblDefaultResource2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+ <StringArray count="4">
+ <StringItem index="0" value="Item 1"/>
+ <StringItem index="1" value="Item 2"/>
+ <StringItem index="2" value="Item 3"/>
+ <StringItem index="3" value="Item 4"/>
+ </StringArray>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[180, 25]"/>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="4" 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"/>
+ <GridBagConstraints gridX="1" gridY="1" 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>
- <Component class="javax.swing.JTextField" name="txtDefaultResource2">
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlProxyLogin">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[450, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" 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>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblProxyCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtDefaultResource2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblProxyCert.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="[180, 25]"/>
+ <Dimension value="[105, 25]"/>
</Property>
</Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtDefaultResource2ActionPerformed"/>
- </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="4" 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"/>
+ <GridBagConstraints gridX="0" 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>
- <Component class="javax.swing.JLabel" name="lblStartingCollection2">
+ <Component class="javax.swing.JTextField" name="txtProxyCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblStartingCollection2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtProxyCert.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
+ <Dimension value="[185, 25]"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="txtProxyCertMousePressed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtProxyCertActionPerformed"/>
+ </Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="5" 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"/>
+ <GridBagConstraints gridX="-1" gridY="-1" 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>
- <Component class="javax.swing.JTextField" name="txtInitialPath2">
+ <Component class="javax.swing.JButton" name="btnChooseProxyCert">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtInitialPath2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.btnChooseProxyCert.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="[180, 25]"/>
+ <Dimension value="[40, 25]"/>
</Property>
</Properties>
<Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtInitialPath2ActionPerformed"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseProxyCertActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="5" 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"/>
+ <GridBagConstraints gridX="2" 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>
+ <Container class="javax.swing.JPanel" name="pnlKeyFSLogin">
+ <Properties>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[450, 100]"/>
+ </Property>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="0" gridY="1" 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>
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <SubComponents>
<Component class="javax.swing.JLabel" name="lblPlgridUsername">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -942,48 +932,6 @@
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JLabel" name="lblComment2">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.lblComment2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="horizontalTextPosition" type="int" value="4"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[150, 25]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="9" 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>
- <Container class="javax.swing.JScrollPane" name="jScrollPane3">
- <Properties>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[180, 60]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="9" gridWidth="1" gridHeight="3" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextField" name="txtComment2">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/gdrop/Bundle.properties" key="GDropLoginDialog.txtComment2.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="[180, 25]"/>
- </Property>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="pnlButtons">
@@ -994,7 +942,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.java
index 6efb59b..b0707a5 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/gdrop/GDropLoginDialog.java
@@ -4,14 +4,23 @@
*/
package org.irods.jargon.idrop.desktop.gdrop;
+import java.io.File;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.DefaultComboBoxModel;
+import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
+import javax.swing.JTextField;
import org.irods.jargon.conveyor.core.ConveyorExecutionException;
import org.irods.jargon.conveyor.core.GridAccountService;
import org.irods.jargon.core.connection.IRODSAccount;
import org.irods.jargon.core.exception.JargonException;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.KEYFS;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.KEYSTORE;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.P12;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.PEM;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.PROXY;
+import static org.irods.jargon.idrop.desktop.gdrop.GDropAuthScheme.STANDARD;
import org.irods.jargon.idrop.desktop.systraygui.IDROPCore;
import org.irods.jargon.transfer.exception.PassPhraseInvalidException;
@@ -20,12 +29,16 @@ import org.irods.jargon.transfer.exception.PassPhraseInvalidException;
* @author gosiaw
*/
public class GDropLoginDialog extends javax.swing.JDialog {
+
private GDropGridAccount gridAccount;
private final IDROPCore idropCore;
-
private static final int STANDARD = 0;
- private static final int GSI = 1;
- private static final int KEYFS = 2;
+ private static final int PEM = 1;
+ private static final int P12 = 2;
+ private static final int KEYSTORE = 3;
+ private static final int PROXY = 4;
+ private static final int KEYFS = 5;
+
/**
* Creates new form GDropLoginDialog
*/
@@ -35,11 +48,11 @@ public class GDropLoginDialog extends javax.swing.JDialog {
initComponents();
this.idropCore = idropCore;
this.gridAccount = gridAccount;
-
- populateGridAccountInfo(GDropAuthScheme.STANDARD);
- initAuthSchemesCombo();
- this.getRootPane().setDefaultButton(btnOK);
-
+
+ populateGridAccountInfo(gridAccount.getGDropAuthScheme());
+ initAuthSchemesCombo(gridAccount.getGDropAuthScheme());
+ this.getRootPane().setDefaultButton(btnOK);
+
applyMode(GDropAuthScheme.STANDARD);
}
@@ -53,7 +66,8 @@ public class GDropLoginDialog extends javax.swing.JDialog {
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
- pnlStandardLogin = new javax.swing.JPanel();
+ jFileChooser1 = new javax.swing.JFileChooser();
+ pnlBasicLoginParameters = new javax.swing.JPanel();
lblHost = new javax.swing.JLabel();
lblHostAddress = new javax.swing.JLabel();
lblPort = new javax.swing.JLabel();
@@ -62,10 +76,6 @@ public class GDropLoginDialog extends javax.swing.JDialog {
lblZoneValue = new javax.swing.JLabel();
lblUsername = new javax.swing.JLabel();
txtUsername = new javax.swing.JTextField();
- lblPassword = new javax.swing.JLabel();
- txtPassword = new javax.swing.JPasswordField();
- lblVerifyPassword = new javax.swing.JLabel();
- txtVerifyPassword = new javax.swing.JPasswordField();
lblAuthScheme = new javax.swing.JLabel();
cbAuthScheme = new javax.swing.JComboBox();
lblDefaultResource = new javax.swing.JLabel();
@@ -73,46 +83,46 @@ public class GDropLoginDialog extends javax.swing.JDialog {
lblStartingCollection = new javax.swing.JLabel();
txtInitialPath = new javax.swing.JTextField();
lblComment = new javax.swing.JLabel();
- jScrollPane1 = new javax.swing.JScrollPane();
+ jScrollPane = new javax.swing.JScrollPane();
txtComment = new javax.swing.JTextField();
- pnlGSILogin = new javax.swing.JPanel();
- lblHost1 = new javax.swing.JLabel();
- lblHostAddress1 = new javax.swing.JLabel();
- lblPort1 = new javax.swing.JLabel();
- txtPort1 = new javax.swing.JTextField();
- lblZone1 = new javax.swing.JLabel();
- lblZoneValue1 = new javax.swing.JLabel();
- lblAuthSchemeGSI = new javax.swing.JLabel();
- cbAuthSchemeGSI = new javax.swing.JComboBox();
- lblDefaultResource1 = new javax.swing.JLabel();
- txtDefaultResource1 = new javax.swing.JTextField();
- lblStartingCollection1 = new javax.swing.JLabel();
- txtInitialPath1 = new javax.swing.JTextField();
- lblComment1 = new javax.swing.JLabel();
- jScrollPane2 = new javax.swing.JScrollPane();
- txtComment1 = new javax.swing.JTextField();
+ pnlStandardLogin = new javax.swing.JPanel();
+ lblPassword = new javax.swing.JLabel();
+ txtPassword = new javax.swing.JPasswordField();
+ lblVerifyPassword = new javax.swing.JLabel();
+ txtVerifyPassword = new javax.swing.JPasswordField();
+ pnlPEMLogin = new javax.swing.JPanel();
+ lblPEMCert = new javax.swing.JLabel();
+ txtPEMCert = new javax.swing.JTextField();
+ lblPEMKey = new javax.swing.JLabel();
+ txtPEMKey = new javax.swing.JTextField();
+ lblPEMCertPassword = new javax.swing.JLabel();
+ txtPEMCertPassword = new javax.swing.JPasswordField();
+ btnChoosePEMCert = new javax.swing.JButton();
+ btnChoosePEMKey = new javax.swing.JButton();
+ pnlP12Login = new javax.swing.JPanel();
+ lblP12Cert = new javax.swing.JLabel();
+ txtP12Cert = new javax.swing.JTextField();
+ lblP12CertPassword = new javax.swing.JLabel();
+ txtP12CertPassword = new javax.swing.JPasswordField();
+ btnChooseP12Cert = new javax.swing.JButton();
+ pnlKeystoreLogin = new javax.swing.JPanel();
+ lblKeystoreBrowser = new javax.swing.JLabel();
+ lblKeystoreCert = new javax.swing.JLabel();
+ lblKeystoreCertPassword = new javax.swing.JLabel();
+ txtKeystoreCertPassword = new javax.swing.JPasswordField();
+ cbKeystoreBrowser = new javax.swing.JComboBox();
+ cbKeystoreCert = new javax.swing.JComboBox();
+ pnlProxyLogin = new javax.swing.JPanel();
+ lblProxyCert = new javax.swing.JLabel();
+ txtProxyCert = new javax.swing.JTextField();
+ btnChooseProxyCert = new javax.swing.JButton();
pnlKeyFSLogin = new javax.swing.JPanel();
- lblHost2 = new javax.swing.JLabel();
- lblHostAddress2 = new javax.swing.JLabel();
- lblPort2 = new javax.swing.JLabel();
- txtPort2 = new javax.swing.JTextField();
- lblZone2 = new javax.swing.JLabel();
- lblZoneValue2 = new javax.swing.JLabel();
- lblAuthSchemeKeyFS = new javax.swing.JLabel();
- cbAuthSchemeKeyFS = new javax.swing.JComboBox();
- lblDefaultResource2 = new javax.swing.JLabel();
- txtDefaultResource2 = new javax.swing.JTextField();
- lblStartingCollection2 = new javax.swing.JLabel();
- txtInitialPath2 = new javax.swing.JTextField();
lblPlgridUsername = new javax.swing.JLabel();
txtplgridUsername = new javax.swing.JTextField();
lblPlgridPassword = new javax.swing.JLabel();
txtPlgridPassword = new javax.swing.JPasswordField();
lblKeyPassword = new javax.swing.JLabel();
txtKeyPassword = new javax.swing.JPasswordField();
- lblComment2 = new javax.swing.JLabel();
- jScrollPane3 = new javax.swing.JScrollPane();
- txtComment2 = new javax.swing.JTextField();
pnlButtons = new javax.swing.JPanel();
btnCancel = new javax.swing.JButton();
btnOK = new javax.swing.JButton();
@@ -120,111 +130,76 @@ public class GDropLoginDialog extends javax.swing.JDialog {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
getContentPane().setLayout(new java.awt.GridBagLayout());
- pnlStandardLogin.setPreferredSize(new java.awt.Dimension(450, 300));
- pnlStandardLogin.setLayout(new java.awt.GridBagLayout());
+ pnlBasicLoginParameters.setPreferredSize(new java.awt.Dimension(450, 250));
+ pnlBasicLoginParameters.setLayout(new java.awt.GridBagLayout());
- lblHost.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHost.text_1")); // NOI18N
+ lblHost.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHost.text")); // NOI18N
lblHost.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblHost.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
- pnlStandardLogin.add(lblHost, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblHost, gridBagConstraints);
lblHostAddress.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHostAddress.text")); // NOI18N
lblHostAddress.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
- pnlStandardLogin.add(lblHostAddress, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblHostAddress, gridBagConstraints);
- lblPort.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPort.text_1")); // NOI18N
+ lblPort.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPort.text")); // NOI18N
lblPort.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblPort.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- pnlStandardLogin.add(lblPort, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblPort, gridBagConstraints);
txtPort.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPort.text")); // NOI18N
txtPort.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
- pnlStandardLogin.add(txtPort, gridBagConstraints);
+ pnlBasicLoginParameters.add(txtPort, gridBagConstraints);
- lblZone.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZone.text_1")); // NOI18N
+ lblZone.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZone.text")); // NOI18N
lblZone.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblZone.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
- pnlStandardLogin.add(lblZone, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblZone, gridBagConstraints);
lblZoneValue.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZoneValue.text")); // NOI18N
lblZoneValue.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
- pnlStandardLogin.add(lblZoneValue, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblZoneValue, gridBagConstraints);
- lblUsername.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblUsername.text_1")); // NOI18N
+ lblUsername.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblUsername.text")); // NOI18N
lblUsername.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblUsername.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
- pnlStandardLogin.add(lblUsername, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblUsername, gridBagConstraints);
txtUsername.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtUsername.text")); // NOI18N
txtUsername.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 3;
- pnlStandardLogin.add(txtUsername, gridBagConstraints);
-
- lblPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPassword.text")); // NOI18N
- lblPassword.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblPassword.setPreferredSize(new java.awt.Dimension(150, 25));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
- pnlStandardLogin.add(lblPassword, gridBagConstraints);
-
- txtPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPassword.text")); // NOI18N
- txtPassword.setPreferredSize(new java.awt.Dimension(180, 25));
- txtPassword.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- txtPasswordActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 4;
- pnlStandardLogin.add(txtPassword, gridBagConstraints);
-
- lblVerifyPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblVerifyPassword.text")); // NOI18N
- lblVerifyPassword.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblVerifyPassword.setPreferredSize(new java.awt.Dimension(150, 25));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 5;
- pnlStandardLogin.add(lblVerifyPassword, gridBagConstraints);
+ pnlBasicLoginParameters.add(txtUsername, gridBagConstraints);
- txtVerifyPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtVerifyPassword.text")); // NOI18N
- txtVerifyPassword.setPreferredSize(new java.awt.Dimension(180, 25));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 5;
- pnlStandardLogin.add(txtVerifyPassword, gridBagConstraints);
-
- lblAuthScheme.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblAuthScheme.text_1")); // NOI18N
+ lblAuthScheme.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblAuthScheme.text")); // NOI18N
lblAuthScheme.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblAuthScheme.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 6;
- pnlStandardLogin.add(lblAuthScheme, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblAuthScheme, gridBagConstraints);
cbAuthScheme.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
cbAuthScheme.setPreferredSize(new java.awt.Dimension(180, 25));
@@ -236,7 +211,7 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 6;
- pnlStandardLogin.add(cbAuthScheme, gridBagConstraints);
+ pnlBasicLoginParameters.add(cbAuthScheme, gridBagConstraints);
lblDefaultResource.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblDefaultResource.text")); // NOI18N
lblDefaultResource.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
@@ -244,7 +219,7 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 7;
- pnlStandardLogin.add(lblDefaultResource, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblDefaultResource, gridBagConstraints);
txtDefaultResource.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtDefaultResource.text")); // NOI18N
txtDefaultResource.setPreferredSize(new java.awt.Dimension(180, 25));
@@ -256,7 +231,7 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 7;
- pnlStandardLogin.add(txtDefaultResource, gridBagConstraints);
+ pnlBasicLoginParameters.add(txtDefaultResource, gridBagConstraints);
lblStartingCollection.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblStartingCollection.text")); // NOI18N
lblStartingCollection.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
@@ -264,9 +239,9 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 8;
- pnlStandardLogin.add(lblStartingCollection, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblStartingCollection, gridBagConstraints);
- txtInitialPath.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtInitialPath.text_1")); // NOI18N
+ txtInitialPath.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtInitialPath.text")); // NOI18N
txtInitialPath.setPreferredSize(new java.awt.Dimension(180, 25));
txtInitialPath.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -276,273 +251,305 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 8;
- pnlStandardLogin.add(txtInitialPath, gridBagConstraints);
+ pnlBasicLoginParameters.add(txtInitialPath, gridBagConstraints);
- lblComment.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblComment.text_1")); // NOI18N
+ lblComment.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblComment.text")); // NOI18N
lblComment.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
lblComment.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 9;
- pnlStandardLogin.add(lblComment, gridBagConstraints);
+ pnlBasicLoginParameters.add(lblComment, gridBagConstraints);
- jScrollPane1.setPreferredSize(new java.awt.Dimension(180, 60));
+ jScrollPane.setPreferredSize(new java.awt.Dimension(180, 60));
txtComment.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtComment.text")); // NOI18N
txtComment.setPreferredSize(new java.awt.Dimension(180, 25));
- jScrollPane1.setViewportView(txtComment);
+ jScrollPane.setViewportView(txtComment);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 9;
gridBagConstraints.gridheight = 3;
- pnlStandardLogin.add(jScrollPane1, gridBagConstraints);
+ pnlBasicLoginParameters.add(jScrollPane, gridBagConstraints);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
- getContentPane().add(pnlStandardLogin, gridBagConstraints);
+ getContentPane().add(pnlBasicLoginParameters, gridBagConstraints);
- pnlGSILogin.setPreferredSize(new java.awt.Dimension(450, 300));
- pnlGSILogin.setLayout(new java.awt.GridBagLayout());
+ pnlStandardLogin.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlStandardLogin.setLayout(new java.awt.GridBagLayout());
- lblHost1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHost1.text")); // NOI18N
- lblHost1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblHost1.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPassword.text")); // NOI18N
+ lblPassword.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+ lblPassword.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- pnlGSILogin.add(lblHost1, gridBagConstraints);
+ gridBagConstraints.gridy = 4;
+ pnlStandardLogin.add(lblPassword, gridBagConstraints);
- lblHostAddress1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHostAddress1.text")); // NOI18N
- lblHostAddress1.setPreferredSize(new java.awt.Dimension(180, 25));
+ txtPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPassword.text")); // NOI18N
+ txtPassword.setPreferredSize(new java.awt.Dimension(180, 25));
+ txtPassword.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtPasswordActionPerformed(evt);
+ }
+ });
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- pnlGSILogin.add(lblHostAddress1, gridBagConstraints);
+ gridBagConstraints.gridy = 4;
+ pnlStandardLogin.add(txtPassword, gridBagConstraints);
- lblPort1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPort1.text")); // NOI18N
- lblPort1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblPort1.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblVerifyPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblVerifyPassword.text")); // NOI18N
+ lblVerifyPassword.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+ lblVerifyPassword.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- pnlGSILogin.add(lblPort1, gridBagConstraints);
+ gridBagConstraints.gridy = 5;
+ pnlStandardLogin.add(lblVerifyPassword, gridBagConstraints);
- txtPort1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPort1.text")); // NOI18N
- txtPort1.setPreferredSize(new java.awt.Dimension(180, 25));
+ txtVerifyPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtVerifyPassword.text")); // NOI18N
+ txtVerifyPassword.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- pnlGSILogin.add(txtPort1, gridBagConstraints);
+ gridBagConstraints.gridy = 5;
+ pnlStandardLogin.add(txtVerifyPassword, gridBagConstraints);
- lblZone1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZone1.text")); // NOI18N
- lblZone1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblZone1.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- pnlGSILogin.add(lblZone1, gridBagConstraints);
+ gridBagConstraints.gridy = 1;
+ getContentPane().add(pnlStandardLogin, gridBagConstraints);
- lblZoneValue1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZoneValue1.text")); // NOI18N
- lblZoneValue1.setPreferredSize(new java.awt.Dimension(180, 25));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- pnlGSILogin.add(lblZoneValue1, gridBagConstraints);
+ pnlPEMLogin.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlPEMLogin.setLayout(new java.awt.GridBagLayout());
- lblAuthSchemeGSI.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblAuthSchemeGSI.text")); // NOI18N
- lblAuthSchemeGSI.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblAuthSchemeGSI.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblPEMCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPEMCert.text")); // NOI18N
+ lblPEMCert.setPreferredSize(new java.awt.Dimension(105, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 6;
- pnlGSILogin.add(lblAuthSchemeGSI, gridBagConstraints);
+ gridBagConstraints.gridy = 0;
+ pnlPEMLogin.add(lblPEMCert, gridBagConstraints);
- cbAuthSchemeGSI.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
- cbAuthSchemeGSI.setPreferredSize(new java.awt.Dimension(180, 25));
- cbAuthSchemeGSI.addActionListener(new java.awt.event.ActionListener() {
+ txtPEMCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPEMCert.text")); // NOI18N
+ txtPEMCert.setPreferredSize(new java.awt.Dimension(185, 25));
+ txtPEMCert.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mousePressed(java.awt.event.MouseEvent evt) {
+ txtPEMCertMousePressed(evt);
+ }
+ });
+ txtPEMCert.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbAuthSchemeGSIActionPerformed(evt);
+ txtPEMCertActionPerformed(evt);
}
});
+ pnlPEMLogin.add(txtPEMCert, new java.awt.GridBagConstraints());
+
+ lblPEMKey.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPEMKey.text")); // NOI18N
+ lblPEMKey.setPreferredSize(new java.awt.Dimension(105, 25));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ pnlPEMLogin.add(lblPEMKey, gridBagConstraints);
+
+ txtPEMKey.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPEMKey.text")); // NOI18N
+ txtPEMKey.setPreferredSize(new java.awt.Dimension(185, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 6;
- pnlGSILogin.add(cbAuthSchemeGSI, gridBagConstraints);
+ gridBagConstraints.gridy = 1;
+ pnlPEMLogin.add(txtPEMKey, gridBagConstraints);
- lblDefaultResource1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblDefaultResource1.text")); // NOI18N
- lblDefaultResource1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblDefaultResource1.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblPEMCertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPEMCertPassword.text")); // NOI18N
+ lblPEMCertPassword.setPreferredSize(new java.awt.Dimension(105, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 7;
- pnlGSILogin.add(lblDefaultResource1, gridBagConstraints);
+ gridBagConstraints.gridy = 2;
+ pnlPEMLogin.add(lblPEMCertPassword, gridBagConstraints);
- txtDefaultResource1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtDefaultResource1.text")); // NOI18N
- txtDefaultResource1.setPreferredSize(new java.awt.Dimension(180, 25));
- txtDefaultResource1.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- txtDefaultResource1ActionPerformed(evt);
- }
- });
+ txtPEMCertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPEMCertPassword.text")); // NOI18N
+ txtPEMCertPassword.setPreferredSize(new java.awt.Dimension(185, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 7;
- pnlGSILogin.add(txtDefaultResource1, gridBagConstraints);
+ gridBagConstraints.gridy = 2;
+ pnlPEMLogin.add(txtPEMCertPassword, gridBagConstraints);
- lblStartingCollection1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblStartingCollection1.text")); // NOI18N
- lblStartingCollection1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblStartingCollection1.setPreferredSize(new java.awt.Dimension(150, 25));
+ btnChoosePEMCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.btnChoosePEMCert.text")); // NOI18N
+ btnChoosePEMCert.setPreferredSize(new java.awt.Dimension(40, 25));
+ btnChoosePEMCert.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnChoosePEMCertActionPerformed(evt);
+ }
+ });
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 8;
- pnlGSILogin.add(lblStartingCollection1, gridBagConstraints);
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 0;
+ pnlPEMLogin.add(btnChoosePEMCert, gridBagConstraints);
- txtInitialPath1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtInitialPath1.text")); // NOI18N
- txtInitialPath1.setPreferredSize(new java.awt.Dimension(180, 25));
- txtInitialPath1.addActionListener(new java.awt.event.ActionListener() {
+ btnChoosePEMKey.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.btnChoosePEMKey.text")); // NOI18N
+ btnChoosePEMKey.setPreferredSize(new java.awt.Dimension(40, 25));
+ btnChoosePEMKey.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- txtInitialPath1ActionPerformed(evt);
+ btnChoosePEMKeyActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 8;
- pnlGSILogin.add(txtInitialPath1, gridBagConstraints);
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 1;
+ pnlPEMLogin.add(btnChoosePEMKey, gridBagConstraints);
- lblComment1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblComment1.text")); // NOI18N
- lblComment1.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblComment1.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 9;
- pnlGSILogin.add(lblComment1, gridBagConstraints);
-
- jScrollPane2.setPreferredSize(new java.awt.Dimension(180, 60));
+ gridBagConstraints.gridy = 1;
+ getContentPane().add(pnlPEMLogin, gridBagConstraints);
- txtComment1.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtComment1.text")); // NOI18N
- txtComment1.setPreferredSize(new java.awt.Dimension(180, 25));
- jScrollPane2.setViewportView(txtComment1);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 9;
- gridBagConstraints.gridheight = 3;
- pnlGSILogin.add(jScrollPane2, gridBagConstraints);
+ pnlP12Login.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlP12Login.setLayout(new java.awt.GridBagLayout());
+ lblP12Cert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblP12Cert.text")); // NOI18N
+ lblP12Cert.setPreferredSize(new java.awt.Dimension(105, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
- getContentPane().add(pnlGSILogin, gridBagConstraints);
+ pnlP12Login.add(lblP12Cert, gridBagConstraints);
- pnlKeyFSLogin.setPreferredSize(new java.awt.Dimension(450, 300));
- pnlKeyFSLogin.setLayout(new java.awt.GridBagLayout());
+ txtP12Cert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtP12Cert.text")); // NOI18N
+ txtP12Cert.setPreferredSize(new java.awt.Dimension(185, 25));
+ txtP12Cert.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mousePressed(java.awt.event.MouseEvent evt) {
+ txtP12CertMousePressed(evt);
+ }
+ });
+ txtP12Cert.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtP12CertActionPerformed(evt);
+ }
+ });
+ pnlP12Login.add(txtP12Cert, new java.awt.GridBagConstraints());
- lblHost2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHost2.text")); // NOI18N
- lblHost2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblHost2.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblP12CertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblP12CertPassword.text")); // NOI18N
+ lblP12CertPassword.setPreferredSize(new java.awt.Dimension(105, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- pnlKeyFSLogin.add(lblHost2, gridBagConstraints);
+ gridBagConstraints.gridy = 2;
+ pnlP12Login.add(lblP12CertPassword, gridBagConstraints);
- lblHostAddress2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblHostAddress2.text")); // NOI18N
- lblHostAddress2.setPreferredSize(new java.awt.Dimension(180, 25));
+ txtP12CertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtP12CertPassword.text")); // NOI18N
+ txtP12CertPassword.setPreferredSize(new java.awt.Dimension(185, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 2;
+ pnlP12Login.add(txtP12CertPassword, gridBagConstraints);
+
+ btnChooseP12Cert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.btnChooseP12Cert.text")); // NOI18N
+ btnChooseP12Cert.setPreferredSize(new java.awt.Dimension(40, 25));
+ btnChooseP12Cert.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnChooseP12CertActionPerformed(evt);
+ }
+ });
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
- pnlKeyFSLogin.add(lblHostAddress2, gridBagConstraints);
+ pnlP12Login.add(btnChooseP12Cert, gridBagConstraints);
- lblPort2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPort2.text")); // NOI18N
- lblPort2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblPort2.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- pnlKeyFSLogin.add(lblPort2, gridBagConstraints);
+ getContentPane().add(pnlP12Login, gridBagConstraints);
+
+ pnlKeystoreLogin.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlKeystoreLogin.setLayout(new java.awt.GridBagLayout());
- txtPort2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtPort2.text")); // NOI18N
- txtPort2.setPreferredSize(new java.awt.Dimension(180, 25));
+ lblKeystoreBrowser.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblKeystoreBrowser.text")); // NOI18N
+ lblKeystoreBrowser.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ pnlKeystoreLogin.add(lblKeystoreBrowser, gridBagConstraints);
+
+ lblKeystoreCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblKeystoreCert.text")); // NOI18N
+ lblKeystoreCert.setPreferredSize(new java.awt.Dimension(150, 25));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- pnlKeyFSLogin.add(txtPort2, gridBagConstraints);
+ pnlKeystoreLogin.add(lblKeystoreCert, gridBagConstraints);
- lblZone2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZone2.text")); // NOI18N
- lblZone2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblZone2.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblKeystoreCertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblKeystoreCertPassword.text")); // NOI18N
+ lblKeystoreCertPassword.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
- pnlKeyFSLogin.add(lblZone2, gridBagConstraints);
+ pnlKeystoreLogin.add(lblKeystoreCertPassword, gridBagConstraints);
- lblZoneValue2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblZoneValue2.text")); // NOI18N
- lblZoneValue2.setPreferredSize(new java.awt.Dimension(180, 25));
+ txtKeystoreCertPassword.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtKeystoreCertPassword.text")); // NOI18N
+ txtKeystoreCertPassword.setPreferredSize(new java.awt.Dimension(185, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 2;
- pnlKeyFSLogin.add(lblZoneValue2, gridBagConstraints);
+ pnlKeystoreLogin.add(txtKeystoreCertPassword, gridBagConstraints);
- lblAuthSchemeKeyFS.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblAuthSchemeKeyFS.text")); // NOI18N
- lblAuthSchemeKeyFS.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblAuthSchemeKeyFS.setPreferredSize(new java.awt.Dimension(150, 25));
+ cbKeystoreBrowser.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ cbKeystoreBrowser.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
- pnlKeyFSLogin.add(lblAuthSchemeKeyFS, gridBagConstraints);
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 0;
+ pnlKeystoreLogin.add(cbKeystoreBrowser, gridBagConstraints);
- cbAuthSchemeKeyFS.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
- cbAuthSchemeKeyFS.setPreferredSize(new java.awt.Dimension(180, 25));
- cbAuthSchemeKeyFS.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- cbAuthSchemeKeyFSActionPerformed(evt);
- }
- });
+ cbKeystoreCert.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ cbKeystoreCert.setPreferredSize(new java.awt.Dimension(180, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 3;
- pnlKeyFSLogin.add(cbAuthSchemeKeyFS, gridBagConstraints);
+ gridBagConstraints.gridy = 1;
+ pnlKeystoreLogin.add(cbKeystoreCert, gridBagConstraints);
- lblDefaultResource2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblDefaultResource2.text")); // NOI18N
- lblDefaultResource2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblDefaultResource2.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
- pnlKeyFSLogin.add(lblDefaultResource2, gridBagConstraints);
+ gridBagConstraints.gridy = 1;
+ getContentPane().add(pnlKeystoreLogin, gridBagConstraints);
- txtDefaultResource2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtDefaultResource2.text")); // NOI18N
- txtDefaultResource2.setPreferredSize(new java.awt.Dimension(180, 25));
- txtDefaultResource2.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- txtDefaultResource2ActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 4;
- pnlKeyFSLogin.add(txtDefaultResource2, gridBagConstraints);
+ pnlProxyLogin.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlProxyLogin.setLayout(new java.awt.GridBagLayout());
- lblStartingCollection2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblStartingCollection2.text")); // NOI18N
- lblStartingCollection2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblStartingCollection2.setPreferredSize(new java.awt.Dimension(150, 25));
+ lblProxyCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblProxyCert.text")); // NOI18N
+ lblProxyCert.setPreferredSize(new java.awt.Dimension(105, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 5;
- pnlKeyFSLogin.add(lblStartingCollection2, gridBagConstraints);
+ gridBagConstraints.gridy = 0;
+ pnlProxyLogin.add(lblProxyCert, gridBagConstraints);
- txtInitialPath2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtInitialPath2.text")); // NOI18N
- txtInitialPath2.setPreferredSize(new java.awt.Dimension(180, 25));
- txtInitialPath2.addActionListener(new java.awt.event.ActionListener() {
+ txtProxyCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtProxyCert.text")); // NOI18N
+ txtProxyCert.setPreferredSize(new java.awt.Dimension(185, 25));
+ txtProxyCert.addMouseListener(new java.awt.event.MouseAdapter() {
+ public void mousePressed(java.awt.event.MouseEvent evt) {
+ txtProxyCertMousePressed(evt);
+ }
+ });
+ txtProxyCert.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
- txtInitialPath2ActionPerformed(evt);
+ txtProxyCertActionPerformed(evt);
+ }
+ });
+ pnlProxyLogin.add(txtProxyCert, new java.awt.GridBagConstraints());
+
+ btnChooseProxyCert.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.btnChooseProxyCert.text")); // NOI18N
+ btnChooseProxyCert.setPreferredSize(new java.awt.Dimension(40, 25));
+ btnChooseProxyCert.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnChooseProxyCertActionPerformed(evt);
}
});
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 5;
- pnlKeyFSLogin.add(txtInitialPath2, gridBagConstraints);
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 0;
+ pnlProxyLogin.add(btnChooseProxyCert, gridBagConstraints);
+
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ getContentPane().add(pnlProxyLogin, gridBagConstraints);
+
+ pnlKeyFSLogin.setPreferredSize(new java.awt.Dimension(450, 100));
+ pnlKeyFSLogin.setLayout(new java.awt.GridBagLayout());
lblPlgridUsername.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblPlgridUsername.text")); // NOI18N
lblPlgridUsername.setPreferredSize(new java.awt.Dimension(150, 25));
@@ -591,29 +598,9 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints.gridy = 8;
pnlKeyFSLogin.add(txtKeyPassword, gridBagConstraints);
- lblComment2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.lblComment2.text")); // NOI18N
- lblComment2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
- lblComment2.setPreferredSize(new java.awt.Dimension(150, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 9;
- pnlKeyFSLogin.add(lblComment2, gridBagConstraints);
-
- jScrollPane3.setPreferredSize(new java.awt.Dimension(180, 60));
-
- txtComment2.setText(org.openide.util.NbBundle.getMessage(GDropLoginDialog.class, "GDropLoginDialog.txtComment2.text")); // NOI18N
- txtComment2.setPreferredSize(new java.awt.Dimension(180, 25));
- jScrollPane3.setViewportView(txtComment2);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 9;
- gridBagConstraints.gridheight = 3;
- pnlKeyFSLogin.add(jScrollPane3, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
+ gridBagConstraints.gridy = 1;
getContentPane().add(pnlKeyFSLogin, gridBagConstraints);
pnlButtons.setPreferredSize(new java.awt.Dimension(200, 60));
@@ -642,27 +629,13 @@ public class GDropLoginDialog extends javax.swing.JDialog {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
+ gridBagConstraints.gridy = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
getContentPane().add(pnlButtons, gridBagConstraints);
pack();
}// </editor-fold>//GEN-END:initComponents
- private void cbAuthSchemeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbAuthSchemeActionPerformed
- // TODO add your handling code here:
- int index = cbAuthScheme.getSelectedIndex();
- applyMode(index);
- }//GEN-LAST:event_cbAuthSchemeActionPerformed
-
- private void txtDefaultResourceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtDefaultResourceActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_txtDefaultResourceActionPerformed
-
- private void txtInitialPathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtInitialPathActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_txtInitialPathActionPerformed
-
private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
this.dispose();
}//GEN-LAST:event_btnCancelActionPerformed
@@ -695,174 +668,247 @@ public class GDropLoginDialog extends javax.swing.JDialog {
} catch (PassPhraseInvalidException ex) {
gridInfo = null;
Logger.getLogger(GDropOldLoginDialog.class.getName()).log(
- Level.SEVERE, null, ex);
+ Level.SEVERE, null, ex);
JOptionPane.showMessageDialog(
- this,
- "Update of grid account failed. Pass phrase is invalid.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Update of grid account failed. Pass phrase is invalid.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
} catch (ConveyorExecutionException ex) {
gridInfo = null;
Logger.getLogger(GDropOldLoginDialog.class.getName()).log(
- Level.SEVERE, null, ex);
+ Level.SEVERE, null, ex);
}
this.dispose();
}
}//GEN-LAST:event_btnOKActionPerformed
- private void cbAuthSchemeGSIActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbAuthSchemeGSIActionPerformed
+ private void txtPasswordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPasswordActionPerformed
// TODO add your handling code here:
- int index = cbAuthSchemeGSI.getSelectedIndex();
+ }//GEN-LAST:event_txtPasswordActionPerformed
+
+ private void txtPlgridPasswordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPlgridPasswordActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtPlgridPasswordActionPerformed
+
+ private void cbAuthSchemeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbAuthSchemeActionPerformed
+ // TODO add your handling code here:
+ int index = cbAuthScheme.getSelectedIndex();
applyMode(index);
- }//GEN-LAST:event_cbAuthSchemeGSIActionPerformed
+ }//GEN-LAST:event_cbAuthSchemeActionPerformed
- private void txtDefaultResource1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtDefaultResource1ActionPerformed
+ private void txtDefaultResourceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtDefaultResourceActionPerformed
// TODO add your handling code here:
- }//GEN-LAST:event_txtDefaultResource1ActionPerformed
+ }//GEN-LAST:event_txtDefaultResourceActionPerformed
- private void txtInitialPath1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtInitialPath1ActionPerformed
+ private void txtInitialPathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtInitialPathActionPerformed
// TODO add your handling code here:
- }//GEN-LAST:event_txtInitialPath1ActionPerformed
+ }//GEN-LAST:event_txtInitialPathActionPerformed
- private void cbAuthSchemeKeyFSActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbAuthSchemeKeyFSActionPerformed
+ private void txtPEMCertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPEMCertActionPerformed
// TODO add your handling code here:
- int index = cbAuthSchemeKeyFS.getSelectedIndex();
- applyMode(index);
- }//GEN-LAST:event_cbAuthSchemeKeyFSActionPerformed
+ }//GEN-LAST:event_txtPEMCertActionPerformed
- private void txtDefaultResource2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtDefaultResource2ActionPerformed
+ private void txtPEMCertMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_txtPEMCertMousePressed
// TODO add your handling code here:
- }//GEN-LAST:event_txtDefaultResource2ActionPerformed
+ }//GEN-LAST:event_txtPEMCertMousePressed
+
+ private void btnChoosePEMCertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChoosePEMCertActionPerformed
+ selectFile(txtPEMCert);
+ }//GEN-LAST:event_btnChoosePEMCertActionPerformed
+
+ private void btnChoosePEMKeyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChoosePEMKeyActionPerformed
+ selectFile(txtPEMKey);
+ }//GEN-LAST:event_btnChoosePEMKeyActionPerformed
- private void txtInitialPath2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtInitialPath2ActionPerformed
+ private void txtP12CertMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_txtP12CertMousePressed
// TODO add your handling code here:
- }//GEN-LAST:event_txtInitialPath2ActionPerformed
+ }//GEN-LAST:event_txtP12CertMousePressed
- private void txtPasswordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPasswordActionPerformed
+ private void txtP12CertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtP12CertActionPerformed
// TODO add your handling code here:
- }//GEN-LAST:event_txtPasswordActionPerformed
+ }//GEN-LAST:event_txtP12CertActionPerformed
- private void txtPlgridPasswordActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPlgridPasswordActionPerformed
+ private void btnChooseP12CertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseP12CertActionPerformed
+ selectFile(txtP12Cert);
+ }//GEN-LAST:event_btnChooseP12CertActionPerformed
+
+ private void txtProxyCertMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_txtProxyCertMousePressed
// TODO add your handling code here:
- }//GEN-LAST:event_txtPlgridPasswordActionPerformed
+ }//GEN-LAST:event_txtProxyCertMousePressed
+
+ private void txtProxyCertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtProxyCertActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtProxyCertActionPerformed
+
+ private void btnChooseProxyCertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseProxyCertActionPerformed
+ selectFile(txtProxyCert);
+ }//GEN-LAST:event_btnChooseProxyCertActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btnCancel;
+ private javax.swing.JButton btnChooseP12Cert;
+ private javax.swing.JButton btnChoosePEMCert;
+ private javax.swing.JButton btnChoosePEMKey;
+ private javax.swing.JButton btnChooseProxyCert;
private javax.swing.JButton btnOK;
private javax.swing.JComboBox cbAuthScheme;
- private javax.swing.JComboBox cbAuthSchemeGSI;
- private javax.swing.JComboBox cbAuthSchemeKeyFS;
- private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JScrollPane jScrollPane2;
- private javax.swing.JScrollPane jScrollPane3;
+ private javax.swing.JComboBox cbKeystoreBrowser;
+ private javax.swing.JComboBox cbKeystoreCert;
+ private javax.swing.JFileChooser jFileChooser1;
+ private javax.swing.JScrollPane jScrollPane;
private javax.swing.JLabel lblAuthScheme;
- private javax.swing.JLabel lblAuthSchemeGSI;
- private javax.swing.JLabel lblAuthSchemeKeyFS;
private javax.swing.JLabel lblComment;
- private javax.swing.JLabel lblComment1;
- private javax.swing.JLabel lblComment2;
private javax.swing.JLabel lblDefaultResource;
- private javax.swing.JLabel lblDefaultResource1;
- private javax.swing.JLabel lblDefaultResource2;
private javax.swing.JLabel lblHost;
- private javax.swing.JLabel lblHost1;
- private javax.swing.JLabel lblHost2;
private javax.swing.JLabel lblHostAddress;
- private javax.swing.JLabel lblHostAddress1;
- private javax.swing.JLabel lblHostAddress2;
private javax.swing.JLabel lblKeyPassword;
+ private javax.swing.JLabel lblKeystoreBrowser;
+ private javax.swing.JLabel lblKeystoreCert;
+ private javax.swing.JLabel lblKeystoreCertPassword;
+ private javax.swing.JLabel lblP12Cert;
+ private javax.swing.JLabel lblP12CertPassword;
+ private javax.swing.JLabel lblPEMCert;
+ private javax.swing.JLabel lblPEMCertPassword;
+ private javax.swing.JLabel lblPEMKey;
private javax.swing.JLabel lblPassword;
private javax.swing.JLabel lblPlgridPassword;
private javax.swing.JLabel lblPlgridUsername;
private javax.swing.JLabel lblPort;
- private javax.swing.JLabel lblPort1;
- private javax.swing.JLabel lblPort2;
+ private javax.swing.JLabel lblProxyCert;
private javax.swing.JLabel lblStartingCollection;
- private javax.swing.JLabel lblStartingCollection1;
- private javax.swing.JLabel lblStartingCollection2;
private javax.swing.JLabel lblUsername;
private javax.swing.JLabel lblVerifyPassword;
private javax.swing.JLabel lblZone;
- private javax.swing.JLabel lblZone1;
- private javax.swing.JLabel lblZone2;
private javax.swing.JLabel lblZoneValue;
- private javax.swing.JLabel lblZoneValue1;
- private javax.swing.JLabel lblZoneValue2;
+ private javax.swing.JPanel pnlBasicLoginParameters;
private javax.swing.JPanel pnlButtons;
- private javax.swing.JPanel pnlGSILogin;
private javax.swing.JPanel pnlKeyFSLogin;
+ private javax.swing.JPanel pnlKeystoreLogin;
+ private javax.swing.JPanel pnlP12Login;
+ private javax.swing.JPanel pnlPEMLogin;
+ private javax.swing.JPanel pnlProxyLogin;
private javax.swing.JPanel pnlStandardLogin;
private javax.swing.JTextField txtComment;
- private javax.swing.JTextField txtComment1;
- private javax.swing.JTextField txtComment2;
private javax.swing.JTextField txtDefaultResource;
- private javax.swing.JTextField txtDefaultResource1;
- private javax.swing.JTextField txtDefaultResource2;
private javax.swing.JTextField txtInitialPath;
- private javax.swing.JTextField txtInitialPath1;
- private javax.swing.JTextField txtInitialPath2;
private javax.swing.JPasswordField txtKeyPassword;
+ private javax.swing.JPasswordField txtKeystoreCertPassword;
+ private javax.swing.JTextField txtP12Cert;
+ private javax.swing.JPasswordField txtP12CertPassword;
+ private javax.swing.JTextField txtPEMCert;
+ private javax.swing.JPasswordField txtPEMCertPassword;
+ private javax.swing.JTextField txtPEMKey;
private javax.swing.JPasswordField txtPassword;
private javax.swing.JPasswordField txtPlgridPassword;
private javax.swing.JTextField txtPort;
- private javax.swing.JTextField txtPort1;
- private javax.swing.JTextField txtPort2;
+ private javax.swing.JTextField txtProxyCert;
private javax.swing.JTextField txtUsername;
private javax.swing.JPasswordField txtVerifyPassword;
private javax.swing.JTextField txtplgridUsername;
// End of variables declaration//GEN-END:variables
private void populateGridAccountInfo(int index) {
- if (index == STANDARD) {
- populateStandardGridAccountInfo();
- } else if (index == GSI) {
- populateGSIGridAccountInfo();
- } else if (index == KEYFS) {
- populateKeyFSGridAccountInfo();
+ switch (index) {
+ case STANDARD:
+ populateStandardGridAccountInfo();
+ break;
+ case PEM:
+ break;
+ case P12:
+ break;
+ case KEYSTORE:
+ break;
+ case PROXY:
+ break;
+ case KEYFS:
+ populateKeyFSGridAccountInfo();
+ break;
}
}
- private void initAuthSchemesCombo() {
+ private void initAuthSchemesCombo(GDropAuthScheme gDropAuthScheme) {
cbAuthScheme.setModel(new DefaultComboBoxModel(GDropAuthScheme.values()));
// also select correct auth scheme for this grid
- cbAuthScheme.setSelectedItem(STANDARD);
+// cbAuthScheme.setSelectedItem(STANDARD);
+ cbAuthScheme.setSelectedItem(gDropAuthScheme);
- cbAuthSchemeGSI.setModel(new DefaultComboBoxModel(GDropAuthScheme.values()));
- // also select correct auth scheme for this grid
- cbAuthSchemeGSI.setSelectedItem(GSI);
-
- cbAuthSchemeKeyFS.setModel(new DefaultComboBoxModel(GDropAuthScheme.values()));
- // also select correct auth scheme for this grid
- cbAuthSchemeKeyFS.setSelectedItem(KEYFS);
}
private GDropIRODSAccount createIRODSAccountFromForm(GDropAuthScheme gdropAuthScheme) {
- if (gdropAuthScheme == GDropAuthScheme.STANDARD) {
- return createIRODSAccountFromStandardForm();
- } else if (gdropAuthScheme == GDropAuthScheme.GSI) {
- return createIRODSAccountFromGSIForm();
- } else if (gdropAuthScheme == GDropAuthScheme.KEYFS) {
- return createIRODSAccountFromKeyFSForm();
+ switch (gdropAuthScheme) {
+ case STANDARD:
+ return createIRODSAccountFromStandardForm();
+ case PEM:
+ break;
+ case P12:
+ break;
+ case KEYSTORE:
+ break;
+ case PROXY:
+ break;
+ case KEYFS:
+ return createIRODSAccountFromKeyFSForm();
}
-
+
return null;
}
- private void applyMode(GDropAuthScheme gDropAuthScheme) {
- if (gDropAuthScheme == GDropAuthScheme.STANDARD) {
- cbAuthScheme.setSelectedIndex(STANDARD);
- pnlStandardLogin.setVisible(true);
- pnlGSILogin.setVisible(false);
- pnlKeyFSLogin.setVisible(false);
- } else if (gDropAuthScheme == GDropAuthScheme.GSI) {
- cbAuthSchemeGSI.setSelectedIndex(GSI);
- pnlStandardLogin.setVisible(false);
- pnlGSILogin.setVisible(true);
- pnlKeyFSLogin.setVisible(false);
- } else if (gDropAuthScheme == GDropAuthScheme.KEYFS) {
- cbAuthSchemeKeyFS.setSelectedIndex(KEYFS);
- pnlStandardLogin.setVisible(false);
- pnlGSILogin.setVisible(false);
- pnlKeyFSLogin.setVisible(true);
+ private void applyMode(GDropAuthScheme gdropAuthScheme) {
+ switch (gdropAuthScheme) {
+ case STANDARD:
+ cbAuthScheme.setSelectedIndex(STANDARD);
+ pnlStandardLogin.setVisible(true);
+ pnlPEMLogin.setVisible(false);
+ pnlP12Login.setVisible(false);
+ pnlKeystoreLogin.setVisible(false);
+ pnlProxyLogin.setVisible(false);
+ pnlKeyFSLogin.setVisible(false);
+ break;
+ case PEM:
+ cbAuthScheme.setSelectedIndex(PEM);
+ pnlStandardLogin.setVisible(false);
+ pnlPEMLogin.setVisible(true);
+ pnlP12Login.setVisible(false);
+ pnlKeystoreLogin.setVisible(false);
+ pnlProxyLogin.setVisible(false);
+ pnlKeyFSLogin.setVisible(false);
+ break;
+ case P12:
+ cbAuthScheme.setSelectedIndex(P12);
+ pnlStandardLogin.setVisible(false);
+ pnlPEMLogin.setVisible(false);
+ pnlP12Login.setVisible(true);
+ pnlKeystoreLogin.setVisible(false);
+ pnlProxyLogin.setVisible(false);
+ pnlKeyFSLogin.setVisible(false);
+ break;
+ case KEYSTORE:
+ cbAuthScheme.setSelectedIndex(KEYSTORE);
+ pnlStandardLogin.setVisible(false);
+ pnlPEMLogin.setVisible(false);
+ pnlP12Login.setVisible(false);
+ pnlKeystoreLogin.setVisible(true);
+ pnlProxyLogin.setVisible(false);
+ pnlKeyFSLogin.setVisible(false);
+ break;
+ case PROXY:
+ cbAuthScheme.setSelectedIndex(PROXY);
+ pnlStandardLogin.setVisible(false);
+ pnlPEMLogin.setVisible(false);
+ pnlP12Login.setVisible(false);
+ pnlKeystoreLogin.setVisible(false);
+ pnlProxyLogin.setVisible(true);
+ pnlKeyFSLogin.setVisible(false);
+ break;
+ case KEYFS:
+ cbAuthScheme.setSelectedIndex(KEYFS);
+ pnlStandardLogin.setVisible(false);
+ pnlPEMLogin.setVisible(false);
+ pnlP12Login.setVisible(false);
+ pnlKeystoreLogin.setVisible(false);
+ pnlProxyLogin.setVisible(false);
+ pnlKeyFSLogin.setVisible(true);
+ break;
}
}
@@ -872,38 +918,50 @@ public class GDropLoginDialog extends javax.swing.JDialog {
applyMode(GDropAuthScheme.STANDARD);
populateGridAccountInfo(GDropAuthScheme.STANDARD);
break;
- case GSI:
- applyMode(GDropAuthScheme.GSI);
- populateGridAccountInfo(GDropAuthScheme.GSI);
+ case PEM:
+ applyMode(GDropAuthScheme.PEM);
+ populateGridAccountInfo(GDropAuthScheme.PEM);
+ break;
+ case P12:
+ applyMode(GDropAuthScheme.P12);
+ populateGridAccountInfo(GDropAuthScheme.P12);
+ break;
+ case KEYSTORE:
+ applyMode(GDropAuthScheme.KEYSTORE);
+ populateGridAccountInfo(GDropAuthScheme.KEYSTORE);
+ break;
+ case PROXY:
+ applyMode(GDropAuthScheme.PROXY);
+ populateGridAccountInfo(GDropAuthScheme.PROXY);
break;
case KEYFS:
applyMode(GDropAuthScheme.KEYFS);
populateGridAccountInfo(GDropAuthScheme.KEYFS);
break;
- }
+ }
}
private void populateStandardGridAccountInfo() {
GDropAuthScheme authScheme = gridAccount.getGDropAuthScheme();
-
+
String host = gridAccount.getHost();
if (host != null) {
lblHostAddress.setText(host);
}
-
+
int port = gridAccount.getPort();
txtPort.setText(String.valueOf(port));
-
+
String zone = gridAccount.getZone();
if (zone != null) {
lblZoneValue.setText(zone);
}
-
+
String user = gridAccount.getUserName();
if (user != null) {
txtUsername.setText(user);
}
-
+
// need to get plain test password
GridAccountService gridAccountService = idropCore.getConveyorService().getGridAccountService();
IRODSAccount irodAccountForPswd = null;
@@ -914,14 +972,14 @@ public class GDropLoginDialog extends javax.swing.JDialog {
Logger.getLogger(GDropOldLoginDialog.class.getName()).log(
Level.SEVERE, null, ex);
JOptionPane.showMessageDialog(
- this,
- "Could not retrieve stored password for this account.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Could not retrieve stored password for this account.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
} catch (Exception e) {
// Account not found, but this is expected situation in case default grid is created in GridMemoryDialog
// QCG-Data specific feature
Logger.getLogger(GDropOldLoginDialog.class.getName()).log(
- Level.INFO, null, e);
+ Level.INFO, null, e);
// JOptionPane.showMessageDialog(
// this,
// "No user name and password.",
@@ -934,110 +992,110 @@ public class GDropLoginDialog extends javax.swing.JDialog {
txtPassword.setText(pswd);
txtVerifyPassword.setText(pswd);
}
-
+
String defResc = gridAccount.getDefaultResource();
if (defResc != null) {
txtDefaultResource.setText(defResc);
}
-
+
String initPath = gridAccount.getDefaultPath();
if (initPath != null) {
txtInitialPath.setText(initPath);
}
-
+
String comment = gridAccount.getComment();
if (comment != null) {
txtComment.setText(comment);
- }
+ }
}
private void populateGSIGridAccountInfo() {
GDropAuthScheme authScheme = gridAccount.getGDropAuthScheme();
+
+ /* String host = gridAccount.getHost();
+ if (host != null) {
+ lblHostAddress1.setText(host);
+ }
- String host = gridAccount.getHost();
- if (host != null) {
- lblHostAddress1.setText(host);
- }
-
- int port = gridAccount.getPort();
- txtPort1.setText(String.valueOf(port));
+ int port = gridAccount.getPort();
+ txtPort1.setText(String.valueOf(port));
- String zone = gridAccount.getZone();
- if (zone != null) {
- lblZoneValue1.setText(zone);
- }
+ String zone = gridAccount.getZone();
+ if (zone != null) {
+ lblZoneValue1.setText(zone);
+ }
- String defResc = gridAccount.getDefaultResource();
- if (defResc != null) {
- txtDefaultResource1.setText(defResc);
- }
+ String defResc = gridAccount.getDefaultResource();
+ if (defResc != null) {
+ txtDefaultResource1.setText(defResc);
+ }
- String initPath = gridAccount.getDefaultPath();
- if (initPath != null) {
- txtInitialPath1.setText(initPath);
- }
+ String initPath = gridAccount.getDefaultPath();
+ if (initPath != null) {
+ txtInitialPath1.setText(initPath);
+ }
- String comment = gridAccount.getComment();
- if (comment != null) {
- txtComment1.setText(comment);
- }
+ String comment = gridAccount.getComment();
+ if (comment != null) {
+ txtComment1.setText(comment);
+ } */
}
private void populateKeyFSGridAccountInfo() {
GDropAuthScheme authScheme = gridAccount.getGDropAuthScheme();
+
+ /* String host = gridAccount.getHost();
+ if (host != null) {
+ lblHostAddress2.setText(host);
+ }
- String host = gridAccount.getHost();
- if (host != null) {
- lblHostAddress2.setText(host);
- }
-
- int port = gridAccount.getPort();
- txtPort2.setText(String.valueOf(port));
+ int port = gridAccount.getPort();
+ txtPort2.setText(String.valueOf(port));
- String zone = gridAccount.getZone();
- if (zone != null) {
- lblZoneValue2.setText(zone);
- }
+ String zone = gridAccount.getZone();
+ if (zone != null) {
+ lblZoneValue2.setText(zone);
+ }
- String defResc = gridAccount.getDefaultResource();
- if (defResc != null) {
- txtDefaultResource2.setText(defResc);
- }
+ String defResc = gridAccount.getDefaultResource();
+ if (defResc != null) {
+ txtDefaultResource2.setText(defResc);
+ }
- String initPath = gridAccount.getDefaultPath();
- if (initPath != null) {
- txtInitialPath2.setText(initPath);
- }
+ String initPath = gridAccount.getDefaultPath();
+ if (initPath != null) {
+ txtInitialPath2.setText(initPath);
+ }
- // KeyFS specific fields - begin
- String plgridUsername = gridAccount.getPlgridUserName();
- if (plgridUsername != null) {
- txtplgridUsername.setText(plgridUsername);
- }
+ // KeyFS specific fields - begin
+ String plgridUsername = gridAccount.getPlgridUserName();
+ if (plgridUsername != null) {
+ txtplgridUsername.setText(plgridUsername);
+ }
- String plgridPassword = gridAccount.getPlgridPassword();
- if (plgridPassword != null) {
- txtPlgridPassword.setText(plgridPassword);
- }
+ String plgridPassword = gridAccount.getPlgridPassword();
+ if (plgridPassword != null) {
+ txtPlgridPassword.setText(plgridPassword);
+ }
- String plgridKeyPassword = gridAccount.getKeyPassword();
- if (plgridKeyPassword != null) {
- txtKeyPassword.setText(plgridKeyPassword);
- }
- // KeyFS specific fields - end
+ String plgridKeyPassword = gridAccount.getKeyPassword();
+ if (plgridKeyPassword != null) {
+ txtKeyPassword.setText(plgridKeyPassword);
+ }
+ // KeyFS specific fields - end
- String comment = gridAccount.getComment();
- if (comment != null) {
- txtComment2.setText(comment);
- }
+ String comment = gridAccount.getComment();
+ if (comment != null) {
+ txtComment2.setText(comment);
+ } */
}
private GDropIRODSAccount createIRODSAccountFromStandardForm() {
GDropIRODSAccount acct = null;
-
+
String host = this.gridAccount.getHost();
String strPort = txtPort.getText().trim();
- int port=0;
+ int port = 0;
if ((strPort != null) && (!strPort.isEmpty())) {
port = Integer.valueOf(strPort).intValue();
}
@@ -1056,21 +1114,21 @@ public class GDropLoginDialog extends javax.swing.JDialog {
homeBuilder.append(user);
initialPath = homeBuilder.toString();
}
-
+
// check to make sure passwords match
- if (! password.equals(verifyPassword)) {
+ if (!password.equals(verifyPassword)) {
JOptionPane.showMessageDialog(
- this,
- "Passwords do not match. Please try again.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Passwords do not match. Please try again.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
return acct;
}
-
+
GridAccountService gridAccountService = idropCore.getConveyorService().getGridAccountService();
-
+
// need to do this to retrieve plain text password
IRODSAccount irodAccountForPswd = null;
-
+
// not needed if collecting password from form
// try {
// irodAccountForPswd = gridAccountService.irodsAccountForGridAccount(gridAccount);
@@ -1082,29 +1140,29 @@ public class GDropLoginDialog extends javax.swing.JDialog {
// "Update of grid account failed. Could not store password.",
// "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
// }
-
+
try {
acct = GDropIRODSAccount.instance(host, port, user, password, initialPath, zone, defaultResc);
} catch (JargonException ex) {
JOptionPane.showMessageDialog(
- this,
- "Please enter grid account information. Host, port, zone, and user name are required.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Please enter grid account information. Host, port, zone, and user name are required.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
return acct;
} catch (IllegalArgumentException ex) {
JOptionPane.showMessageDialog(
- this,
- "Please enter grid account information. Host, port, zone, and user name are required.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Please enter grid account information. Host, port, zone, and user name are required.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
return acct;
}
-
+
// now add authorization scheme to gridaccount
GDropAuthScheme scheme = (GDropAuthScheme) cbAuthScheme.getSelectedItem();
if (scheme != null) {
acct.setGDropAuthenticationScheme(scheme);
}
-
+
return acct;
}
@@ -1114,10 +1172,10 @@ public class GDropLoginDialog extends javax.swing.JDialog {
private GDropIRODSAccount createIRODSAccountFromKeyFSForm() {
GDropIRODSAccount acct = null;
-
+
String host = this.gridAccount.getHost();
String strPort = txtPort.getText().trim();
- int port=0;
+ int port = 0;
if ((strPort != null) && (!strPort.isEmpty())) {
port = Integer.valueOf(strPort).intValue();
}
@@ -1137,13 +1195,13 @@ public class GDropLoginDialog extends javax.swing.JDialog {
homeBuilder.append(user);
initialPath = homeBuilder.toString();
}
-
-
+
+
GridAccountService gridAccountService = idropCore.getConveyorService().getGridAccountService();
-
+
// need to do this to retrieve plain text password
IRODSAccount irodAccountForPswd = null;
-
+
// not needed if collecting password from form
// try {
// irodAccountForPswd = gridAccountService.irodsAccountForGridAccount(gridAccount);
@@ -1155,49 +1213,69 @@ public class GDropLoginDialog extends javax.swing.JDialog {
// "Update of grid account failed. Could not store password.",
// "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
// }
-
+
try {
acct = GDropIRODSAccount.instance(host, port, user, plgridUser, plgridPassword, keyPassword, initialPath, zone, defaultResc);
} catch (JargonException ex) {
JOptionPane.showMessageDialog(
- this,
- "Please enter grid account information. Host, port, zone, and user name are required.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Please enter grid account information. Host, port, zone, and user name are required.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
return acct;
} catch (IllegalArgumentException ex) {
JOptionPane.showMessageDialog(
- this,
- "Please enter grid account information. Host, port, zone, and user name are required.",
- "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
+ this,
+ "Please enter grid account information. Host, port, zone, and user name are required.",
+ "Edit Grid Account", JOptionPane.ERROR_MESSAGE);
return acct;
}
-
+
// now add authorization scheme to gridaccount
GDropAuthScheme scheme = (GDropAuthScheme) cbAuthScheme.getSelectedItem();
if (scheme != null) {
acct.setGDropAuthenticationScheme(scheme);
}
-
+
return acct;
}
private void populateGridAccountInfo(GDropAuthScheme gDropAuthScheme) {
- if (gDropAuthScheme == GDropAuthScheme.STANDARD) {
- populateStandardGridAccountInfo();
- } else if (gDropAuthScheme == GDropAuthScheme.GSI) {
- populateGSIGridAccountInfo();
- } else if (gDropAuthScheme == GDropAuthScheme.KEYFS) {
- populateKeyFSGridAccountInfo();
+ switch (gDropAuthScheme) {
+ case STANDARD:
+ populateStandardGridAccountInfo();
+ break;
+ case PEM:
+ break;
+ case P12:
+ break;
+ case KEYSTORE:
+ break;
+ case PROXY:
+ break;
+ case KEYFS:
+ populateKeyFSGridAccountInfo();
+ break;
}
}
private GDropAuthScheme getSelectedAuthScheme() {
- if (pnlStandardLogin.isVisible()) {
- return GDropAuthScheme.STANDARD;
- } else if (pnlGSILogin.isVisible()) {
- return GDropAuthScheme.GSI;
- } else {
- return GDropAuthScheme.KEYFS;
+ GDropAuthScheme authScheme = (GDropAuthScheme) cbAuthScheme.getSelectedItem();
+ return authScheme;
+ }
+
+ private void selectFile(JTextField txtControl) {
+ if (txtControl == null) {
+ return;
}
+
+ // Show Open File dialog
+ JFileChooser fileChooser = new JFileChooser();
+ fileChooser.setVisible(true);
+ fileChooser.showOpenDialog(this);
+ // Write path of selected file to appropriate text control
+ File file = fileChooser.getSelectedFile();
+ if (file != null) {
+ txtControl.setText(file.getAbsolutePath());
+ }
}
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 4982856..98264d6 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
public static String VERSION="b964-SNAPSHOT";
- public static String BUILD_TIME="20131113-1028";
+ public static String BUILD_TIME="20131114-0926";
}
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/gdrop/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/gdrop/Bundle.properties
index 3d4aa73..414773b 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/gdrop/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/gdrop/Bundle.properties
@@ -241,58 +241,52 @@ GDropOldLoginDialog.lblComment1.text=Comment:
GDropOldLoginDialog.txtDefaultResource1.text=
GDropOldLoginDialog.lblZoneValue1.text=
GDropOldLoginDialog.txtInitialPath1.text=
-GDropLoginDialog.lblDefaultResource.text=Default resource
-GDropLoginDialog.txtDefaultResource.text=Example default resource
GDropLoginDialog.btnOK.toolTipText_1=Save information and log in
GDropLoginDialog.btnOK.text=
GDropLoginDialog.btnCancel.toolTipText_1=cancel
GDropLoginDialog.btnCancel.text=
-GDropLoginDialog.lblHost.text_1=Host
-GDropLoginDialog.lblComment.text_1=Comment
-GDropLoginDialog.txtPort.text=Example port
-GDropLoginDialog.txtInitialPath.text_1=Example starting collection
-GDropLoginDialog.lblPort.text_1=Port
-GDropLoginDialog.lblStartingCollection.text=Starting collection
-GDropLoginDialog.lblHostAddress.text=Example host
-GDropLoginDialog.lblZone.text_1=Zone
-GDropLoginDialog.lblZoneValue.text=Example zone
-GDropLoginDialog.txtComment.text=Example comment
GDropLoginDialog.lblVerifyPassword.text=Verify password
GDropLoginDialog.txtPassword.text=
-GDropLoginDialog.lblAuthScheme.text_1=Authorization scheme
GDropLoginDialog.txtVerifyPassword.text=
-GDropLoginDialog.txtUsername.text=Example username
-GDropLoginDialog.lblUsername.text_1=Username
GDropLoginDialog.lblPassword.text=Password
-GDropLoginDialog.lblHostAddress1.text=Example host
-GDropLoginDialog.lblHost1.text=Host
-GDropLoginDialog.txtComment1.text=Example comment
-GDropLoginDialog.lblComment1.text=Comment
-GDropLoginDialog.txtInitialPath1.text=Example starting collection
-GDropLoginDialog.lblStartingCollection1.text=Starting collection
-GDropLoginDialog.txtDefaultResource1.text=Example default resource
-GDropLoginDialog.lblDefaultResource1.text=Default resource
-GDropLoginDialog.lblZoneValue1.text=Example zone
-GDropLoginDialog.lblZone1.text=Zone
-GDropLoginDialog.txtPort1.text=Example port
-GDropLoginDialog.lblPort1.text=Port
-GDropLoginDialog.lblHost2.text=Host
-GDropLoginDialog.txtComment2.text=Example comment
-GDropLoginDialog.lblComment2.text=Comment
-GDropLoginDialog.txtInitialPath2.text=Example starting collection
-GDropLoginDialog.lblStartingCollection2.text=Starting collection
-GDropLoginDialog.txtDefaultResource2.text=Example default resource
-GDropLoginDialog.lblDefaultResource2.text=Default resource
-GDropLoginDialog.lblZoneValue2.text=Example zone
-GDropLoginDialog.lblZone2.text=Zone
-GDropLoginDialog.txtPort2.text=Example port
-GDropLoginDialog.lblPort2.text=Port
-GDropLoginDialog.lblHostAddress2.text=Example host
GDropLoginDialog.txtplgridUsername.text=plg
GDropLoginDialog.lblPlgridUsername.text=PL-Grid username
GDropLoginDialog.lblPlgridPassword.text=PL-Grid password
GDropLoginDialog.txtPlgridPassword.text=
-GDropLoginDialog.lblAuthSchemeKeyFS.text=Authorization scheme
-GDropLoginDialog.lblAuthSchemeGSI.text=Authorization scheme
GDropLoginDialog.txtKeyPassword.text=
GDropLoginDialog.lblKeyPassword.text=PL-Grid key password
+GDropLoginDialog.lblHost.text=Host
+GDropLoginDialog.lblHostAddress.text=Example host
+GDropLoginDialog.lblPort.text=Port
+GDropLoginDialog.txtPort.text=Example port
+GDropLoginDialog.lblZone.text=Zone
+GDropLoginDialog.lblZoneValue.text=Example zone
+GDropLoginDialog.lblUsername.text=Username
+GDropLoginDialog.txtUsername.text=Example username
+GDropLoginDialog.lblAuthScheme.text=Authorization scheme
+GDropLoginDialog.lblDefaultResource.text=Default resource
+GDropLoginDialog.txtDefaultResource.text=Example default resource
+GDropLoginDialog.lblStartingCollection.text=Starting collection
+GDropLoginDialog.txtInitialPath.text=Example starting collection
+GDropLoginDialog.lblComment.text=Comment
+GDropLoginDialog.txtComment.text=Example comment
+GDropLoginDialog.lblPEMCert.text=Cert
+GDropLoginDialog.txtPEMCert.text=
+GDropLoginDialog.lblPEMKey.text=Key
+GDropLoginDialog.txtPEMKey.text=
+GDropLoginDialog.lblPEMCertPassword.text=Password
+GDropLoginDialog.txtPEMCertPassword.text=
+GDropLoginDialog.btnChoosePEMCert.text=...
+GDropLoginDialog.btnChoosePEMKey.text=...
+GDropLoginDialog.lblP12Cert.text=Cert
+GDropLoginDialog.txtP12Cert.text=
+GDropLoginDialog.lblP12CertPassword.text=Password
+GDropLoginDialog.txtP12CertPassword.text=
+GDropLoginDialog.btnChooseP12Cert.text=...
+GDropLoginDialog.lblProxyCert.text=Cert
+GDropLoginDialog.txtProxyCert.text=
+GDropLoginDialog.btnChooseProxyCert.text=...
+GDropLoginDialog.txtKeystoreCertPassword.text=
+GDropLoginDialog.lblKeystoreCertPassword.text=Password
+GDropLoginDialog.lblKeystoreBrowser.text=Browser
+GDropLoginDialog.lblKeystoreCert.text=Cert