Merge branch 'internal-frame-bugfix'

appinfo.properties

@@ -1,8 +1,8 @@
 #Everything can be manually updated except buildnum and builddate.
-#Wed, 31 May 2017 15:21:08 +0200
-program.BUILDNUM=1595
+#Wed, 31 May 2017 15:57:10 +0200
+program.BUILDNUM=1597
 program.AUTHOR=Morten Johannes Ervik, CSU/IARC
-program.BUILDDATE=20170531152108
+program.BUILDDATE=20170531155710
 program.DESCRIPTION=
 program.COPYRIGHT=2008-2017
 program.VERSION=5.00.41b

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed May 31 15:21:08 CEST 2017
-build.number=1596
+#Wed May 31 15:57:10 CEST 2017
+build.number=1598

src/canreg/client/CanRegClientApp.java

@@ -260,7 +260,7 @@ protected void startup() {
         }
 
         String versionString = canRegSystemVersionString;
-        versionString += "build" + appInfoProperties.getProperty("program.BUILDNUM");
+        versionString += "-build" + appInfoProperties.getProperty("program.BUILDNUM");
         versionString += " (" + appInfoProperties.getProperty("program.BUILDDATE") + ")";
         Logger.getLogger(CanRegClientApp.class.getName()).log(Level.INFO, "CanReg version: {0}", versionString);
 

src/canreg/client/gui/CanRegClientAboutBox.form

@@ -160,7 +160,7 @@
         <Property name="name" type="java.lang.String" value="appVersionLabel" noResource="true"/>
       </Properties>
       <AuxValues>
-        <AuxValue name="JavaCodeGenerator_AddingCodePost" type="java.lang.String" value="String versionString = &quot;&quot;;&#xa;for (String part:Globals.versionStringParts){&#xa;    versionString += appInfoProperties.getProperty(part);&#xa;}&#xa;versionString += &quot;build&quot;+appInfoProperties.getProperty(&quot;program.BUILDNUM&quot;);&#xa;versionString += &quot; (&quot;+appInfoProperties.getProperty(&quot;program.BUILDDATE&quot;)+&quot;)&quot;;&#xa;appVersionLabel.setText(versionString);"/>
+        <AuxValue name="JavaCodeGenerator_AddingCodePost" type="java.lang.String" value="String versionString = &quot;&quot;; for (String part:Globals.versionStringParts){     versionString += appInfoProperties.getProperty(part); } versionString += &quot;-build&quot;+appInfoProperties.getProperty(&quot;program.BUILDNUM&quot;); versionString += &quot; (&quot;+appInfoProperties.getProperty(&quot;program.BUILDDATE&quot;)+&quot;)&quot;; appVersionLabel.setText(versionString);"/>
         <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
         <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
       </AuxValues>

src/canreg/client/gui/CanRegClientAboutBox.java

@@ -1,6 +1,6 @@
 /**
  * CanReg5 - a tool to input, store, check and analyse cancer registry data.
- * Copyright (C) 2008-2015  International Agency for Research on Cancer
+ * Copyright (C) 2008-2017  International Agency for Research on Cancer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -216,13 +216,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                 .addContainerGap())
         );
 
-        String versionString = "";
-        for (String part:Globals.versionStringParts){
-            versionString += appInfoProperties.getProperty(part);
-        }
-        versionString += "build"+appInfoProperties.getProperty("program.BUILDNUM");
-        versionString += " ("+appInfoProperties.getProperty("program.BUILDDATE")+")";
-        appVersionLabel.setText(versionString);
+        String versionString = ""; for (String part:Globals.versionStringParts){     versionString += appInfoProperties.getProperty(part); } versionString += "-build"+appInfoProperties.getProperty("program.BUILDNUM"); versionString += " ("+appInfoProperties.getProperty("program.BUILDDATE")+")"; appVersionLabel.setText(versionString);
 
         pack();
     }// </editor-fold>//GEN-END:initComponents

src/canreg/client/gui/WelcomeInternalFrame.form

@@ -68,7 +68,6 @@
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Component id="jPanel2" max="32767" attributes="0"/>
                               <Group type="102" alignment="0" attributes="0">
-                                  <EmptySpace max="32767" attributes="0"/>
                                   <Component id="logoButton" min="-2" pref="291" max="-2" attributes="0"/>
                                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                               </Group>

src/canreg/client/gui/WelcomeInternalFrame.java

@@ -1,6 +1,6 @@
 /**
  * CanReg5 - a tool to input, store, check and analyse cancer registry data.
- * Copyright (C) 2008-2015  International Agency for Research on Cancer
+ * Copyright (C) 2008-2017  International Agency for Research on Cancer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ public WelcomeInternalFrame(FrameView fv) {
             for (String part : Globals.versionStringParts) {
                 versionString += appInfoProperties.getProperty(part);
             }
-            versionString += "build" + appInfoProperties.getProperty("program.BUILDNUM");
+            versionString += "-build" + appInfoProperties.getProperty("program.BUILDNUM");
             versionString += " (" + appInfoProperties.getProperty("program.BUILDDATE") + ")";
             versionLabel.setText(versionLabel.getText() + " " + versionString);
         } catch (IOException ex) {

src/canreg/client/gui/components/FastFilterInternalFrame.java

@@ -1,6 +1,6 @@
 /**
  * CanReg5 - a tool to input, store, check and analyse cancer registry data.
- * Copyright (C) 2008-2016  International Agency for Research on Cancer
+ * Copyright (C) 2008-2017  International Agency for Research on Cancer
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by