X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2Fpages%2FPendingRequestsShow.java;h=694fefdc19f6a42c0493b69d2086dbe09c4376b8;hb=c353159903bf9c7f3f4426e66cad9af2c657fb1d;hp=585a75ae8ae2218a8c941b4f00a9527272ccee03;hpb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;p=aaf%2Fauthz.git diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java index 585a75ae..694fefdc 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/PendingRequestsShow.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. @@ -62,10 +62,10 @@ public class PendingRequestsShow extends Page { public static final String NAME = "MyRequests"; private static final String[] FIELDS = new String[] {"as_user"}; // as_user Checked in Display private static final String AS_USER=NAME+".as_user"; - + public PendingRequestsShow(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException { super(gui.env, NAME,HREF, FIELDS, - new BreadCrumbs(breadcrumbs), + new BreadCrumbs(breadcrumbs), new TopOfPage(gui.env,true, "expedite"), new Table("Pending Requests",gui.env.newTransNoAvg(),new Model(gui.env), "class=std") ); @@ -98,7 +98,7 @@ public class PendingRequestsShow extends Page { .leaf("a","href=#expedite_directions","onclick=divVisibility('expedite_directions');") .text("Click Here").end() .divID("expedite_directions", "style=display:none"); - + hgen .incr(HTMLGen.OL) .incr(HTMLGen.LI) @@ -120,12 +120,12 @@ public class PendingRequestsShow extends Page { /** * Implement the Table Content for Requests by User - * + * * @author Jeremiah * */ private static class Model extends TableData { - final long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L; + final static long NUM_100NS_INTERVALS_SINCE_UUID_EPOCH = 0x01b21dd213814000L; private final Slot sAsUser; private static final String[] headers = new String[] {"Request Date","Status","Memo","Approver"}; @@ -137,7 +137,7 @@ public class PendingRequestsShow extends Page { public String[] headers() { return headers; } - + @Override public Cells get(final AuthzTrans trans, final AAF_GUI gui) { final ArrayList rv = new ArrayList<>(); @@ -163,12 +163,11 @@ public class PendingRequestsShow extends Page { return id1.timestamp()<=id2.timestamp()?1:-1; } }); - + String prevTicket = null; for (Approval a : approvals) { String approver = a.getApprover(); -// String approverShort = approver.substring(0,approver.indexOf('@')); - + AbsCell tsCell = null; String ticket = a.getTicket(); if (ticket==null || ticket.equals(prevTicket)) { @@ -180,7 +179,7 @@ public class PendingRequestsShow extends Page { RequestDetail.HREF + "?ticket=" + ticket,false); prevTicket = ticket; } - + AbsCell approverCell = new TextCell(approver); AbsCell[] sa = new AbsCell[] { tsCell,