You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/09/14 21:13:01 UTC
incubator-juneau git commit: Only use primary content types in
ContentType menu item.
Repository: incubator-juneau
Updated Branches:
refs/heads/master a5dd20ae8 -> a024ca7ee
Only use primary content types in ContentType menu item.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/a024ca7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/a024ca7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/a024ca7e
Branch: refs/heads/master
Commit: a024ca7eedd184f93508ebc2d72ca29dcac519e9
Parents: a5dd20a
Author: JamesBognar <ja...@apache.org>
Authored: Thu Sep 14 17:12:57 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Thu Sep 14 17:12:57 2017 -0400
----------------------------------------------------------------------
.../org/apache/juneau/rest/widget/ContentTypeMenuItem.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/a024ca7e/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
index 43c896f..226a951 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.dto.html5.*;
import org.apache.juneau.http.*;
import org.apache.juneau.rest.*;
+import org.apache.juneau.serializer.*;
import org.apache.juneau.utils.*;
/**
@@ -66,8 +67,9 @@ public class ContentTypeMenuItem extends MenuItemWidget {
@Override /* MenuItemWidget */
public Div getContent(RestRequest req) {
Div div = div();
- List<MediaType> l = new ArrayList<MediaType>(req.getSerializerGroup().getSupportedMediaTypes());
- Collections.sort(l);
+ Set<MediaType> l = new TreeSet<MediaType>();
+ for (Serializer s : req.getSerializerGroup().getSerializers())
+ l.add(s.getMediaTypes()[0]);
for (MediaType mt : l) {
URI uri = req.getUri(true, new AMap<String,String>().append("plainText","true").append("Accept",mt.toString()));
div.children(a(uri, mt), br());