summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-03-31 20:37:44 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-03-31 20:37:44 (GMT)
commit2b734a9d1f15da67ab16ebb146c94788be693188 (patch)
treeac7fda39a62415c1991ea83ddd7f497bea6da033 /idrop-swing
parentdd83962e21cab0135e02dec6f8ed9781c3c80545 (diff)
downloadQCG-Data-2b734a9d1f15da67ab16ebb146c94788be693188.zip
QCG-Data-2b734a9d1f15da67ab16ebb146c94788be693188.tar.gz
QCG-Data-2b734a9d1f15da67ab16ebb146c94788be693188.tar.bz2
working on synch testing
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/pom.xml17
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.form153
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.java227
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java10
-rw-r--r--idrop-swing/src/main/resources/log4j.properties9
5 files changed, 410 insertions, 6 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index 8a9bd17..5b84685 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -110,7 +110,22 @@
</dependency>
<dependency>
<groupId>org.irods.jargon</groupId>
- <artifactId>jargon-security</artifactId>
+ <artifactId>jargon-data-utils</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-user-tagging</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.irods.jargon.transfer</groupId>
+ <artifactId>jargon-transfer-engine</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.form
new file mode 100644
index 0000000..09e2c57
--- /dev/null
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.form
@@ -0,0 +1,153 @@
+<?xml version="1.1" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+ <Properties>
+ <Property name="defaultCloseOperation" type="int" value="2"/>
+ </Properties>
+ <SyntheticProperties>
+ <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+ </SyntheticProperties>
+ <AuxValues>
+ <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+ <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
+ </AuxValues>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="1" attributes="0">
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="btnUpdateTimestamps" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
+ <Group type="102" alignment="0" attributes="1">
+ <Component id="lblDeviceName1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="txtIrodsPath" min="-2" pref="394" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="lblDeviceName" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="txtDeviceName" min="-2" pref="394" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ <Group type="102" alignment="1" attributes="0">
+ <Component id="lblDeviceName2" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="36" max="32767" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Group type="102" alignment="0" attributes="1">
+ <Component id="btnAdd" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ <Component id="btnSynch" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <Component id="localPath" alignment="0" min="-2" pref="394" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </Group>
+ </Group>
+ </Group>
+ <EmptySpace min="-2" pref="279" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" pref="67" max="-2" attributes="0"/>
+ <Component id="jLabel1" min="-2" pref="604" max="-2" attributes="0"/>
+ <EmptySpace pref="153" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="lblDeviceName" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="txtDeviceName" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="lblDeviceName1" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="txtIrodsPath" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="lblDeviceName2" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="localPath" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="btnAdd" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="btnSynch" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Component id="btnUpdateTimestamps" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="25" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="lblDeviceName">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Device Name:"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="txtDeviceName">
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblDeviceName1">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="iRODS Path:"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="txtIrodsPath">
+ </Component>
+ <Component class="javax.swing.JLabel" name="lblDeviceName2">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Local Path:"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="localPath">
+ </Component>
+ <Component class="javax.swing.JButton" name="btnAdd">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Add Device"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JButton" name="btnSynch">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Synch"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSynchActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JButton" name="btnUpdateTimestamps">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Update Timestamps"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnUpdateTimestampsActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Testing only....."/>
+ </Properties>
+ </Component>
+ </SubComponents>
+</Form>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.java
new file mode 100644
index 0000000..47f63d5
--- /dev/null
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/SynchSetupDialog.java
@@ -0,0 +1,227 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/*
+ * SynchSetupDialog.java
+ *
+ * Created on Mar 22, 2011, 10:34:06 AM
+ */
+
+package org.irods.jargon.idrop.desktop.systraygui;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.irods.jargon.core.exception.DuplicateDataException;
+import org.irods.jargon.core.exception.JargonException;
+import org.irods.jargon.core.pub.IRODSFileSystem;
+import org.irods.jargon.datautils.synchproperties.SynchPropertiesService;
+import org.irods.jargon.datautils.synchproperties.SynchPropertiesServiceImpl;
+import org.irods.jargon.datautils.tree.FileTreeDiffUtilityImpl;
+import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
+import org.irods.jargon.transfer.synch.SynchronizeProcessor;
+import org.irods.jargon.transfer.synch.SynchronizeProcessorImpl;
+
+/**
+ *
+ * @author mikeconway
+ */
+public class SynchSetupDialog extends javax.swing.JDialog {
+
+ private final IDROPCore idropCore;
+ private final IRODSFileSystem irodsFileSystem;
+ private final SynchPropertiesService synchPropertiesService;
+
+ /** Creates new form SynchSetupDialog */
+ public SynchSetupDialog(iDrop parent, IDROPCore idropCore, IRODSFileSystem irodsFileSystem) {
+ super(parent, false);
+ this.idropCore = idropCore;
+ this.irodsFileSystem = irodsFileSystem;
+ initComponents();
+ try {
+ synchPropertiesService = new SynchPropertiesServiceImpl(irodsFileSystem.getIRODSAccessObjectFactory(), idropCore.getIrodsAccount());
+ } catch (JargonException ex) {
+ Logger.getLogger(SynchSetupDialog.class.getName()).log(Level.SEVERE, null, ex);
+ throw new IdropRuntimeException("unable to build synchPropertiesService", ex);
+ }
+ }
+
+ /** This method is called from within the constructor to
+ * initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is
+ * always regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ lblDeviceName = new javax.swing.JLabel();
+ txtDeviceName = new javax.swing.JTextField();
+ lblDeviceName1 = new javax.swing.JLabel();
+ txtIrodsPath = new javax.swing.JTextField();
+ lblDeviceName2 = new javax.swing.JLabel();
+ localPath = new javax.swing.JTextField();
+ btnAdd = new javax.swing.JButton();
+ btnSynch = new javax.swing.JButton();
+ btnUpdateTimestamps = new javax.swing.JButton();
+ jLabel1 = new javax.swing.JLabel();
+
+ setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+ lblDeviceName.setText("Device Name:");
+
+ lblDeviceName1.setText("iRODS Path:");
+
+ lblDeviceName2.setText("Local Path:");
+
+ btnAdd.setText("Add Device");
+ btnAdd.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnAddActionPerformed(evt);
+ }
+ });
+
+ btnSynch.setText("Synch");
+ btnSynch.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnSynchActionPerformed(evt);
+ }
+ });
+
+ btnUpdateTimestamps.setText("Update Timestamps");
+ btnUpdateTimestamps.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btnUpdateTimestampsActionPerformed(evt);
+ }
+ });
+
+ jLabel1.setText("Testing only.....");
+
+ org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
+ getContentPane().setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(btnUpdateTimestamps))
+ .add(layout.createSequentialGroup()
+ .add(47, 47, 47)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(layout.createSequentialGroup()
+ .add(lblDeviceName1)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(txtIrodsPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 394, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(layout.createSequentialGroup()
+ .add(lblDeviceName)
+ .add(18, 18, 18)
+ .add(txtDeviceName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 394, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .add(lblDeviceName2)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 36, Short.MAX_VALUE)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(layout.createSequentialGroup()
+ .add(btnAdd)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(btnSynch))
+ .add(localPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 394, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))))
+ .add(279, 279, 279))
+ .add(layout.createSequentialGroup()
+ .add(67, 67, 67)
+ .add(jLabel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 604, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(153, Short.MAX_VALUE))
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(jLabel1)
+ .add(4, 4, 4)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lblDeviceName)
+ .add(txtDeviceName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lblDeviceName1)
+ .add(txtIrodsPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(lblDeviceName2)
+ .add(localPath, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(18, 18, 18)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(btnAdd)
+ .add(btnSynch))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(btnUpdateTimestamps)
+ .addContainerGap(25, Short.MAX_VALUE))
+ );
+
+ pack();
+ }// </editor-fold>//GEN-END:initComponents
+
+ private void btnAddActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAddActionPerformed
+ try {
+ SynchPropertiesService synchPropertiesService = new SynchPropertiesServiceImpl(irodsFileSystem.getIRODSAccessObjectFactory(), idropCore.getIrodsAccount());
+ synchPropertiesService.addSynchDeviceForUserAndIrodsAbsolutePath(idropCore.getIrodsAccount().getUserName(), txtDeviceName.getText().trim(), txtIrodsPath.getText().trim(), localPath.getText().trim());
+ } catch (DuplicateDataException ex) {
+ Logger.getLogger(SynchSetupDialog.class.getName()).log(Level.SEVERE, null, ex);
+ } catch (JargonException ex) {
+ Logger.getLogger(SynchSetupDialog.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }//GEN-LAST:event_btnAddActionPerformed
+
+ private void btnSynchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSynchActionPerformed
+
+ try {
+ SynchronizeProcessor synchProcessor = new SynchronizeProcessorImpl();
+ synchProcessor.setFileTreeDiffUtility(new FileTreeDiffUtilityImpl(idropCore.getIrodsAccount(), irodsFileSystem.getIRODSAccessObjectFactory()));
+ synchProcessor.setIrodsAccessObjectFactory(irodsFileSystem.getIRODSAccessObjectFactory());
+ synchProcessor.setIrodsAccount(idropCore.getIrodsAccount());
+ synchProcessor.setTransferManager(idropCore.getTransferManager());
+ synchProcessor.setSynchPropertiesService(synchPropertiesService);
+ // FIXME: refactor to not pass this stuff in, or alt method
+ synchProcessor.synchronizeLocalToIRODS(txtDeviceName.getText().trim(), txtIrodsPath.getText().trim());
+ } catch (JargonException ex) {
+ Logger.getLogger(SynchSetupDialog.class.getName()).log(Level.SEVERE, null, ex);
+ } finally {
+ irodsFileSystem.closeAndEatExceptions();
+ }
+
+ }//GEN-LAST:event_btnSynchActionPerformed
+
+ private void btnUpdateTimestampsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnUpdateTimestampsActionPerformed
+ try {
+ SynchronizeProcessor synchProcessor = new SynchronizeProcessorImpl();
+ synchProcessor.setFileTreeDiffUtility(new FileTreeDiffUtilityImpl(idropCore.getIrodsAccount(), irodsFileSystem.getIRODSAccessObjectFactory()));
+ synchProcessor.setIrodsAccessObjectFactory(irodsFileSystem.getIRODSAccessObjectFactory());
+ synchProcessor.setIrodsAccount(idropCore.getIrodsAccount());
+ synchProcessor.setTransferManager(idropCore.getTransferManager());
+ synchProcessor.setSynchPropertiesService(synchPropertiesService);
+ synchProcessor.getTimestampsAndUpdateSynchDataInIRODS(idropCore.getIrodsAccount().getUserName(), txtDeviceName.getText().trim(), txtIrodsPath.getText().trim());
+ } catch (JargonException ex) {
+ Logger.getLogger(SynchSetupDialog.class.getName()).log(Level.SEVERE, null, ex);
+ } finally {
+ irodsFileSystem.closeAndEatExceptions();
+ }
+
+
+ }//GEN-LAST:event_btnUpdateTimestampsActionPerformed
+
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton btnAdd;
+ private javax.swing.JButton btnSynch;
+ private javax.swing.JButton btnUpdateTimestamps;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel lblDeviceName;
+ private javax.swing.JLabel lblDeviceName1;
+ private javax.swing.JLabel lblDeviceName2;
+ private javax.swing.JTextField localPath;
+ private javax.swing.JTextField txtDeviceName;
+ private javax.swing.JTextField txtIrodsPath;
+ // End of variables declaration//GEN-END:variables
+
+}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
index 7a0ef4d..45fb6b2 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
@@ -132,6 +132,8 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
private ChangePasswordDialog changePasswordDialog = null;
+ private SynchSetupDialog synchSetupDialog = null;
+
public static JDialog newPreferencesDialog;
public JCheckBox showGUICheckBox;
@@ -350,6 +352,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
MenuItem iDropItem = new MenuItem("iDrop");
MenuItem preferencesItem = new MenuItem("Preferences");
MenuItem changePasswordItem = new MenuItem("Change Password");
+ MenuItem synchItem = new MenuItem("Synch");
iDropItem.addActionListener(this);
@@ -370,6 +373,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
errorItem.addActionListener(this);
warningItem.addActionListener(this);
preferencesItem.addActionListener(this);
+ synchItem.addActionListener(this);
changePasswordItem.addActionListener(this);
logoutItem.addActionListener(this);
@@ -381,6 +385,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
popup.add(iDropItem);
popup.add(preferencesItem);
popup.add(changePasswordItem);
+ popup.add(synchItem);
popup.addSeparator();
popup.add(displayMenu);
displayMenu.add(currentItem);
@@ -471,6 +476,9 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
} else if (e.getActionCommand().equals("Preferences")) {
showGUICheckBox.setSelected(getiDropCore().getPreferences().getBoolean("showGUI", true));
newPreferencesDialog.setVisible(true);
+ } else if (e.getActionCommand().equals("Synch")) {
+ synchSetupDialog = new SynchSetupDialog(this, getiDropCore(), getIrodsFileSystem());
+ synchSetupDialog.setVisible(true);
} else if (e.getActionCommand().equals("Change Password")) {
if (changePasswordDialog == null) {
@@ -515,7 +523,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
Logger.getLogger(iDrop.class.getName()).log(Level.SEVERE, null, ex);
this.showIdropException(ex);
return;
- }
+ }
queueManagerDialog.setModal(false);
queueManagerDialog.setVisible(true);
queueManagerDialog.toFront();
diff --git a/idrop-swing/src/main/resources/log4j.properties b/idrop-swing/src/main/resources/log4j.properties
index b6ebd32..4b160bb 100644
--- a/idrop-swing/src/main/resources/log4j.properties
+++ b/idrop-swing/src/main/resources/log4j.properties
@@ -1,10 +1,11 @@
# Set root logger level to DEBUG and its only appender to A1.
#log4j.rootCategory=WARN, A1
-log4j.category.org.irods.jargon.idrop=DEBUG, A1
-log4j.category.org.irods.jargon.core=DEBUG, A1
-log4j.categor.org.irods.jargon.part=INFO,A1
+log4j.category.org.irods.jargon.idrop=INFO, A1
+log4j.category.org.irods.jargon.core=WARN, A1
log4j.categor.org.irods.jargon.usertagging=INFO,A1
-log4j.category.org.irods.jargon.transferengine=INFO, A1
+log4j.category.org.irods.jargon.transfer=INFO, A1
+log4j.category.org.irods.jargon.datautils=DEBUG, A1
+
log4j.category.org.hibernate=ERROR, A1