dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Stian Sandvold (stian-sandvold)
------------------------------------------------------------
revno: 21605 [merge]
committer: Stian Sandvold <stian.sandvold@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2016-01-05 19:42:24 +0100
message:
  Fixed a minor bug caused by a rename; codestyle fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java	2016-01-05 18:27:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java	2016-01-05 18:40:47 +0000
@@ -46,11 +46,13 @@
         this.key = key;
     }
 
-    public boolean isOk() {
+    public boolean isOk()
+    {
         return this == OK;
     }
 
-    public String getKey() {
+    public String getKey()
+    {
         return key;
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java	2016-01-05 18:25:17 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java	2016-01-05 18:40:47 +0000
@@ -156,7 +156,8 @@
         try
         {
             maxKeyLength = Cipher.getMaxAllowedKeyLength( "AES" );
-            if(maxKeyLength == 128) {
+            if ( maxKeyLength == 128 )
+            {
                 return EncryptionStatus.MISSING_JCE_POLICY;
             }
         }
@@ -167,11 +168,13 @@
 
         password = getProperty( ConfigurationKey.ENCRYPTION_PASSWORD );
 
-        if(password.length() == 0) {
+        if ( password.length() == 0 )
+        {
             return EncryptionStatus.MISSING_ENCRYPTION_PASSWORD;
         }
 
-        if(password.length() < 24) {
+        if ( password.length() < 24 )
+        {
             return EncryptionStatus.ENCRYPTION_PASSWORD_TOO_SHORT;
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java	2016-01-05 18:25:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java	2016-01-05 18:40:47 +0000
@@ -156,7 +156,7 @@
 
     public boolean getEncryptionStatus()
     {
-        return dhisConfigurationProvider.isEncryptionConfigured().isAvailable();
+        return dhisConfigurationProvider.isEncryptionConfigured().isOk();
 
     }