diff options
| -rw-r--r-- | idrop-swing/pom.xml | 10 | ||||
| -rw-r--r-- | idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java | 10 | ||||
| -rw-r--r-- | pom.xml | 9 |
3 files changed, 17 insertions, 12 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml index 4a16403..ea44e1a 100644 --- a/idrop-swing/pom.xml +++ b/idrop-swing/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.irods</groupId> <artifactId>idrop</artifactId> - <version>0.9.1-SNAPSHOT</version> + <version>0.9.8-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.irods.idrop</groupId> @@ -22,10 +22,10 @@ <scope>runtime</scope> </dependency> --> - <dependency> + <!-- <dependency> <groupId>com.jgoodies</groupId> <artifactId>validation</artifactId> - </dependency> + </dependency> --> <dependency> <groupId>cookxml</groupId> <artifactId>cookswing</artifactId> @@ -110,7 +110,7 @@ <!-- used to automatically identify the jar containing the main class. --> <!-- this is perhaps going to change --> - <mainClass>org.irods.jargon.idrop.desktop.systraygui.IDROPDesktop</mainClass> + <mainClass>org.irods.jargon.idrop.desktop.systraygui.StartupSequencer</mainClass> </jnlp> <!-- SIGNING --> @@ -165,7 +165,7 @@ <configuration> <archive> <manifest> - <mainClass>org.irods.jargon.idrop.desktop.systraygui.IDROPDesktop</mainClass> + <mainClass>org.irods.jargon.idrop.desktop.systraygui.StartupSequencer</mainClass> </manifest> </archive> </configuration> 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 81aeda3..61e926a 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 @@ -11,7 +11,7 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.KeyStroke; -import org.apache.commons.lang.StringUtils; +//import org.apache.commons.lang.StringUtils; import org.irods.jargon.core.connection.IRODSAccount; import org.irods.jargon.core.exception.JargonException; import org.irods.jargon.core.pub.IRODSFileSystem; @@ -62,22 +62,22 @@ public class LoginDialog extends JDialog { private void loginNormally(org.irods.jargon.idrop.desktop.systraygui.iDrop iDrop) { // predispose based on preferences String host = iDrop.getiDropCore().getPreferences().get(PREF_LOGIN_HOST, null); - if (StringUtils.isNotEmpty(host)) { + if (host == null || host.isEmpty()) { txtHost.setText(host); } String zone = iDrop.getiDropCore().getPreferences().get(PREF_LOGIN_ZONE, null); - if (StringUtils.isNotEmpty(zone)) { + if (zone == null || zone.isEmpty()) { txtZone.setText(zone); } String resource = iDrop.getiDropCore().getPreferences().get(PREF_LOGIN_RESOURCE, null); - if (StringUtils.isNotEmpty(resource)) { + if (resource == null || resource.isEmpty()) { txtResource.setText(resource); } String username = iDrop.getiDropCore().getPreferences().get(PREF_LOGIN_USERNAME, null); - if (StringUtils.isNotEmpty(username)) { + if (username == null || username.isEmpty()) { txtUserName.setText(username); } } @@ -5,7 +5,7 @@ <groupId>org.irods</groupId> <artifactId>idrop</artifactId> <packaging>pom</packaging> - <version>0.9.1-SNAPSHOT</version> + <version>0.9.8-SNAPSHOT</version> <name>iRODS iDrop</name> <description>iRODS iDrop - personal web and desktop grid access clients</description> <url>https://code.renci.org/gf/project/irodsidrop/</url> @@ -189,6 +189,7 @@ <groupId>org.irods.jargon</groupId> <artifactId>jargon-test</artifactId> <version>${jargon.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.irods.jargon</groupId> @@ -214,6 +215,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.2</version> + <scope>test</scope> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -244,6 +246,7 @@ <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.8.1</version> + <scope>test</scope> </dependency> <dependency> <groupId>javax.transaction</groupId> @@ -254,6 +257,7 @@ <groupId>org.dbunit</groupId> <artifactId>dbunit</artifactId> <version>2.2</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.derby</groupId> @@ -332,11 +336,12 @@ <artifactId>cookxml</artifactId> <version>3.0.1</version> </dependency> + <!-- <dependency> <groupId>com.jgoodies</groupId> <artifactId>validation</artifactId> <version>2.0.0</version> - </dependency> + </dependency> --> </dependencies> </dependencyManagement> <dependencies> |