Changeset 5632

Timestamp:

09/29/08 12:20:31 (8 weeks ago)

Author:

jburel

Message:

Cleaning up

Location:

trunk

Files:

• SRC/org/openmicroscopy/shoola/env/LookupNames.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/login/LoginService.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/init/ContainerConfigInit.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/ui/SplashScreenManager.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/ui/TaskBarManager.java (modified) (1 diff)
• config/container.xml (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/env/LookupNames.java

@@ -58 +58 @@
         
         /** Field to access the <code>Splash screen</code> information. */
-        public static final String SPLASH_SCREEN = "SplashScreen";
+        public static final String SPLASH_SCREEN_LOGO = "SplashScreenLogo";
         
         /** Field to access the <code>Help on line</code> information. */

trunk/SRC/org/openmicroscopy/shoola/env/data/login/LoginService.java

@@ -196 +196 @@
     public static final int     ATTEMPTING_LOGIN = 1;
     
+    /** Flag indicating that the client is connected to the server. */
     public static final int             CONNECTED = 1;
     
+    /** Flag indicating that the client is not connected to the server. */
     public static final int             NOT_CONNECTED = 0;
     
+    /** Flag indicating that the connection's attempt's has time out. */
     public static final int             TIMEOUT = 2;
-    
     
     /**

trunk/SRC/org/openmicroscopy/shoola/env/init/ContainerConfigInit.java

@@ -25 +25 @@
 
 //Java imports
+import java.io.File;
 
 //Third-party libraries
 
 //Application-internal dependencies
-import java.io.File;
-
 import org.openmicroscopy.shoola.env.Container;
 import org.openmicroscopy.shoola.env.LookupNames;

trunk/SRC/org/openmicroscopy/shoola/env/ui/SplashScreenManager.java

@@ -180 +180 @@
                 this.component = component;
                 Image img = IconManager.getOMEImageIcon();
-                String n = (String) c.getRegistry().lookup(LookupNames.SPLASH_SCREEN);
+                String n = (String) c.getRegistry().lookup(LookupNames.SPLASH_SCREEN_LOGO);
                 IconManager im = IconManager.getInstance(c.getRegistry());
                 Icon splashScreen = im.getIcon(n);

trunk/SRC/org/openmicroscopy/shoola/env/ui/TaskBarManager.java

@@ -87 +87 @@
 
         /** The window's title. */
-        static final String             TITLE_ABOUT = "About";
+        static final String                             TITLE_ABOUT = "About";
         
         /** The value of the tag to find. */

trunk/config/container.xml

@@ -265 +265 @@
    * Information related to the version of the software, name of the software,
    * etc.
-   * 
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
     <entry name="Version">Beta3.1rc3</entry>
     <entry name="SoftwareName">OMERO.insight</entry>
     <entry name="AboutFile">about.xml</entry>
-    <entry name="SplashScreen">client_splashscreen.png</entry>
-    <entry name="HelpOnLine">http://www.openmicroscopy.org</entry>
+    <entry name="SplashScreenLogo">client_splashscreen.png</entry>
+    <entry name="HelpOnLine">http://trac.openmicroscopy.org.uk/shoola/wiki/OmeroInsightGettingStarted</entry>
 </container>