commit afae2f71fc3901772853f4e4b55edf8b04fb3fce
author Simon Hunt <simon@onlab.us> Fri Mar 04 21:18:23 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 07 19:30:59 2016 +0000
tree 4302d41da994be166dc791d46e0e02e333d510ff
parent 900885389fbe1407273931b4e1822cb649f7a109

Apps-- added onos.app.title property to applications.

Change-Id: Id845390ee0bee5b871c0ce9f47b2ce98fbcf26b9

core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java

diff --git a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
index 1e3f49c..3699b5d 100644
--- a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
+++ b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
@@ -88,6 +88,7 @@
 
     private static final String CATEGORY = "[@category]";
     private static final String URL = "[@url]";
+    private static final String TITLE = "[@title]";
 
     private static final String ROLE = "security.role";
     private static final String APP_PERMISSIONS = "security.permissions.app-perm";
@@ -294,6 +295,11 @@
         String name = cfg.getString(NAME);
         Version version = Version.version(cfg.getString(VERSION));
         String origin = cfg.getString(ORIGIN);
+
+        String title = cfg.getString(TITLE);
+        // FIXME: title should be set as attribute to APP, but fallback for now...
+        title = title == null ? name : title;
+
         String category = cfg.getString(CATEGORY, UTILITY);
         String url = cfg.getString(URL);
         byte[] icon = getApplicationIcon(name);
@@ -313,7 +319,7 @@
         // put short description to description field
         String desc = compactDescription(readme);
 
-        return new DefaultApplicationDescription(name, version, desc, origin,
+        return new DefaultApplicationDescription(name, version, title, desc, origin,
                                                  category, url, readme, icon,
                                                  role, perms, featuresRepo,
                                                  features, requiredApps);