~ubuntu-branches/ubuntu/saucy/fop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/java/org/apache/fop/render/txt/TXTStream.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-05-21 12:21:26 UTC
  • mfrom: (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130521122126-3c9r5fo6ountjg6r
Tags: 1:1.1.dfsg-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  -  Transition libservlet2.5-java -> libservlet3.0-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
 * limitations under the License.
16
16
 */
17
17
 
18
 
/* $Id: TXTStream.java 679326 2008-07-24 09:35:34Z vhennebert $ */
 
18
/* $Id: TXTStream.java 985537 2010-08-14 17:17:00Z jeremias $ */
19
19
 
20
20
package org.apache.fop.render.txt;
21
21
 
71
71
     * @param encoding the encoding, if null, "UTF-8" is chosen as default
72
72
     */
73
73
    public void setEncoding(String encoding) {
74
 
        if (encoding != null)
 
74
        if (encoding != null) {
75
75
            this.encoding = encoding;
76
 
        else
 
76
        } else {
77
77
            this.encoding = DEFAULT_ENCODING;
 
78
        }
78
79
    }
79
80
}
80
81