Revision 47420 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureAttributeDescriptor.java

View differences:

DefaultFeatureAttributeDescriptor.java
40 40 
import org.apache.commons.lang3.ArrayUtils;
41 41 
import org.apache.commons.lang3.StringUtils;
42 42 
import org.apache.commons.lang3.tuple.Pair;
43 
import org.apache.commons.text.StringEscapeUtils;
43 44 
import org.cresques.cts.IProjection;
44 45 
import org.gvsig.expressionevaluator.Expression;
45 46 
import org.gvsig.expressionevaluator.ExpressionUtils;
......
2088 2089 
            builder.append(this.type.getName());
2089 2090 
            for (String key : this.sets.keySet()) {
2090 2091 
                builder.append(sep);
2091 
                builder.append("set");
2092 
                builder.append(sep);
2093 
                builder.append(key);
2094 
                builder.append("=");
2095 
                builder.append(this.sets.get(key));
2096 
            }
2097 
            if( this.tags!=null ) {
2098 
                for (String key : this.tags.keySet()) {
2092 
                String s = this.sets.get(key);
2093 
                if(s.contains(sep)){
2094 
                    builder.append("setesc");
2099 2095 
                    builder.append(sep);
2100 
                    builder.append("tag");
2096 
                    builder.append("html");
2101 2097 
                    builder.append(sep);
2102 2098 
                    builder.append(key);
2103 2099 
                    builder.append("=");
2104 
                    builder.append(this.tags.get(key));
2100 
                    s = StringEscapeUtils.escapeHtml3(s);
2101 
                    s = StringUtils.replace(s, sep, "&#"+((int)(sep.charAt(0)))+";");
2102 
                    builder.append(s);
2103 
                } else {
2104 
                    builder.append("set");
2105 
                    builder.append(sep);
2106 
                    builder.append(key);
2107 
                    builder.append("=");
2108 
                    builder.append(s);
2105 2109 
                }
2110
2106 2111 
            }
2112 
            if( this.tags!=null ) {
2113 
                for (String key : this.tags.keySet()) {
2114 
                    builder.append(sep);
2115 
                    String s = this.tags.get(key);
2116 
                    if(s.contains(sep)){
2117 
                        builder.append("tagesc");
2118 
                        builder.append(sep);
2119 
                        builder.append("html");
2120 
                        builder.append(sep);
2121 
                        builder.append(key);
2122 
                        builder.append("=");
2123 
                        s = StringEscapeUtils.escapeHtml3(s);
2124 
                        s = StringUtils.replace(s, sep, "&#"+((int)(sep.charAt(0)))+";");
2125 
                        builder.append(s);
2126 
                    } else {
2127 
                        builder.append("tag");
2128 
                        builder.append(sep);
2129 
                        builder.append(key);
2130 
                        builder.append("=");
2131 
                        builder.append(s);
2132 
                    }
2133 
                }
2134 
            }
2107 2135 
            return builder.toString();
2108 2136 
        }
2109 2137 
    }

Also available in: Unified diff