Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-03-31 21:04:03 -0400
committerRyan D. Brooks2016-03-31 21:04:03 -0400
commit6f3817936f2de155c65cd5cf19b9b53ff72c864b (patch)
tree0be724b47956d988f0f27822a9a3af244dc654a1 /plugins/org.eclipse.osee.account.rest.model
parent65b07a027aaa915309a0f517c22b87a3ebcdb7a7 (diff)
downloadorg.eclipse.osee-6f3817936f2de155c65cd5cf19b9b53ff72c864b.tar.gz
org.eclipse.osee-6f3817936f2de155c65cd5cf19b9b53ff72c864b.tar.xz
org.eclipse.osee-6f3817936f2de155c65cd5cf19b9b53ff72c864b.zip
feature: Add links to CommonNavigateItems
Diffstat (limited to 'plugins/org.eclipse.osee.account.rest.model')
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java14
-rw-r--r--plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/Link.java16
2 files changed, 20 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
index b09094e7be..f01a67d219 100644
--- a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
+++ b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/AccountWebPreferences.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.account.rest.model;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -21,7 +22,7 @@ import org.json.JSONObject;
*/
public class AccountWebPreferences {
- Map<String, Link> linksMap;
+ Map<String, Link> linksMap = new HashMap<String, Link>();
public AccountWebPreferences() {
@@ -31,16 +32,11 @@ public class AccountWebPreferences {
for (String team : teamToPreferences.keySet()) {
initPreferences(teamToPreferences.get(team), team);
}
-
}
private void initPreferences(String string, String team) {
try {
JSONObject jObject = new JSONObject(string);
-
- if (linksMap == null) {
- linksMap = new HashMap<String, Link>();
- }
JSONObject linkJsonObject = jObject.getJSONObject("links");
@SuppressWarnings("unchecked")
Iterator<String> keys = linkJsonObject.keys();
@@ -54,6 +50,12 @@ public class AccountWebPreferences {
if (linkJObject.has("url")) {
link.setUrl(linkJObject.getString("url"));
}
+ if (linkJObject.has("tags")) {
+ JSONArray array = linkJObject.getJSONArray("tags");
+ for (int x = 0; x < array.length(); x++) {
+ link.getTags().add(array.getString(x));
+ }
+ }
link.setTeam(team);
link.setId(linkJObject.getString("id"));
linksMap.put(next, link);
diff --git a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/Link.java b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/Link.java
index 7f500b6cd2..abec1f4d63 100644
--- a/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/Link.java
+++ b/plugins/org.eclipse.osee.account.rest.model/src/org/eclipse/osee/account/rest/model/Link.java
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.account.rest.model;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Angel Avila
*/
@@ -18,10 +21,7 @@ public class Link {
String url;
String id;
String team;
-
- public Link() {
-
- }
+ List<String> tags = new ArrayList<String>();
public void setId(String id) {
this.id = id;
@@ -54,4 +54,12 @@ public class Link {
public String getTeam() {
return team;
}
+
+ public List<String> getTags() {
+ return tags;
+ }
+
+ public void setTags(List<String> tags) {
+ this.tags = tags;
+ }
}

Back to the top