summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
authorMike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-01 14:39:24 (GMT)
committer Mike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-01 14:39:24 (GMT)
commitb581cd86bb42c1315cb9b2f05195fbf15408bbf9 (patch)
tree9e87163c5808fd83b2cf30299e934ebfa1a580be /idrop-swing
parentf05bdb58275a0009d0bb393fc6e1ae3aa62b3d7a (diff)
downloadQCG-Data-b581cd86bb42c1315cb9b2f05195fbf15408bbf9.zip
QCG-Data-b581cd86bb42c1315cb9b2f05195fbf15408bbf9.tar.gz
QCG-Data-b581cd86bb42c1315cb9b2f05195fbf15408bbf9.tar.bz2
shim to force ll mode via props, [#316] feedback on tree node expansion
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/release_notes.txt1
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java3
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java19
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSNode.java3
-rw-r--r--idrop-swing/src/main/resources/idrop.properties1
6 files changed, 29 insertions, 0 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 8d2b4ff..4d64b96 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -8,3 +8,4 @@ work in progress -- Milestone 0.9.8
* [#61] delete local file multi-select
*[#254] drag and drop, desktop to irods file should use irods parent as target
*[#153] local file dir copy/move
+* [#316] feedback on tree node expansion
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
index 6ad4297..a92068f 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
@@ -98,6 +98,9 @@ public class StartupSequencer {
IdropConfigurationService idropConfigurationService = new IdropConfigurationServiceImpl(
derivedConfigHomeDirectory);
derivedProperties = idropConfigurationService.bootstrapConfiguration();
+
+
+
} catch (IdropAlreadyRunningException are) {
log.error("idrop is already running, shutting down");
JOptionPane.showMessageDialog((Component) null, "iDrop is already running, cannot start", "iDrop Error",
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
index e5802f2..c279dac 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
@@ -14,6 +14,8 @@ import org.irods.jargon.idrop.exceptions.IdropException;
*/
public interface IdropConfigurationService {
String IDROP_PROPS_FILE_NAME = "idrop.properties";
+ String FORCE_MODE = "force.mode";
+ String LOGIN_PRESET = "login.preset";
Properties bootstrapConfiguration() throws IdropException;
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
index 23d8b06..4284534 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
@@ -56,8 +56,10 @@ public class IdropConfigurationServiceImpl implements IdropConfigurationService
public Properties bootstrapConfiguration() throws IdropException {
log.info("bootstrapConfiguratiion()\nlooking for properties in database");
Properties databaseProperties;
+ Properties configFileProperties;
try {
databaseProperties = configurationService.exportProperties();
+ configFileProperties = this.importPropertiesFromDefaultFile();
} catch (Exception ex) {
Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
@@ -81,6 +83,23 @@ public class IdropConfigurationServiceImpl implements IdropConfigurationService
}
log.info("now storing derived properties in idrop configuration");
+
+ /*
+ * This is something of a shim right now until config things settle down. For lifetime library, force into login preset mode
+ */
+
+ String forceMode = (String) configFileProperties.getProperty(FORCE_MODE);
+ if (forceMode != null) {
+ boolean isForce = Boolean.valueOf(forceMode);
+ log.info("force mode is:{}", isForce);
+ if (isForce) {
+ log.warn("forcing into login preset mode");
+ databaseProperties.setProperty(LOGIN_PRESET, "true");
+ }
+ }
+
+ log.info("checking for force mode, which forces certain properties to be loaded from the idrop.properties file");
+
saveConfigurationToPropertiesFile();
return databaseProperties;
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSNode.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSNode.java
index 6f8695c..d6876b3 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSNode.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/IRODSNode.java
@@ -1,5 +1,6 @@
package org.irods.jargon.idrop.desktop.systraygui.viscomponents;
+import java.awt.Cursor;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
@@ -88,6 +89,7 @@ public class IRODSNode extends DefaultMutableTreeNode {
CollectionAndDataObjectListingEntry parentObject = (CollectionAndDataObjectListingEntry) this.getUserObject();
try {
+ irodsTree.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
CollectionAndDataObjectListAndSearchAO collectionAO = irodsFileSystem.getIRODSAccessObjectFactory()
.getCollectionAndDataObjectListAndSearchAO(irodsAccount);
@@ -111,6 +113,7 @@ public class IRODSNode extends DefaultMutableTreeNode {
if (closeTheConnectionAfterLoad) {
irodsFileSystem.closeAndEatExceptions(irodsAccount);
}
+ irodsTree.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
}
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 5ec85f5..335a928 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,5 +1,6 @@
policy.aware=false
login.preset=false
+force.mode=false
advanced.view=true
transfer.database=transferDatabase
login.preset.host=diamond.ils.unc.edu