summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-08-18 12:42:18 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-08-18 12:42:18 (GMT)
commitbd2ebb60ea9248ef372cf19ba2c381372d3ff1de (patch)
tree96e707d71557b0f9461697cb81cb06cb20f78dc6
parente76c62a11b0eac4886d5f84bcf5c4a23b58249b7 (diff)
downloadQCG-Data-bd2ebb60ea9248ef372cf19ba2c381372d3ff1de.zip
QCG-Data-bd2ebb60ea9248ef372cf19ba2c381372d3ff1de.tar.gz
QCG-Data-bd2ebb60ea9248ef372cf19ba2c381372d3ff1de.tar.bz2
[#430] local-irods synch path scheme implemented - workin on config options and passing down to jargon props for synch
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java65
-rw-r--r--idrop-swing/src/main/resources/log4j.properties6
3 files changed, 50 insertions, 23 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
index 35b5f4b..5deb5d3 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.form
@@ -337,6 +337,7 @@
</Property>
</Properties>
<Events>
+ <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="checkLogSuccessfulTransferItemStateChanged"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="checkLogSuccessfulTransferActionPerformed"/>
</Events>
<Constraints>
@@ -352,6 +353,7 @@
</Property>
</Properties>
<Events>
+ <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="checkVerifyChecksumOnTransferItemStateChanged"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="checkVerifyChecksumOnTransferActionPerformed"/>
</Events>
<Constraints>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
index 0067cbe..ff799e9 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
@@ -377,6 +377,11 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
checkLogSuccessfulTransfer.setText(org.openide.util.NbBundle.getMessage(IDROPConfigurationPanel.class, "IDROPConfigurationPanel.checkLogSuccessfulTransfer.text")); // NOI18N
checkLogSuccessfulTransfer.setToolTipText(org.openide.util.NbBundle.getMessage(IDROPConfigurationPanel.class, "IDROPConfigurationPanel.checkLogSuccessfulTransfer.toolTipText")); // NOI18N
+ checkLogSuccessfulTransfer.addItemListener(new java.awt.event.ItemListener() {
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ checkLogSuccessfulTransferItemStateChanged(evt);
+ }
+ });
checkLogSuccessfulTransfer.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
checkLogSuccessfulTransferActionPerformed(evt);
@@ -389,6 +394,11 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
pnlConfigTransfers.add(checkLogSuccessfulTransfer, gridBagConstraints);
checkVerifyChecksumOnTransfer.setText(org.openide.util.NbBundle.getMessage(IDROPConfigurationPanel.class, "IDROPConfigurationPanel.checkVerifyChecksumOnTransfer.text")); // NOI18N
+ checkVerifyChecksumOnTransfer.addItemListener(new java.awt.event.ItemListener() {
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ checkVerifyChecksumOnTransferItemStateChanged(evt);
+ }
+ });
checkVerifyChecksumOnTransfer.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
checkVerifyChecksumOnTransferActionPerformed(evt);
@@ -685,12 +695,11 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
}//GEN-LAST:event_btnRefreshSynchActionPerformed
private void checkShowFileProgressActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkShowFileProgressActionPerformed
-
//
}//GEN-LAST:event_checkShowFileProgressActionPerformed
private void checkShowGUIItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_checkShowGUIItemStateChanged
-
+
boolean isSelected = false;
if (evt.getStateChange() == ItemEvent.SELECTED) {
isSelected = true;
@@ -705,7 +714,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
}//GEN-LAST:event_checkShowGUIItemStateChanged
private void checkShowFileProgressItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_checkShowFileProgressItemStateChanged
- boolean isSelected = false;
+ boolean isSelected = false;
if (evt.getStateChange() == ItemEvent.SELECTED) {
isSelected = true;
}
@@ -719,24 +728,47 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
}
}//GEN-LAST:event_checkShowFileProgressItemStateChanged
+ private void checkVerifyChecksumOnTransferItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_checkVerifyChecksumOnTransferItemStateChanged
+ boolean isSelected = false;
+ if (evt.getStateChange() == ItemEvent.SELECTED) {
+ isSelected = true;
+ }
+ log.info("updating verify checksum to:{}", isSelected);
+ try {
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.VERIFY_CHECKSUM_ON_TRANSFER, Boolean.toString(isSelected));
+ idropCore.getIdropConfigurationService().updateJargonPropertiesBasedOnIDROPConfig();
+ } catch (Exception ex) {
+ log.error("error setting property", ex);
+ throw new IdropRuntimeException(ex);
+ }
+ }//GEN-LAST:event_checkVerifyChecksumOnTransferItemStateChanged
+
+ private void checkLogSuccessfulTransferItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_checkLogSuccessfulTransferItemStateChanged
+ boolean isSelected = false;
+ if (evt.getStateChange() == ItemEvent.SELECTED) {
+ isSelected = true;
+ }
+ log.info("updating log successful transfers to:{}", isSelected);
+ try {
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES, Boolean.toString(isSelected));
+ idropCore.getIdropConfigurationService().updateTransferOptions();
+ } catch (Exception ex) {
+ log.error("error setting property", ex);
+ throw new IdropRuntimeException(ex);
+ }
+
+ }//GEN-LAST:event_checkLogSuccessfulTransferItemStateChanged
+
private void btnOKActionPerformed(java.awt.event.ActionEvent evt) {
this.dispose();
}
private void checkShowGUIActionPerformed(java.awt.event.ActionEvent evt) {
//
-
}
private void checkLogSuccessfulTransferActionPerformed(java.awt.event.ActionEvent evt) {
- log.info("updating log successful transfers to:{}", checkLogSuccessfulTransfer.isSelected());
- try {
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES, Boolean.toString(checkShowGUI.isSelected()));
- idropCore.getIdropConfigurationService().updateTransferOptions();
- } catch (Exception ex) {
- log.error("error setting property", ex);
- throw new IdropRuntimeException(ex);
- }
+ //
}
private void pnlConfigSynchComponentShown(java.awt.event.ComponentEvent evt) {
@@ -1087,14 +1119,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
}
private void checkVerifyChecksumOnTransferActionPerformed(java.awt.event.ActionEvent evt) {
- log.info("updating verify checksom to:{}", checkVerifyChecksumOnTransfer.isSelected());
- try {
- idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.VERIFY_CHECKSUM_ON_TRANSFER, Boolean.toString(checkVerifyChecksumOnTransfer.isSelected()));
- idropCore.getIdropConfigurationService().updateJargonPropertiesBasedOnIDROPConfig();
- } catch (Exception ex) {
- log.error("error setting property", ex);
- throw new IdropRuntimeException(ex);
- }
+ //
}
private void btnLogoutActionPerformed(java.awt.event.ActionEvent evt) {
diff --git a/idrop-swing/src/main/resources/log4j.properties b/idrop-swing/src/main/resources/log4j.properties
index 7ccae32..c36633f 100644
--- a/idrop-swing/src/main/resources/log4j.properties
+++ b/idrop-swing/src/main/resources/log4j.properties
@@ -1,10 +1,10 @@
# Set root logger level to DEBUG and its only appender to A1.
#log4j.rootCategory=WARN, A1
-log4j.category.org.irods.jargon.idrop=INFO, A1
+log4j.category.org.irods.jargon.idrop=WARN, A1
log4j.category.org.irods.jargon.core= INFO, A1
log4j.categor.org.irods.jargon.usertagging=ERROR,A1
-log4j.category.org.irods.jargon.transfer=INFO, A1
-log4j.category.org.irods.jargon.datautils=WARN, A1
+log4j.category.org.irods.jargon.transfer=DEBUG, A1
+log4j.category.org.irods.jargon.datautils=DEBUG, A1
log4j.category.org.hibernate=ERROR, A1