diff --git a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebLink.java b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebLink.java
index 733e4c5..0a3f4a1 100644
--- a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebLink.java
+++ b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebLink.java
@@ -31,14 +31,20 @@
 
     private boolean primary;
     private boolean secondary;
+
     /**
-     * Initialize the Link key attributes.
+     * Initialize the Link and key attributes.
+     * @param key the link key identifier
+     * @param link the link to be highlighted.
      */
     public PceWebLink(LinkKey key, Link link) {
         super(key, link);
     }
-    /**
+
+     /**
      * Highlight the color of given selected links.
+     * @param selectedLinks the primary links
+     * @param allLinks the secondary links
      */
     public void computeHilight(Set<Link> selectedLinks, Set<Link> allLinks) {
         primary = selectedLinks.contains(this.one()) ||
