Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / auth / auth-gui / src / main / java / org / onap / aaf / auth / gui / pages / NsInfoAction.java

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsInfoAction.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsInfoAction.java
index 8a2da3d..c93d156 100644 (file)
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsInfoAction.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsInfoAction.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@ public class NsInfoAction extends Page {
                 final Slot sPassword = gui.env.slot(PassChangeForm.NAME+'.'+PassChangeForm.fields[2]);
                 final Slot sPassword2 = gui.env.slot(PassChangeForm.NAME+'.'+PassChangeForm.fields[3]);
                 final Slot startDate = gui.env.slot(PassChangeForm.NAME+'.'+PassChangeForm.fields[4]);
-                
+
                 @Override
                 public void code(final Cache<HTMLGen> cache, final HTMLGen hgen) throws APIException, IOException {
                     cache.dynamic(hgen, new DynamicCode<HTMLGen,AAF_GUI, AuthzTrans>() {
@@ -65,15 +65,15 @@ public class NsInfoAction extends Page {
                             String currPass = trans.get(sCurrPass,null);
                             final String password = trans.get(sPassword,null);
                             String password2 = trans.get(sPassword2,null);
-                            
+
                             // Run Validations
                             boolean fail = true;
-                            
+
                             if (id==null || id.indexOf('@')<=0) {
                                 hgen.p("Data Entry Failure: Please enter a valid ID, including domain.");
-                            } else if(password == null || password2 == null || currPass == null) {
+                            } else if (password == null || password2 == null || currPass == null) {
                                 hgen.p("Data Entry Failure: Both Password Fields need entries.");
-                            } else if(!password.equals(password2)) {
+                            } else if (!password.equals(password2)) {
                                 hgen.p("Data Entry Failure: Passwords do not match.");
                             } else { // everything else is checked by Server
                                 final CredRequest cred = new CredRequest();
@@ -93,35 +93,35 @@ public class NsInfoAction extends Page {
                                                 boolean go;
                                                 boolean fail = true;
                                                 fcr.get(5000);
-                                                if(fcr.code() == 200) {
+                                                if (fcr.code() == 200) {
                                                     hgen.p("Current Password validated");
                                                     go = true;
                                                 } else {
                                                     hgen.p(String.format("Invalid Current Password: %d %s",fcr.code(),fcr.body()));
                                                     go = false;
                                                 }
-                                                if(go) {
+                                                if (go) {
                                                     tt.done();
                                                     tt = trans.start("AAF Change Password",Env.REMOTE);
                                                     try {
                                                         // Change over Cred to reset mode
                                                         cred.setPassword(password);
                                                         String start = trans.get(startDate, null);
-                                                        if(start!=null) {
+                                                        if (start!=null) {
                                                             try {
                                                                 cred.setStart(Chrono.timeStamp(Chrono.dateOnlyFmt.parse(start)));
                                                             } catch (ParseException e) {
                                                                 throw new CadiException(e);
                                                             }
                                                         }
-                                                        
+
                                                         fcr = client.create(
                                                                 "/authn/cred",
                                                                 gui.getDF(CredRequest.class),
                                                                 cred
                                                                 );
-                    
-                                                        if(fcr.get(5000)) {
+
+                                                        if (fcr.get(5000)) {
                                                             // Do Remote Call
                                                             hgen.p("New Password has been added.");
                                                             fail = false;
@@ -145,10 +145,10 @@ public class NsInfoAction extends Page {
                                 }
                             }
                         hgen.br();
-                        if(fail) {
+                        if (fail) {
                             hgen.incr("a",true,"href="+PassChangeForm.HREF+"?id="+id).text("Try again").end();
                         } else {
-                            hgen.incr("a",true,"href="+Home.HREF).text("Home").end(); 
+                            hgen.incr("a",true,"href="+Home.HREF).text("Home").end();
                         }
                     }
                 });