summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-13 14:00:44 (GMT)
committer Mike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-13 14:00:44 (GMT)
commitbdd1058a6b5c79a7fd173eaa1031770f6090c59c (patch)
tree929b1777b599930acb831f19df55fcdf0047cfaf
parentef26b66cad0f283336f0fc4cf27ed16e9e04b0c0 (diff)
parent1953b09b46743c09fed5e35184dfd716ecf8fbd7 (diff)
downloadQCG-Data-bdd1058a6b5c79a7fd173eaa1031770f6090c59c.zip
QCG-Data-bdd1058a6b5c79a7fd173eaa1031770f6090c59c.tar.gz
QCG-Data-bdd1058a6b5c79a7fd173eaa1031770f6090c59c.tar.bz2
Merge branch 'master' of ssh://code.renci.org/gitroot/irodsidrop
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPSplashWindow.java8
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPSplashWindow.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPSplashWindow.java
index a65342b..ffd787d 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPSplashWindow.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPSplashWindow.java
@@ -15,16 +15,16 @@ import org.slf4j.LoggerFactory;
*
* @author jdr0887
*/
-public class IDropSplashWindow extends JWindow {
+public class IDROPSplashWindow extends JWindow {
/**
*
*/
private static final long serialVersionUID = 1L;
- private final org.slf4j.Logger log = LoggerFactory.getLogger(IDropSplashWindow.class);
+ private final org.slf4j.Logger log = LoggerFactory.getLogger(IDROPSplashWindow.class);
- private ImageIcon splashImage = new ImageIcon(IDropSplashWindow.class.getClassLoader().getResource(
+ private ImageIcon splashImage = new ImageIcon(IDROPSplashWindow.class.getClassLoader().getResource(
"org/irods/jargon/idrop/desktop/images/iDrop.png"));
private JLabel jlblImage = new JLabel();
@@ -33,7 +33,7 @@ public class IDropSplashWindow extends JWindow {
private iDrop iDrop;
- public IDropSplashWindow(iDrop iDrop) {
+ public IDROPSplashWindow(iDrop iDrop) {
super(iDrop);
this.iDrop = iDrop;
try {
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 2d7534d..f94efb2 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
@@ -61,7 +61,7 @@ public class StartupSequencer {
log.info("creating idrop GUI app...");
idrop = new iDrop(idropCore);
- IDropSplashWindow idropSplashWindow = new IDropSplashWindow(idrop);
+ IDROPSplashWindow idropSplashWindow = new IDROPSplashWindow(idrop);
try {
Thread.sleep(STARTUP_SEQUENCE_PAUSE_INTERVAL);