Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ADD] File merge function #282

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ADD] File merge function #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/com/yahoo/platform/yui/compressor/YUICompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void main(String args[]) {
CmdLineParser.Option preserveUnknownHintsOpt = parser.addBooleanOption('p', "preservehints");

Reader in = null;
Writer out = null;
BufferedWriter out = null;
Writer mungemap = null;

try {
Expand Down Expand Up @@ -199,9 +199,9 @@ public EvaluatorException runtimeError(String message, String sourceName,
in.close(); in = null;

if (outputFilename == null) {
out = new OutputStreamWriter(System.out, charset);
out = new BufferedWriter(new OutputStreamWriter(System.out, charset));
} else {
out = new OutputStreamWriter(new FileOutputStream(outputFilename), charset);
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFilename, true), charset));
if (mungemap != null) {
mungemap.write("\n\nFile: "+outputFilename+"\n\n");
}
Expand All @@ -227,9 +227,9 @@ public EvaluatorException runtimeError(String message, String sourceName,
in.close(); in = null;

if (outputFilename == null) {
out = new OutputStreamWriter(System.out, charset);
out = new BufferedWriter(new OutputStreamWriter(System.out, charset));
} else {
out = new OutputStreamWriter(new FileOutputStream(outputFilename), charset);
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFilename), charset));
}

compressor.compress(out, linebreakpos);
Expand Down