commit 50e80ea281e26d2d13f5d17e0d7553d06f44622d
author Simon Hunt <simon@onlab.us> Thu Jun 23 01:40:30 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 23 08:45:17 2016 +0000
tree 62f312541290e5547c5138049dfe7645da5e287e
parent 7a30765c6be7c4b21aaa18e51508344cda4baac2

Properties need to be unique, even when they have the same name..

Change-Id: Ifc992458778860c6c8f574c76aad0e9f92699193

web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
index 3ca6e88..57e380f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/SettingsViewMessageHandler.java
@@ -37,6 +37,7 @@
 
     private static final String COMPONENT = "component";
     private static final String FQ_COMPONENT = "fqComponent";
+    private static final String PROP = "prop";
     private static final String ID = "id";
     private static final String TYPE = "type";
     private static final String VALUE = "value";
@@ -46,7 +47,7 @@
     private static final char DOT = '.';
 
     private static final String[] COL_IDS = {
-            COMPONENT, FQ_COMPONENT, ID, TYPE, VALUE, DEFAULT, DESC
+            COMPONENT, FQ_COMPONENT, PROP, ID, TYPE, VALUE, DEFAULT, DESC
     };
 
     @Override
@@ -95,9 +96,12 @@
 
         private void populateRow(TableModel.Row row, String fqComp,
                                  ConfigProperty prop) {
-            row.cell(COMPONENT, simpleName(fqComp))
+            String simple = simpleName(fqComp);
+
+            row.cell(ID, simple + DELIM + prop.name())
                     .cell(FQ_COMPONENT, fqComp)
-                    .cell(ID, prop.name())
+                    .cell(COMPONENT, simple)
+                    .cell(PROP, prop.name())
                     .cell(TYPE, typeName(prop))
                     .cell(VALUE, prop.value())
                     .cell(DEFAULT, prop.defaultValue())
@@ -113,5 +117,7 @@
         private String typeName(ConfigProperty prop) {
             return prop.type().toString().toLowerCase();
         }
+
+        private static final String DELIM = "::";
     }
 }