summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-17 04:14:05 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-17 04:14:05 (GMT)
commit0d31b23376f102bfde4dcea650f4691e97aff048 (patch)
tree5ee0f93d186db65888037a2942e5756977ccfc7e
parentfbc1b511718146a4982c01f5858075b135b82e55 (diff)
downloadQCG-Data-0d31b23376f102bfde4dcea650f4691e97aff048.zip
QCG-Data-0d31b23376f102bfde4dcea650f4691e97aff048.tar.gz
QCG-Data-0d31b23376f102bfde4dcea650f4691e97aff048.tar.bz2
more setup wizard for synch
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form241
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java141
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.form14
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java64
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties10
-rw-r--r--idrop-swing/src/main/resources/org/irods/jargon/idrop/finder/Bundle.properties8
6 files changed, 328 insertions, 150 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
index 852e825..a83f32a 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.form
@@ -1,6 +1,10 @@
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+ <NonVisualComponents>
+ <Component class="javax.swing.ButtonGroup" name="bnGroupSynchType">
+ </Component>
+ </NonVisualComponents>
<Properties>
<Property name="defaultCloseOperation" type="int" value="0"/>
<Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -20,13 +24,16 @@
<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,-86,0,0,3,103"/>
+ <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,-16,0,0,3,-38"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JPanel" name="panelTop">
<Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="66" green="66" red="66" type="rgb"/>
+ </Property>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Lucida Grande" size="12" style="0"/>
</Property>
@@ -61,6 +68,11 @@
</SubComponents>
</Container>
<Container class="javax.swing.JTabbedPane" name="tabWizardTabs">
+ <Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="66" green="66" red="66" type="rgb"/>
+ </Property>
+ </Properties>
<Events>
<EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="tabWizardTabsKeyPressed"/>
</Events>
@@ -299,101 +311,143 @@
</Constraint>
</Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Container class="javax.swing.JPanel" name="pnlLocalSynch">
+ <Container class="javax.swing.JPanel" name="pnlSynchData">
<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"/>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+ <BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+ <Property name="columns" type="int" value="1"/>
+ <Property name="rows" type="int" value="0"/>
+ </Layout>
<SubComponents>
- <Component class="javax.swing.JButton" name="btnChooseLocalSynch">
+ <Container class="javax.swing.JPanel" name="pnlLocalSynch">
+
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JTextField" name="txtLocalPath">
+ <Properties>
+ <Property name="columns" type="int" value="80"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtLocalPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtLocalPath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtLocalPathActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JButton" name="btnChooseLocalSynch">
+ <Properties>
+ <Property name="mnemonic" type="int" value="99"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseLocalSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseLocalSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseLocalSynchActionPerformed"/>
+ </Events>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlSynchMode">
<Properties>
- <Property name="mnemonic" type="int" value="99"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseLocalSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseLocalSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+ <LineBorder/>
+ </Border>
</Property>
</Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseLocalSynchActionPerformed"/>
- </Events>
- </Component>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="pnlSynchMode">
- <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>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="100" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="100" max="32767" attributes="0"/>
- </Group>
- </DimensionLayout>
- </Layout>
- </Container>
- <Container class="javax.swing.JPanel" name="pnlIrodsSynch">
- <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"/>
- </Constraint>
- </Constraints>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
+ <Property name="columns" type="int" value="1"/>
+ <Property name="rows" type="int" value="0"/>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JRadioButton" name="radioBackup">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="bnGroupSynchType"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.radioBackup.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JRadioButton" name="radioFeed">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="bnGroupSynchType"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.radioFeed.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JRadioButton" name="radioSynch">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="bnGroupSynchType"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.radioSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="enabled" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="pnlIrodsSynch">
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="180" max="32767" attributes="0"/>
- <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="0" pref="1" max="32767" attributes="0"/>
- <Component id="btnChooseIrodsSynch" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="0" pref="2" max="32767" attributes="0"/>
- </Group>
- </Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <EmptySpace min="0" pref="100" max="32767" attributes="0"/>
- <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace min="0" pref="35" max="32767" attributes="0"/>
- <Component id="btnChooseIrodsSynch" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="0" pref="36" max="32767" attributes="0"/>
- </Group>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JButton" name="btnChooseIrodsSynch">
- <Properties>
- <Property name="mnemonic" type="int" value="105"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseIrodsSynchActionPerformed"/>
- </Events>
- </Component>
+ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
+ <SubComponents>
+ <Component class="javax.swing.JTextField" name="txtIrodsPath">
+ <Properties>
+ <Property name="columns" type="int" value="80"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.txtIrodsPath.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtIrodsPathActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JButton" name="btnChooseIrodsSynch">
+ <Properties>
+ <Property name="mnemonic" type="int" value="105"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnChooseIrodsSynch.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnChooseIrodsSynchActionPerformed"/>
+ </Events>
+ </Component>
+ </SubComponents>
+ </Container>
</SubComponents>
</Container>
</SubComponents>
@@ -404,6 +458,9 @@
</Container>
<Container class="javax.swing.JPanel" name="pnlWizardToolbar">
<Properties>
+ <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+ <Color blue="66" green="66" red="66" type="rgb"/>
+ </Property>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
<EtchetBorder/>
@@ -432,6 +489,20 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBackActionPerformed"/>
</Events>
</Component>
+ <Component class="javax.swing.JButton" name="btnForward">
+ <Properties>
+ <Property name="mnemonic" type="int" value="98"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnForward.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties" key="SetupWizard.btnForward.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnForwardActionPerformed"/>
+ </Events>
+ </Component>
<Component class="javax.swing.JButton" name="btnLater">
<Properties>
<Property name="mnemonic" type="int" value="108"/>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
index 0933b7d..8ec63c0 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java
@@ -66,8 +66,8 @@ public class SetupWizard extends javax.swing.JDialog {
// <editor-fold defaultstate="collapsed"
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
+ bnGroupSynchType = new javax.swing.ButtonGroup();
panelTop = new javax.swing.JPanel();
lblWelcome = new javax.swing.JLabel();
tabWizardTabs = new javax.swing.JTabbedPane();
@@ -91,19 +91,28 @@ public class SetupWizard extends javax.swing.JDialog {
scrollInitialSynchSetupQuestion = new javax.swing.JScrollPane();
txtInitialSynchSetupQuestion = new javax.swing.JTextArea();
pnlInitialSynchSetupAnswer = new javax.swing.JPanel();
+ pnlSynchData = new javax.swing.JPanel();
pnlLocalSynch = new javax.swing.JPanel();
+ txtLocalPath = new javax.swing.JTextField();
btnChooseLocalSynch = new javax.swing.JButton();
pnlSynchMode = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ radioBackup = new javax.swing.JRadioButton();
+ radioFeed = new javax.swing.JRadioButton();
+ radioSynch = new javax.swing.JRadioButton();
pnlIrodsSynch = new javax.swing.JPanel();
+ txtIrodsPath = new javax.swing.JTextField();
btnChooseIrodsSynch = new javax.swing.JButton();
pnlWizardToolbar = new javax.swing.JPanel();
btnBack = new javax.swing.JButton();
+ btnForward = new javax.swing.JButton();
btnLater = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
setTitle(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.title")); // NOI18N
- panelTop.setFont(new java.awt.Font("Lucida Grande", 0, 12));
+ panelTop.setBackground(new java.awt.Color(102, 102, 102));
+ panelTop.setFont(new java.awt.Font("Lucida Grande", 0, 12)); // NOI18N
lblWelcome.setFont(new java.awt.Font("Lucida Grande", 0, 18));
lblWelcome.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.lblWelcome.text")); // NOI18N
@@ -114,6 +123,7 @@ public class SetupWizard extends javax.swing.JDialog {
getContentPane().add(panelTop, java.awt.BorderLayout.NORTH);
+ tabWizardTabs.setBackground(new java.awt.Color(102, 102, 102));
tabWizardTabs.addKeyListener(new java.awt.event.KeyAdapter() {
public void keyPressed(java.awt.event.KeyEvent evt) {
tabWizardTabsKeyPressed(evt);
@@ -207,7 +217,19 @@ public class SetupWizard extends javax.swing.JDialog {
pnlInitialSynchSetup.add(pnlInitialSynchSetupQuestion, java.awt.BorderLayout.CENTER);
- pnlInitialSynchSetupAnswer.setLayout(new java.awt.GridBagLayout());
+ pnlInitialSynchSetupAnswer.setLayout(new java.awt.BorderLayout());
+
+ pnlSynchData.setLayout(new java.awt.GridLayout(0, 1));
+
+ txtLocalPath.setColumns(80);
+ txtLocalPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtLocalPath.text")); // NOI18N
+ txtLocalPath.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtLocalPath.toolTipText")); // NOI18N
+ txtLocalPath.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtLocalPathActionPerformed(evt);
+ }
+ });
+ pnlLocalSynch.add(txtLocalPath);
btnChooseLocalSynch.setMnemonic('c');
btnChooseLocalSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseLocalSynch.text")); // NOI18N
@@ -219,23 +241,39 @@ public class SetupWizard extends javax.swing.JDialog {
});
pnlLocalSynch.add(btnChooseLocalSynch);
- pnlInitialSynchSetupAnswer.add(pnlLocalSynch, new java.awt.GridBagConstraints());
+ pnlSynchData.add(pnlLocalSynch);
+
+ pnlSynchMode.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+ pnlSynchMode.setLayout(new java.awt.GridLayout(0, 1));
+
+ jLabel1.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.jLabel1.text")); // NOI18N
+ pnlSynchMode.add(jLabel1);
- org.jdesktop.layout.GroupLayout pnlSynchModeLayout = new org.jdesktop.layout.GroupLayout(pnlSynchMode);
- pnlSynchMode.setLayout(pnlSynchModeLayout);
- pnlSynchModeLayout.setHorizontalGroup(
- pnlSynchModeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 100, Short.MAX_VALUE)
- );
- pnlSynchModeLayout.setVerticalGroup(
- pnlSynchModeLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 100, Short.MAX_VALUE)
- );
+ bnGroupSynchType.add(radioBackup);
+ radioBackup.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.radioBackup.text")); // NOI18N
+ pnlSynchMode.add(radioBackup);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- pnlInitialSynchSetupAnswer.add(pnlSynchMode, gridBagConstraints);
+ bnGroupSynchType.add(radioFeed);
+ radioFeed.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.radioFeed.text")); // NOI18N
+ radioFeed.setEnabled(false);
+ pnlSynchMode.add(radioFeed);
+
+ bnGroupSynchType.add(radioSynch);
+ radioSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.radioSynch.text")); // NOI18N
+ radioSynch.setEnabled(false);
+ pnlSynchMode.add(radioSynch);
+
+ pnlSynchData.add(pnlSynchMode);
+
+ txtIrodsPath.setColumns(80);
+ txtIrodsPath.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.text")); // NOI18N
+ txtIrodsPath.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.txtIrodsPath.toolTipText")); // NOI18N
+ txtIrodsPath.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ txtIrodsPathActionPerformed(evt);
+ }
+ });
+ pnlIrodsSynch.add(txtIrodsPath);
btnChooseIrodsSynch.setMnemonic('i');
btnChooseIrodsSynch.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnChooseIrodsSynch.text")); // NOI18N
@@ -245,32 +283,11 @@ public class SetupWizard extends javax.swing.JDialog {
btnChooseIrodsSynchActionPerformed(evt);
}
});
+ pnlIrodsSynch.add(btnChooseIrodsSynch);
- org.jdesktop.layout.GroupLayout pnlIrodsSynchLayout = new org.jdesktop.layout.GroupLayout(pnlIrodsSynch);
- pnlIrodsSynch.setLayout(pnlIrodsSynchLayout);
- pnlIrodsSynchLayout.setHorizontalGroup(
- pnlIrodsSynchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 180, Short.MAX_VALUE)
- .add(pnlIrodsSynchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlIrodsSynchLayout.createSequentialGroup()
- .add(0, 1, Short.MAX_VALUE)
- .add(btnChooseIrodsSynch)
- .add(0, 2, Short.MAX_VALUE)))
- );
- pnlIrodsSynchLayout.setVerticalGroup(
- pnlIrodsSynchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 100, Short.MAX_VALUE)
- .add(pnlIrodsSynchLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(pnlIrodsSynchLayout.createSequentialGroup()
- .add(0, 35, Short.MAX_VALUE)
- .add(btnChooseIrodsSynch)
- .add(0, 36, Short.MAX_VALUE)))
- );
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- pnlInitialSynchSetupAnswer.add(pnlIrodsSynch, gridBagConstraints);
+ pnlSynchData.add(pnlIrodsSynch);
+
+ pnlInitialSynchSetupAnswer.add(pnlSynchData, java.awt.BorderLayout.CENTER);
pnlInitialSynchSetup.add(pnlInitialSynchSetupAnswer, java.awt.BorderLayout.SOUTH);
@@ -278,6 +295,7 @@ public class SetupWizard extends javax.swing.JDialog {
getContentPane().add(tabWizardTabs, java.awt.BorderLayout.CENTER);
+ pnlWizardToolbar.setBackground(new java.awt.Color(102, 102, 102));
pnlWizardToolbar.setBorder(javax.swing.BorderFactory.createEtchedBorder());
btnBack.setMnemonic('b');
@@ -290,6 +308,16 @@ public class SetupWizard extends javax.swing.JDialog {
});
pnlWizardToolbar.add(btnBack);
+ btnForward.setMnemonic('b');
+ btnForward.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnForward.text")); // NOI18N
+ btnForward.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnForward.toolTipText")); // NOI18N
+ btnForward.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnForwardActionPerformed(evt);
+ }
+ });
+ pnlWizardToolbar.add(btnForward);
+
btnLater.setMnemonic('l');
btnLater.setText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnLater.text")); // NOI18N
btnLater.setToolTipText(org.openide.util.NbBundle.getMessage(SetupWizard.class, "SetupWizard.btnLater.toolTipText")); // NOI18N
@@ -366,6 +394,7 @@ public class SetupWizard extends javax.swing.JDialog {
localFileChooser.setMultiSelectionEnabled(false);
localFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
int returnVal = localFileChooser.showOpenDialog(this);
+ txtLocalPath.setText(localFileChooser.getSelectedFile().getAbsolutePath());
}//GEN-LAST:event_btnChooseLocalSynchActionPerformed
private void btnChooseIrodsSynchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseIrodsSynchActionPerformed
@@ -377,6 +406,11 @@ public class SetupWizard extends javax.swing.JDialog {
final int y = (screenSize.height - irodsFileSystemChooserView.getHeight()) / 2;
irodsFileSystemChooserView.setLocation(x, y);
irodsFileSystemChooserView.setVisible(true);
+ String absPath = irodsFileSystemChooserView.getSelectedAbsolutePath();
+ irodsFileSystemChooserView.dispose();
+ if (absPath != null) {
+ txtIrodsPath.setText(irodsFileSystemChooserView.getSelectedAbsolutePath());
+ }
// int returnVal = irodsFileChooser.showSaveDialog(this);
} catch (Exception e) {
@@ -387,6 +421,18 @@ public class SetupWizard extends javax.swing.JDialog {
}
}//GEN-LAST:event_btnChooseIrodsSynchActionPerformed
+ private void txtIrodsPathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtIrodsPathActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtIrodsPathActionPerformed
+
+ private void txtLocalPathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtLocalPathActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_txtLocalPathActionPerformed
+
+ private void btnForwardActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnForwardActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_btnForwardActionPerformed
+
private void btnSeeSystemTrayNoActionPerformed(
final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnSeeSystemTrayNoActionPerformed
log.info("indicates system try not shown, set to always load gui");
@@ -428,13 +474,16 @@ public class SetupWizard extends javax.swing.JDialog {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.ButtonGroup bnGroupSynchType;
private javax.swing.JButton btnBack;
private javax.swing.JButton btnChooseIrodsSynch;
private javax.swing.JButton btnChooseLocalSynch;
+ private javax.swing.JButton btnForward;
private javax.swing.JButton btnLater;
private javax.swing.JButton btnSeeSystemTrayNo;
private javax.swing.JButton btnSeeSystemTrayYes;
private javax.swing.JButton btnSetDeviceName;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
private javax.swing.JLabel lblDeviceName;
@@ -451,12 +500,18 @@ public class SetupWizard extends javax.swing.JDialog {
private javax.swing.JPanel pnlInitialSynchSetupQuestion;
private javax.swing.JPanel pnlIrodsSynch;
private javax.swing.JPanel pnlLocalSynch;
+ private javax.swing.JPanel pnlSynchData;
private javax.swing.JPanel pnlSynchMode;
private javax.swing.JPanel pnlWizardToolbar;
+ private javax.swing.JRadioButton radioBackup;
+ private javax.swing.JRadioButton radioFeed;
+ private javax.swing.JRadioButton radioSynch;
private javax.swing.JScrollPane scrollInitialSynchSetupQuestion;
private javax.swing.JTabbedPane tabWizardTabs;
private javax.swing.JTextField txtDeviceName;
private javax.swing.JTextArea txtInitialSynchSetupQuestion;
+ private javax.swing.JTextField txtIrodsPath;
+ private javax.swing.JTextField txtLocalPath;
private javax.swing.JTextArea txtSeeIcon;
private javax.swing.JTextArea txtSeeIcon1;
// End of variables declaration//GEN-END:variables
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.form
index 6cae3e6..14359d1 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.form
@@ -119,14 +119,6 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
- <Component class="javax.swing.JButton" name="btnNewFolder">
- <Properties>
- <Property name="mnemonic" type="int" value="110"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/irods/jargon/idrop/finder/Bundle.properties" key="IRODSFinderDialog.btnNewFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
- </Property>
- </Properties>
- </Component>
<Component class="javax.swing.JButton" name="btnCancel">
<Properties>
<Property name="mnemonic" type="int" value="99"/>
@@ -134,6 +126,9 @@
<ResourceString bundle="org/irods/jargon/idrop/finder/Bundle.properties" key="IRODSFinderDialog.btnCancel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCancelActionPerformed"/>
+ </Events>
</Component>
<Component class="javax.swing.JButton" name="btnSelectFolder">
<Properties>
@@ -142,6 +137,9 @@
<ResourceString bundle="org/irods/jargon/idrop/finder/Bundle.properties" key="IRODSFinderDialog.btnSelectFolder.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSelectFolderActionPerformed"/>
+ </Events>
</Component>
</SubComponents>
</Container>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
index db80082..abc37cf 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/finder/IRODSFinderDialog.java
@@ -11,9 +11,11 @@
package org.irods.jargon.idrop.finder;
import java.util.logging.Level;
+import javax.swing.ListSelectionModel;
import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry;
import org.irods.jargon.idrop.desktop.systraygui.IDROPCore;
import org.irods.jargon.idrop.desktop.systraygui.IRODSTreeContainingComponent;
+import org.irods.jargon.idrop.desktop.systraygui.MessageManager;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSFileSystemModel;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSNode;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSOutlineModel;
@@ -29,6 +31,11 @@ import org.slf4j.LoggerFactory;
public class IRODSFinderDialog extends javax.swing.JDialog {
private final IDROPCore idropCore;
+ private String selectedAbsolutePath = null;
+
+ public String getSelectedAbsolutePath() {
+ return selectedAbsolutePath;
+ }
public IDROPCore getIdropCore() {
return idropCore;
@@ -105,6 +112,9 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
} catch (Exception ex) {
log.error("exception building finder tree", ex);
throw new IdropRuntimeException(ex);
+ } finally {
+ idropCore.getIrodsFileSystem().closeAndEatExceptions(
+ idropCore.getIrodsAccount());
}
scrollIrodsTree.setViewportView(irodsTree);
@@ -113,8 +123,6 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
irodsTree.setRefreshingTree(false);
- idropCore.getIrodsFileSystem().closeAndEatExceptions(
- idropCore.getIrodsAccount());
}
});
}
@@ -136,7 +144,6 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
pnlIrodsTreeMaster = new javax.swing.JPanel();
scrollIrodsTree = new javax.swing.JScrollPane();
bottomPanel = new javax.swing.JPanel();
- btnNewFolder = new javax.swing.JButton();
btnCancel = new javax.swing.JButton();
btnSelectFolder = new javax.swing.JButton();
@@ -183,16 +190,22 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
getContentPane().add(treePanel, java.awt.BorderLayout.PAGE_START);
- btnNewFolder.setMnemonic('n');
- btnNewFolder.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.btnNewFolder.text")); // NOI18N
- bottomPanel.add(btnNewFolder);
-
btnCancel.setMnemonic('c');
btnCancel.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.btnCancel.text")); // NOI18N
+ btnCancel.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnCancelActionPerformed(evt);
+ }
+ });
bottomPanel.add(btnCancel);
btnSelectFolder.setMnemonic('s');
btnSelectFolder.setText(org.openide.util.NbBundle.getMessage(IRODSFinderDialog.class, "IRODSFinderDialog.btnSelectFolder.text")); // NOI18N
+ btnSelectFolder.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnSelectFolderActionPerformed(evt);
+ }
+ });
bottomPanel.add(btnSelectFolder);
getContentPane().add(bottomPanel, java.awt.BorderLayout.PAGE_END);
@@ -201,13 +214,46 @@ public class IRODSFinderDialog extends javax.swing.JDialog {
}// </editor-fold>//GEN-END:initComponents
private void btnRefreshTargetTreeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRefreshTargetTreeActionPerformed
- // TODO add your handling code here:
+ buildTargetTree();
}//GEN-LAST:event_btnRefreshTargetTreeActionPerformed
+ private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
+ this.selectedAbsolutePath = null;
+ this.setVisible(false);
+ }//GEN-LAST:event_btnCancelActionPerformed
+
+ private void btnSelectFolderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSelectFolderActionPerformed
+
+ IRODSFinderOutlineModel irodsFileSystemModel = (IRODSFinderOutlineModel) irodsTree.getModel();
+
+
+ ListSelectionModel selectionModel = irodsTree.getSelectionModel();
+ int idx = selectionModel.getLeadSelectionIndex();
+
+ if (idx == -1) {
+ MessageManager.showWarning(this, "Please select a directory", MessageManager.TITLE_MESSAGE);
+ return;
+
+}
+
+ // use first selection for info
+ IRODSNode selectedNode = (IRODSNode) irodsFileSystemModel.getValueAt(
+ idx, 0);
+ log.info("selected node:{}", selectedNode);
+ CollectionAndDataObjectListingEntry entry = (CollectionAndDataObjectListingEntry) selectedNode.getUserObject();
+ if (entry.getObjectType() == CollectionAndDataObjectListingEntry.ObjectType.DATA_OBJECT) {
+ MessageManager.showWarning(this, "Please select a directory", MessageManager.TITLE_MESSAGE);
+ return;
+ }
+
+ this.selectedAbsolutePath = entry.getFormattedAbsolutePath();
+ this.setVisible(false);
+
+ }//GEN-LAST:event_btnSelectFolderActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel bottomPanel;
private javax.swing.JButton btnCancel;
- private javax.swing.JButton btnNewFolder;
private javax.swing.JButton btnRefreshTargetTree;
private javax.swing.JButton btnSelectFolder;
private javax.swing.JPanel pnlIrodsTreeMaster;
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
index 3ac7782..80381e8 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/desktop/systraygui/viscomponents/Bundle.properties
@@ -23,3 +23,13 @@ SetupWizard.btnChooseLocalSynch.toolTipText=Choose the local folder
SetupWizard.btnChooseIrodsSynch.text=Choose iRODS Folder
SetupWizard.btnChooseIrodsSynch.toolTipText=Choose an iRODS synch folder
SetupWizard.title=iDrop Setup Wizard
+SetupWizard.txtIrodsPath.text=
+SetupWizard.txtIrodsPath.toolTipText=iRODS path for synch
+SetupWizard.txtLocalPath.toolTipText=iRODS path for synch
+SetupWizard.txtLocalPath.text=
+SetupWizard.radioBackup.text=local -> iRODS backup
+SetupWizard.radioFeed.text=local <- iRODS feed
+SetupWizard.radioSynch.text=local <->iRODS Synchronization
+SetupWizard.jLabel1.text=Select a synchronization mode
+SetupWizard.btnForward.text=Forward >>
+SetupWizard.btnForward.toolTipText=Go to previous screen
diff --git a/idrop-swing/src/main/resources/org/irods/jargon/idrop/finder/Bundle.properties b/idrop-swing/src/main/resources/org/irods/jargon/idrop/finder/Bundle.properties
index fddf9ac..5dd2f57 100644
--- a/idrop-swing/src/main/resources/org/irods/jargon/idrop/finder/Bundle.properties
+++ b/idrop-swing/src/main/resources/org/irods/jargon/idrop/finder/Bundle.properties
@@ -1,8 +1,6 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-IRODSFinderDialog.btnCancel.text=Cancel
IRODSFinderDialog.btnRefreshTargetTree.toolTipText=Refresh the view of the iRODS server
IRODSFinderDialog.btnRefreshTargetTree.text=Refresh
-IRODSFinderDialog.btnNewFolder.text=New Folder
IRODSFinderDialog.btnSelectFolder.text=Select
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+IRODSFinderDialog.btnCancel.text=Cancel