Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 49074 invoked from network); 23 Feb 2009 15:50:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Feb 2009 15:50:42 -0000 Received: (qmail 52587 invoked by uid 500); 23 Feb 2009 15:50:42 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 52568 invoked by uid 500); 23 Feb 2009 15:50:42 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 52559 invoked by uid 99); 23 Feb 2009 15:50:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Feb 2009 07:50:42 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Feb 2009 15:50:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 50085238899B; Mon, 23 Feb 2009 15:50:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747055 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/converter/ components/camel-web/src/main/java/org/apache/camel/web/resources/ components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/ Date: Mon, 23 Feb 2009 15:50:12 -0000 To: commits@camel.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090223155013.50085238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jstrachan Date: Mon Feb 23 15:50:11 2009 New Revision: 747055 URL: http://svn.apache.org/viewvc?rev=747055&view=rev Log: CAMEL-1355 - improved rendering of the available type converters Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/index.jsp Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=747055&r1=747054&r2=747055&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Mon Feb 23 15:50:11 2009 @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; import java.util.HashSet; +import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import org.apache.camel.Exchange; @@ -177,12 +178,13 @@ return answer; } - public Set getToClassMappings(Class fromClass) { - Set answer = new HashSet(); + public Map getToClassMappings(Class fromClass) { + Map answer = new HashMap(); synchronized (typeMappings) { - for (TypeMapping mapping : typeMappings.keySet()) { + for (Map.Entry entry : typeMappings.entrySet()) { + TypeMapping mapping = entry.getKey(); if (mapping.isApplicable(fromClass)) { - answer.add(mapping.getToType()); + answer.put(mapping.getToType(), entry.getValue()); } } } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java?rev=747055&r1=747054&r2=747055&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java Mon Feb 23 15:50:11 2009 @@ -18,6 +18,7 @@ package org.apache.camel.web.resources; import org.apache.camel.impl.converter.DefaultTypeConverter; +import org.apache.camel.TypeConverter; import java.util.HashMap; import java.util.Map; @@ -35,14 +36,15 @@ this.type = type; } - public Map getConverters() { - Map answer = new TreeMap(); + public Map getConverters() { + Map answer = new TreeMap(); DefaultTypeConverter converter = getDefaultTypeConverter(); if (converter != null) { - Set classes = converter.getToClassMappings(type); - for (Class aClass : classes) { + Map classes = converter.getToClassMappings(type); + for (Map.Entry entry : classes.entrySet()) { + Class aClass = entry.getKey(); String name = ConvertersResource.nameOf(aClass); - answer.put(name, aClass); + answer.put(name, entry.getValue()); } } return answer; Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/index.jsp URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/index.jsp?rev=747055&r1=747054&r2=747055&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/index.jsp (original) +++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ConvertersFromResource/index.jsp Mon Feb 23 15:50:11 2009 @@ -7,14 +7,15 @@

Type Converters from: ${it.type.name}

- + +
To TypeConverter
${entry.key}${entry.value}