geotools-commits

[<svn...@os...>]

Author: groldan
Date: 2012-02-17 15:21:46 -0800 (Fri, 17 Feb 2012)
New Revision: 38574

Modified:
   branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_0_0/WFSFeatureSource.java
Log:
GEOT-4041: keywords may come as direct string or KeywordType

Modified: branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_0_0/WFSFeatureSource.java
===================================================================
--- branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_0_0/WFSFeatureSource.java	2012-02-15 13:04:15 UTC (rev 38573)
+++ branches/2.7.x/modules/unsupported/wfs/src/main/java/org/geotools/data/wfs/v1_0_0/WFSFeatureSource.java	2012-02-17 23:21:46 UTC (rev 38574)
@@ -123,23 +123,24 @@
                 return featureSetDescription.getAbstract();
             }
 
-            @SuppressWarnings("unchecked")
             public Set<String> getKeywords() {
                 return extractKeywords(featureSetDescription.getKeywords());
             }
             
             @SuppressWarnings("unchecked")
-            private Set<String> extractKeywords(List<KeywordsType> keywordsList) {
+            private Set<String> extractKeywords(List<?> keywordsList) {
                 Set<String> keywords = new HashSet<String>();
                 if (keywordsList != null) {
-                    for (KeywordsType keys : keywordsList) {
-                        if (keys != null) {
-                            List<String> kws = keys.getKeyword();
+                    for (Object keys : keywordsList) {
+                        if (keys instanceof KeywordsType) {
+                            List<String> kws = ((KeywordsType)keys).getKeyword();
                             for (String kw : kws) {
                                 if (kw != null && kw.trim().length() > 0) {
                                     keywords.add(kw);
                                 }
                             }
+                        } else if (keys instanceof String) {
+                            keywords.add((String)keys);
                         }
                     }
                 }