← Back to branch summary

~ubuntu-branches/ubuntu/natty/libstruts1.2-java/natty

« back to all changes in this revision

Viewing changes to src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java

  • Committer: Bazaar Package Importer
  • Author(s): Debian Java Maintainers, Onkar Shinde, Emmanuel Bourg
  • Date: 2010-04-07 14:21:41 UTC
  • Revision ID: james.westby@ubuntu.com-20100407142141-d21u466e7gn9cdb2
Tags: 1.2.9-4
[ Onkar Shinde ]
* Build/runtime dependency libservlet2.3-java -> libservlet2.5-java.
* Build dependency java-gcj-compat-dev -> default-jdk.
* Remove runtime dependencies since the package is build with lowest target
  JVM version (1.3)
* Convert patches to quilt format. Convert package to 3.0 format.
* lintian errors/warnings fixed
  - Section devel -> java.
  - Standards version 3.7.2 -> 3.8.4.
  - Remove Debian revisions from build/runtime dependencies.
  - Add ${misc:Depends} to runtime dependencies.
  - Update compat version to 5.
  - Move homepage url to Homepage field.
  - Write copyright in DEP-5 format. Remove complete text of Apache-2.0
    license.

[ Emmanuel Bourg ]
* Update of the URLs
* Rename Jakarta Commons to Apache Commons

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
30
30
 
31
31
import org.apache.commons.beanutils.PropertyUtils;
32
32
import org.apache.struts.util.IteratorAdapter;
 
33
import org.apache.struts.util.ResponseUtils;
33
34
import org.apache.struts.taglib.TagUtils;
34
35
import org.apache.struts.util.MessageResources;
35
36
 
291
292
        if (filter) {
292
293
            sb.append(TagUtils.getInstance().filter(value));
293
294
        } else {
294
 
            sb.append(value);
 
295
            sb.append(ResponseUtils.filterIfQuote(value));
295
296
        }
296
297
        sb.append("\"");
297
298
        if (matched) {
299
300
        }
300
301
        if (style != null) {
301
302
            sb.append(" style=\"");
302
 
            sb.append(style);
 
303
            sb.append(ResponseUtils.filterIfQuote(style));
303
304
            sb.append("\"");
304
305
        }
305
306
        if (styleClass != null) {
306
307
            sb.append(" class=\"");
307
 
            sb.append(styleClass);
 
308
            sb.append(ResponseUtils.filterIfQuote(styleClass));
308
309
            sb.append("\"");
309
310
        }
310
311
        
313
314
        if (filter) {
314
315
            sb.append(TagUtils.getInstance().filter(label));
315
316
        } else {
316
 
            sb.append(label);
 
317
            sb.append(ResponseUtils.filterIfQuote(label));
317
318
        }
318
319
        
319
320
        sb.append("</option>\r\n");