summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-19 11:28:21 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-07-19 11:28:21 (GMT)
commit5500b7b919e5ae23fb4ac40f7dbc5dc021384111 (patch)
treed0d9273bf56483ad42e12c518717e43b2c834721
parentc878f9548e9b1f4f5a4195d6b60e20430476a63c (diff)
downloadQCG-Data-5500b7b919e5ae23fb4ac40f7dbc5dc021384111.zip
QCG-Data-5500b7b919e5ae23fb4ac40f7dbc5dc021384111.tar.gz
QCG-Data-5500b7b919e5ae23fb4ac40f7dbc5dc021384111.tar.bz2
fix some refactoring induced errors, possible case sensitive bug in git?
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java10
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPCore.java16
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java12
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java14
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java6
-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.java28
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/IdropConfig.java20
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/LookAndFeelManager.java4
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/viscomponents/SetupWizard.java14
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImplTest.java4
12 files changed, 67 insertions, 67 deletions
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 13acfe0..bf749ea 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
@@ -15,8 +15,8 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
-import org.irods.jargon.idrop.desktop.systraygui.utils.IDROPConfig;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.utils.IdropConfig;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.SynchConfigTableModel;
import org.irods.jargon.idrop.exceptions.IdropException;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
@@ -350,7 +350,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
private void checkShowGUIActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkShowGUIActionPerformed
log.info("updating show gui at startup to:{}", checkShowGUI.isSelected());
try {
- idropCore.getIdropConfigurationService().updateConfig(IDROPConfigurationService.SHOW_GUI, Boolean.toString(checkShowGUI.isSelected()));
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.SHOW_GUI, Boolean.toString(checkShowGUI.isSelected()));
} catch (IdropException ex) {
log.error("error setting show gui property", ex);
throw new IdropRuntimeException(ex);
@@ -360,7 +360,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
private void checkLogSuccessfulTransferActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkLogSuccessfulTransferActionPerformed
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().updateConfig(IdropConfigurationService.TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES, Boolean.toString(checkShowGUI.isSelected()));
} catch (IdropException ex) {
log.error("error setting log successful property", ex);
throw new IdropRuntimeException(ex);
@@ -505,7 +505,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
// End of variables declaration//GEN-END:variables
private void initWithConfigData() {
- IDROPConfig idropConfig = idropCore.getIdropConfig();
+ IdropConfig idropConfig = idropCore.getIdropConfig();
checkShowGUI.setSelected(idropConfig.isShowGuiAtStartup());
checkLogSuccessfulTransfer.setSelected(idropConfig.isLogSuccessfulTransfers());
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPCore.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPCore.java
index 734cd18..48bda69 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPCore.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPCore.java
@@ -12,8 +12,8 @@ import org.irods.jargon.core.pub.IRODSFileSystem;
import org.irods.jargon.core.pub.io.IRODSFile;
import org.irods.jargon.core.pub.io.IRODSFileFactory;
import org.irods.jargon.idrop.desktop.systraygui.services.IconManager;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
-import org.irods.jargon.idrop.desktop.systraygui.utils.IDROPConfig;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.utils.IdropConfig;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
import org.irods.jargon.transfer.engine.TransferManager;
import org.slf4j.LoggerFactory;
@@ -31,17 +31,17 @@ public class IDROPCore {
public void setIrodsFileSystem(final IRODSFileSystem irodsFileSystem) {
this.irodsFileSystem = irodsFileSystem;
}
- private IDROPConfig idropConfig = null;
+ private IdropConfig idropConfig = null;
private TransferManager transferManager = null;
private IconManager iconManager = null;
private Timer queueTimer = new Timer();
- private IDROPConfigurationService idropConfigurationService = null;
+ private IdropConfigurationService idropConfigurationService = null;
- public IDROPConfigurationService getIdropConfigurationService() {
+ public IdropConfigurationService getIdropConfigurationService() {
return idropConfigurationService;
}
- public void setIdropConfigurationService(IDROPConfigurationService idropConfigurationService) {
+ public void setIdropConfigurationService(IdropConfigurationService idropConfigurationService) {
this.idropConfigurationService = idropConfigurationService;
}
@@ -57,11 +57,11 @@ public class IDROPCore {
this.irodsAccount = irodsAccount;
}
- public IDROPConfig getIdropConfig() {
+ public IdropConfig getIdropConfig() {
return idropConfig;
}
- public void setIdropConfig(final IDROPConfig idropConfig) {
+ public void setIdropConfig(final IdropConfig idropConfig) {
this.idropConfig = idropConfig;
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index f255ac4..4831cdf 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -15,7 +15,7 @@ import org.irods.jargon.core.connection.IRODSAccount;
import org.irods.jargon.core.exception.JargonException;
import org.irods.jargon.core.pub.IRODSFileSystem;
import org.irods.jargon.core.pub.UserAO;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
import org.irods.jargon.idrop.desktop.systraygui.utils.IdropPropertiesHelper;
import org.irods.jargon.idrop.exceptions.IdropException;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
@@ -53,15 +53,15 @@ public class LoginDialog extends JDialog {
private void loginNormally(
final org.irods.jargon.idrop.desktop.systraygui.iDrop iDrop) {
// predispose based on preferences
- String host = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IDROPConfigurationService.ACCOUNT_CACHE_HOST);
+ String host = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_HOST);
txtHost.setText(host);
- String port = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IDROPConfigurationService.ACCOUNT_CACHE_PORT);
+ String port = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_PORT);
txtPort.setText(port);
- String zone = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IDROPConfigurationService.ACCOUNT_CACHE_ZONE);
+ String zone = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_ZONE);
txtZone.setText(zone);
- String resource = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IDROPConfigurationService.ACCOUNT_CACHE_RESOURCE);
+ String resource = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_RESOURCE);
txtResource.setText(resource);
- String username = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IDROPConfigurationService.ACCOUNT_CACHE_USER_NAME);
+ String username = iDrop.getiDropCore().getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_NAME);
txtUserName.setText(username);
}
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 c180269..62504c7 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
@@ -14,10 +14,10 @@ import javax.swing.JOptionPane;
import org.irods.jargon.core.exception.JargonException;
import org.irods.jargon.core.pub.IRODSFileSystem;
import org.irods.jargon.idrop.desktop.systraygui.services.IconManager;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationServiceImpl;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationServiceImpl;
import org.irods.jargon.idrop.desktop.systraygui.services.QueueSchedulerTimerTask;
-import org.irods.jargon.idrop.desktop.systraygui.utils.IDROPConfig;
+import org.irods.jargon.idrop.desktop.systraygui.utils.IdropConfig;
import org.irods.jargon.idrop.desktop.systraygui.utils.LookAndFeelManager;
import org.irods.jargon.idrop.desktop.systraygui.viscomponents.SetupWizard;
import org.irods.jargon.idrop.exceptions.IdropAlreadyRunningException;
@@ -102,7 +102,7 @@ public class StartupSequencer {
Properties derivedProperties = null;
try {
- IDROPConfigurationService idropConfigurationService = new IDROPConfigurationServiceImpl(
+ IdropConfigurationService idropConfigurationService = new IdropConfigurationServiceImpl(
derivedConfigHomeDirectory, idropCore);
idropCore.setIdropConfigurationService(idropConfigurationService);
derivedProperties = idropConfigurationService.bootstrapConfiguration();
@@ -129,12 +129,12 @@ public class StartupSequencer {
"Configuration information gathered, logging in...", ++count);
log.info("config properties derived...");
- idropCore.setIdropConfig(new IDROPConfig(derivedProperties));
+ idropCore.setIdropConfig(new IdropConfig(derivedProperties));
idropCore.getIdropConfig().setUpLogging();
log.info("setting initial look and feel");
LookAndFeelManager laf = new LookAndFeelManager(idropCore);
- laf.setLookAndFeel(idropCore.getIdropConfig().getPropertyForKey(IDROPConfigurationService.LOOK_AND_FEEL));
+ laf.setLookAndFeel(idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.LOOK_AND_FEEL));
log.info("logging in in splash background thread");
idropSplashWindow.setStatus("Logging in...", ++count);
@@ -259,7 +259,7 @@ public class StartupSequencer {
if (n == 1) {
log.info("switching to show GUI at startup");
try {
- idropCore.getIdropConfigurationService().updateConfig(IDROPConfigurationService.SHOW_GUI, "true");
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.SHOW_GUI, "true");
idrop.showIdropGui();
} catch (IdropException ex) {
log.error("error setting show GUI at startup", ex);
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 8649127..bdf7ba2 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
@@ -55,7 +55,7 @@ import org.irods.jargon.core.pub.domain.DataObject;
import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry;
import org.irods.jargon.core.query.MetaDataAndDomainData.MetadataDomain;
import org.irods.jargon.core.transfer.TransferStatus;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
import org.irods.jargon.idrop.desktop.systraygui.utils.IDropUtils;
import org.irods.jargon.idrop.desktop.systraygui.utils.IconHelper;
import org.irods.jargon.idrop.desktop.systraygui.utils.LocalFileUtils;
@@ -191,7 +191,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
buildTargetTree();
}
// setting look and feel will also trigger build of irods tree view
- //setLookAndFeel(iDropCore.getIdropConfig().getPropertyForKey(IDROPConfigurationService.LOOK_AND_FEEL));
+ //setLookAndFeel(iDropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.LOOK_AND_FEEL));
setUpLocalFileSelectTree();
togglePauseTransfer.setSelected(pausedItem.getState());
iDropCore.getIconManager().setRunningStatus(
@@ -2627,7 +2627,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
}
private void initializeLookAndFeelSelected() {
- String lookAndFeelChoice = iDropCore.getIdropConfig().getPropertyForKey(IDROPConfigurationService.LOOK_AND_FEEL);
+ String lookAndFeelChoice = iDropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.LOOK_AND_FEEL);
if (lookAndFeelChoice == null || lookAndFeelChoice.isEmpty()) {
lookAndFeelChoice = "System";
}
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 3a2936e..706ee64 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
@@ -11,7 +11,7 @@ import org.irods.jargon.transfer.engine.synch.ConflictingSynchException;
*
* @author mikeconway
*/
-public interface IDROPConfigurationService {
+public interface IdropConfigurationService {
public static final String IDROP_PROPS_FILE_NAME = "idrop.properties";
public static final String FORCE_MODE = "force.mode";
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 99e9b52..daae8df 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
@@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory;
*
* @author Mike Conway - DICE (www.irods.org)
*/
-public class IDROPConfigurationServiceImpl implements IDROPConfigurationService {
+public class IdropConfigurationServiceImpl implements IdropConfigurationService {
private final String idropConfigRootDirectoryAbsolutePath;
private final ConfigurationService configurationService;
private final IDROPCore idropCore;
- private static final org.slf4j.Logger log = LoggerFactory.getLogger(IDROPConfigurationServiceImpl.class);
+ private static final org.slf4j.Logger log = LoggerFactory.getLogger(IdropConfigurationServiceImpl.class);
- public IDROPConfigurationServiceImpl(
+ public IdropConfigurationServiceImpl(
final String idropConfigRootDirectoryAbsolutePath,
final IDROPCore idropCore) throws IdropAlreadyRunningException,
IdropException {
@@ -61,7 +61,7 @@ public class IDROPConfigurationServiceImpl implements IDROPConfigurationService
this.configurationService = transferServiceFactory.instanceConfigurationService();
} catch (Exception ex) {
- Logger.getLogger(IDROPConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
if (ex.getMessage().indexOf("Failed to start database") != -1) {
throw new IdropAlreadyRunningException(
@@ -82,7 +82,7 @@ public class IDROPConfigurationServiceImpl implements IDROPConfigurationService
configFileProperties = this.importPropertiesFromDefaultFile();
} catch (Exception ex) {
- Logger.getLogger(IDROPConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
if (ex.getMessage().indexOf("Could not open Hibernate Session") != -1) {
throw new IdropAlreadyRunningException(
"iDrop is already running, or the iDrop database is in use");
@@ -156,10 +156,10 @@ public class IDROPConfigurationServiceImpl implements IDROPConfigurationService
Properties databaseProperties = configurationService.exportProperties();
databaseProperties.store(new FileOutputStream(sb.toString()), null);
} catch (TransferEngineException ex) {
- Logger.getLogger(IDROPConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropException("exception exporting final properties", ex);
} catch (IOException ioe) {
- Logger.getLogger(IDROPConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ioe);
+ Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ioe);
throw new IdropException(
"exception storing final properties in file", ioe);
}
@@ -199,7 +199,7 @@ public class IDROPConfigurationServiceImpl implements IDROPConfigurationService
try {
configurationService.importProperties(properties);
} catch (TransferEngineException ex) {
- Logger.getLogger(IDROPConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(IdropConfigurationServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropException(
"unable to import properties into database", ex);
}
@@ -222,12 +222,12 @@ public class IDROPConfigurationServiceImpl implements IDROPConfigurationService
}
log.info("saving irodsAccount:{}", irodsAccount);
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_HOST, irodsAccount.getHost());
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_PORT, String.valueOf(irodsAccount.getPort()));
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_RESOURCE, irodsAccount.getDefaultStorageResource());
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_ROOT_DIR, irodsAccount.getHomeDirectory());
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_ZONE, irodsAccount.getZone());
- updateConfig(IDROPConfigurationService.ACCOUNT_CACHE_USER_NAME, irodsAccount.getUserName());
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_HOST, irodsAccount.getHost());
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_PORT, String.valueOf(irodsAccount.getPort()));
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_RESOURCE, irodsAccount.getDefaultStorageResource());
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_ROOT_DIR, irodsAccount.getHomeDirectory());
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_ZONE, irodsAccount.getZone());
+ updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_NAME, irodsAccount.getUserName());
log.info("config updated");
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/IdropConfig.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/IdropConfig.java
index b0074c2..a1a2b69 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/IdropConfig.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/IdropConfig.java
@@ -6,19 +6,19 @@ import java.util.Properties;
import org.apache.log4j.Level;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.RollingFileAppender;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
/**
* Access data about the configuration of Idrop. This serves as a view to the loaded cache of properties that iDrop consults.
* The properties are originally 'bootstrapped' at load time and resolved from various sources to come up with the operative set.
- * This bootstrapping is done by the {@link IDROPConfigurationService}.
+ * This bootstrapping is done by the {@link IdropConfigurationService}.
* <p/>
* In normal operation, this config class is queried by iDrop to save database accesses. When any configuration information is updated, this
- * is through the <code>IDROPConfigurationService</code>, which will make necessary database updates, and then update this cache.
+ * is through the <code>IdropConfigurationService</code>, which will make necessary database updates, and then update this cache.
*
* @author Mike Conway - DICE (www.irods.org)
*/
-public class IDROPConfig {
+public class IdropConfig {
private final Properties idropProperties;
@@ -53,7 +53,7 @@ public class IDROPConfig {
*
* @param properties
*/
- public IDROPConfig(final Properties properties) {
+ public IdropConfig(final Properties properties) {
if (properties == null) {
throw new IllegalArgumentException("null properties");
}
@@ -68,7 +68,7 @@ public class IDROPConfig {
*/
public boolean isPolicyAware() {
boolean policyAware = false;
- String policyAwareValue = idropProperties.getProperty(IDROPConfigurationService.POLICY_AWARE_PROPERTY);
+ String policyAwareValue = idropProperties.getProperty(IdropConfigurationService.POLICY_AWARE_PROPERTY);
if (policyAwareValue != null && policyAwareValue.equals("true")) {
policyAware = true;
@@ -130,7 +130,7 @@ public class IDROPConfig {
*/
public boolean isLogSuccessfulTransfers() {
boolean logSuccessful = false;
- String logSuccessfulTransfers = idropProperties.getProperty(IDROPConfigurationService.TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES);
+ String logSuccessfulTransfers = idropProperties.getProperty(IdropConfigurationService.TRANSFER_ENGINE_RECORD_SUCCESSFUL_FILES);
if (logSuccessfulTransfers != null
&& logSuccessfulTransfers.equals("true")) {
@@ -147,12 +147,12 @@ public class IDROPConfig {
* @return
*/
public String getSynchDeviceName() {
- return idropProperties.getProperty(IDROPConfigurationService.DEVICE_NAME);
+ return idropProperties.getProperty(IdropConfigurationService.DEVICE_NAME);
}
public boolean isShowStartupWizard() {
boolean showWizard = false;
- String showStartup = idropProperties.getProperty(IDROPConfigurationService.SHOW_STARTUP);
+ String showStartup = idropProperties.getProperty(IdropConfigurationService.SHOW_STARTUP);
if (showStartup != null && showStartup.equals("true")) {
showWizard = true;
@@ -215,7 +215,7 @@ public class IDROPConfig {
public boolean isShowGuiAtStartup() {
boolean propBoolean = false;
- String propString = idropProperties.getProperty(IDROPConfigurationService.SHOW_GUI);
+ String propString = idropProperties.getProperty(IdropConfigurationService.SHOW_GUI);
if (propString != null && propString.equals("true")) {
propBoolean = true;
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/LookAndFeelManager.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/LookAndFeelManager.java
index 5826766..ccf3a74 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/LookAndFeelManager.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/LookAndFeelManager.java
@@ -7,7 +7,7 @@ package org.irods.jargon.idrop.desktop.systraygui.utils;
import javax.swing.UIManager;
import javax.swing.UIManager.LookAndFeelInfo;
import org.irods.jargon.idrop.desktop.systraygui.IDROPCore;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
import org.irods.jargon.idrop.exceptions.IdropException;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
import org.slf4j.LoggerFactory;
@@ -43,7 +43,7 @@ public class LookAndFeelManager {
if (lookAndFeelChoice != null) {
try {
- idropCore.getIdropConfigurationService().updateConfig(IDROPConfigurationService.LOOK_AND_FEEL, lookAndFeelChoice);
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.LOOK_AND_FEEL, lookAndFeelChoice);
} catch (IdropException ex) {
log.error("unable to update configration for look and feel");
throw new IdropRuntimeException("unable to set prop for look and feel", ex);
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 0d63c91..4e0bd87 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
@@ -16,7 +16,7 @@ import javax.swing.event.ChangeListener;
import org.irods.jargon.idrop.desktop.systraygui.IDROPCore;
import org.irods.jargon.idrop.desktop.systraygui.MessageManager;
import org.irods.jargon.idrop.desktop.systraygui.iDrop;
-import org.irods.jargon.idrop.desktop.systraygui.services.IDROPConfigurationService;
+import org.irods.jargon.idrop.desktop.systraygui.services.IdropConfigurationService;
import org.irods.jargon.idrop.exceptions.IdropException;
import org.irods.jargon.idrop.exceptions.IdropRuntimeException;
import org.irods.jargon.idrop.finder.IRODSFinderDialog;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
public class SetupWizard extends javax.swing.JDialog {
private final IDROPCore idropCore;
- private final IDROPConfigurationService idropConfigurationService;
+ private final IdropConfigurationService idropConfigurationService;
private static final org.slf4j.Logger log = LoggerFactory.getLogger(SetupWizard.class);
public final String SETUP_ERROR_TITLE = "iDrop - Setup";
private int tabStep = 0;
@@ -361,7 +361,7 @@ public class SetupWizard extends javax.swing.JDialog {
private void saveSeeSystemTrayYas() throws IdropRuntimeException {
log.info("indicates system try shown, set to not load gui");
try {
- idropConfigurationService.updateConfig(IDROPConfigurationService.SHOW_GUI, "false");
+ idropConfigurationService.updateConfig(IdropConfigurationService.SHOW_GUI, "false");
log.info("config is updated");
} catch (IdropException ex) {
log.error("error updating configuration", ex);
@@ -377,7 +377,7 @@ public class SetupWizard extends javax.swing.JDialog {
return;
}
try {
- idropConfigurationService.updateConfig(IDROPConfigurationService.DEVICE_NAME, txtDeviceName.getText());
+ idropConfigurationService.updateConfig(IdropConfigurationService.DEVICE_NAME, txtDeviceName.getText());
log.info("device name is set to:{}", txtDeviceName.getText());
// FIXME: check name in iRODS
} catch (IdropException ex) {
@@ -397,9 +397,9 @@ public class SetupWizard extends javax.swing.JDialog {
private void btnLaterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnLaterActionPerformed
log.info("indicates system try not shown, set to always load gui");
try {
- idropConfigurationService.updateConfig(IDROPConfigurationService.SHOW_GUI, "true");
+ idropConfigurationService.updateConfig(IdropConfigurationService.SHOW_GUI, "true");
log.info("clearing device name to force wizard next time");
- idropConfigurationService.removeConfigProperty(IDROPConfigurationService.DEVICE_NAME);
+ idropConfigurationService.removeConfigProperty(IdropConfigurationService.DEVICE_NAME);
log.info("config is updated");
} catch (IdropException ex) {
log.error("error updating configuration", ex);
@@ -467,7 +467,7 @@ public class SetupWizard extends javax.swing.JDialog {
final java.awt.event.ActionEvent evt) {// GEN-FIRST:event_btnSeeSystemTrayNoActionPerformed
log.info("indicates system try not shown, set to always load gui");
try {
- idropConfigurationService.updateConfig(IDROPConfigurationService.SHOW_GUI, "true");
+ idropConfigurationService.updateConfig(IdropConfigurationService.SHOW_GUI, "true");
log.info("config is updated");
} catch (IdropException ex) {
log.error("error updating configuration", ex);
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 4b04a52..6b3a067 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,6 +1,6 @@
policy.aware=false
-login.preset=false
-force.mode=false
+login.preset=true
+force.mode=true
force.no.synch=false
advanced.view=true
show.startup=true
diff --git a/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImplTest.java b/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImplTest.java
index 3b6da35..1755fc7 100644
--- a/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImplTest.java
+++ b/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImplTest.java
@@ -25,7 +25,7 @@ public class IDROPConfigurationServiceImplTest {
private static TestingPropertiesHelper testingPropertiesHelper = new TestingPropertiesHelper();
private static ScratchFileUtils scratchFileUtils = null;
private static final String TESTING_SUBDIR = "IdropConfigurationServiceImplTest";
- private static IDROPConfigurationService idropConfigurationService;
+ private static IdropConfigurationService idropConfigurationService;
public IDROPConfigurationServiceImplTest() {
@@ -37,7 +37,7 @@ public class IDROPConfigurationServiceImplTest {
testingProperties = testingPropertiesLoader.getTestProperties();
scratchFileUtils = new ScratchFileUtils(testingProperties);
scratchFileUtils.clearAndReinitializeScratchDirectory(TESTING_SUBDIR);
- idropConfigurationService = new IDROPConfigurationServiceImpl(scratchFileUtils.createAndReturnAbsoluteScratchPath(TESTING_SUBDIR), new IDROPCore());
+ idropConfigurationService = new IdropConfigurationServiceImpl(scratchFileUtils.createAndReturnAbsoluteScratchPath(TESTING_SUBDIR), new IDROPCore());
TransferServiceFactoryImpl transferServiceFactory = new TransferServiceFactoryImpl();
configurationService = transferServiceFactory.instanceConfigurationService();
}