Merge pull request #8 from jburel/version-check

Version

Author: jburel

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "java"
     id "application"
-    id "org.openmicroscopy.project" version "5.5.0-m4"
+    id "org.openmicroscopy.project" version "5.5.0-m5"
 }
 
 group = "org.openmicroscopy"
@@ -30,7 +30,7 @@ dependencies {
     implementation("org.apache.httpcomponents:httpclient:4.5.7")
     implementation("org.apache.httpcomponents:httpcomponents-client:4.5.7")
     implementation("org.jfree:jfreechart:1.0.19")
-    implementation("org.openmicroscopy:omero-blitz:5.5.0-m4")
+    implementation("org.openmicroscopy:omero-blitz:5.5.0-m5")
     implementation("org.swinglabs:swingx:1.6.1")
     if (JavaVersion.current().isJava9Compatible()) {
         implementation("javax.activation:activation:1.1.1")

src/config/container.xml

@@ -314,7 +314,6 @@
    * etc.
    * <entry name="SplashScreenLogo">client_splashscreen.png</entry>
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-    <entry name="Version">@OMERO_DISPLAY_VERSION@</entry>
     <entry name="SoftwareName">OMERO.insight</entry>
     <entry name="AboutFile">about.xml</entry>
     <entry name="HelpOnLine">https://help.openmicroscopy.org/</entry>

src/config/containerImporter.xml

@@ -295,7 +295,6 @@
    * etc.
    * <entry name="SplashScreenLogo">client_splashscreen.png</entry>
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-  <entry name="Version">@OMERO_DISPLAY_VERSION@</entry>
   <entry name="SoftwareName">OMERO.importer</entry>
   <entry name="AboutFile">about.xml</entry>
   <entry name="HelpOnLine">https://help.openmicroscopy.org/</entry>

src/main/java/org/openmicroscopy/shoola/env/data/DataServicesFactory.java

@@ -516,9 +516,6 @@ public void connect(UserCredentials uc)
             registry.getLogger().warn(this, "Could not access ConfigService");
         }
 
-        //Upgrade check only if client and server are compatible
-        omeroGateway.isUpgradeRequired(name);
-
         //Post an event to indicate that the user is connected.
         EventBus bus = container.getRegistry().getEventBus();
         bus.post(new ConnectedEvent());

src/main/java/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -37,7 +37,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
@@ -94,7 +93,6 @@
 import ome.formats.importer.OMEROWrapper;
 import ome.formats.importer.util.ProportionalTimeEstimatorImpl;
 import ome.formats.importer.util.TimeEstimator;
-import ome.system.UpgradeCheck;
 import ome.util.checksum.ChecksumProvider;
 import ome.util.checksum.ChecksumProviderFactory;
 import ome.util.checksum.ChecksumProviderFactoryImpl;
@@ -1413,30 +1411,6 @@ ExperimenterData getUserDetails(SecurityContext ctx, String name,
 		}
 	}
 
-	/**
-	 * Returns <code>true</code> if an upgrade is required, <code>false</code>
-	 * otherwise.
-	 *
-	 * @param name The name of the agent.
-	 * @return See above.
-	 */
-	boolean isUpgradeRequired(String name)
-	{
-	    ResourceBundle bundle = ResourceBundle.getBundle("omero");
-	    String version = bundle.getString("omero.version");
-	    String url = bundle.getString("omero.upgrades.url");
-	    //Strip the "OMERO" part of the string
-	    if (CommonsLangUtils.isBlank(name)) {
-	        name = "insight";
-	    }
-	    if (name.startsWith("OMERO.")) {
-	        name = name.substring("OMERO.".length());
-	    }
-	    UpgradeCheck check = new UpgradeCheck(url, version, name);
-	    check.run();
-	    return check.isUpgradeNeeded();
-	}
-
 	/**
 	 * Connects to the server and returns details about the logged in user.
 	 *

src/main/java/org/openmicroscopy/shoola/env/ui/SplashScreenManager.java

@@ -36,6 +36,7 @@
 import javax.swing.JFrame;
 
 
+import org.openmicroscopy.shoola.Main;
 import org.openmicroscopy.shoola.env.Container;
 import org.openmicroscopy.shoola.env.LookupNames;
 import org.openmicroscopy.shoola.env.config.OMEROInfo;
@@ -153,7 +154,7 @@ private void updateView()
     		view.requestFocusOnField();
     	}
     }
-    
+
     /** 
      * Initializes the view. 
      * 
@@ -163,10 +164,11 @@ private void initializedView(Icon splashscreen)
     {
     	if (view != null) return;	
     	Image img = IconManager.getOMEImageIcon();
-    	Object version = container.getRegistry().lookup(LookupNames.VERSION);
-    	String v = "";
-    	if (version != null && version instanceof String)
-    		v = (String) version;
+		String clientVersion = SplashScreenManager.class.getPackage().getImplementationVersion();
+		if (clientVersion == null) {
+			clientVersion = "Unknown";
+		}
+		container.getRegistry().bind(LookupNames.VERSION, clientVersion);
     	OMEROInfo info = 
     		(OMEROInfo) container.getRegistry().lookup(LookupNames.OMERODS);
     	int p = -1;
@@ -175,7 +177,7 @@ private void initializedView(Icon splashscreen)
     	boolean configurable = info.isHostNameConfigurable();
 
         boolean serverAvailable = connectToServer();
-    	view = new ScreenLogin(Container.TITLE, splashscreen, img, v, port,
+    	view = new ScreenLogin(Container.TITLE, splashscreen, img, clientVersion, port,
     			host, serverAvailable);
     	view.setEncryptionConfiguration(info.isEncrypted(),
     			info.isEncryptedConfigurable());