From 8f2d3bc638bb15809c949b8e270f63f9370655f2 Mon Sep 17 00:00:00 2001
From: bencomp <ben@companjen.name>
Date: Sat, 16 Jan 2016 00:15:20 +0100
Subject: [PATCH 1/2] Refactor use of
 DataverseServiceBean.getApplicationVersion (fixes #1579)

Updated all calls to `DataverseServiceBean.getApplicationVersion` to
use `SystemConfig.getVersion`. Removed the now unused method and an
already unused field `appversion` from DataverseServiceBean, as well
as comments about the reconciliation.
---
 .../harvard/iq/dataverse/DataverseServiceBean.java    | 11 -----------
 .../edu/harvard/iq/dataverse/util/SystemConfig.java   |  4 ----
 src/main/webapp/dataverse_template.xhtml              |  2 +-
 src/main/webapp/passwordreset.xhtml                   |  4 ++--
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index ade47fb4949..b5f5d78f716 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -221,17 +221,6 @@ public DataverseFacet findFacet(Long id) {
     
     public List<DataverseFacet> findAllDataverseFacets() {
         return em.createQuery("select object(o) from DataverseFacet as o order by o.display").getResultList();
-    }  
-   
-    private String appVersionString;
-
-    /**
-     * @todo Remove this method, and make all the (a couple of) xhtml pages 
-     * call the SystemConfig.getVersion method directly 
-     * (I don't have time to do it now -- L.A. 4.0.2)
-     */
-    public String getApplicationVersion() { 
-        return systemConfig.getVersion(true);
     }
     
     public String getDataverseLogoThumbnailAsBase64(Dataverse dataverse, User user) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
index 72c92677a0d..bbc93d43598 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -66,10 +66,6 @@ public class SystemConfig {
      */
     private static final int defaultZipUploadFilesLimit = 1000; 
 
-    /**
-     * @todo Reconcile with getApplicationVersion on DataverseServiceBean.java
-     * which we'd like to move to this class.
-     */
     private static String appVersionString = null; 
     private static String buildNumberString = null; 
     
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 9a6f95392c7..500637c7028 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -51,7 +51,7 @@
                     <div class="poweredbylogo">
                         <span>#{bundle['footer.poweredby']}</span>
                         <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank"><img src="/resources/images/dataverseproject_logo.jpg" alt="#{bundle['footer.dataverseProject']}" /></a>
-                        <span class="version">v. #{dataverseServiceBean.applicationVersion}</span>
+                        <span class="version">v. #{systemConfig.getVersion()}</span>
                     </div>
                 </div>
             </div>
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 99bddd26cf4..2a257fd3822 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -99,8 +99,8 @@
                         <div class="row" jsf:rendered="#{PasswordResetPage.isAccountUpgrade()}">
                             <div class="col-sm-12">
                                 <h:outputFormat styleClass="h2 text-info show" value="#{bundle['user.updatePassword.welcome']}">
-                                        <f:param value="#{dataverseServiceBean.applicationVersion}"/>
-                                        <f:param value="#{PasswordResetPage.user.displayInfo.title}"/>
+                                    <f:param value="#{systemConfig.getVersion(true)}"/>
+                                    <f:param value="#{PasswordResetPage.user.displayInfo.title}"/>
                                 </h:outputFormat>
                                 <p class="help-block"><span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['user.updatePassword.warning']}</span></p>
                             </div>

From cb9f527c66372363ee347d125c126bfc64f41bdc Mon Sep 17 00:00:00 2001
From: bencomp <ben@companjen.name>
Date: Sat, 16 Jan 2016 11:55:57 +0100
Subject: [PATCH 2/2] Add argument 'true' to SystemConfig.getVersion in XHTML

The removed method `DataverseServiceBean.getApplicationVersion`
called `SystemConfig.getVersion` with `true` as the argument.
My previous commit should have included the argument in
replacements of the method calls.
---
 src/main/webapp/dataverse_template.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 500637c7028..614bd601058 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -51,7 +51,7 @@
                     <div class="poweredbylogo">
                         <span>#{bundle['footer.poweredby']}</span>
                         <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank"><img src="/resources/images/dataverseproject_logo.jpg" alt="#{bundle['footer.dataverseProject']}" /></a>
-                        <span class="version">v. #{systemConfig.getVersion()}</span>
+                        <span class="version">v. #{systemConfig.getVersion(true)}</span>
                     </div>
                 </div>
             </div>