Repository: incubator-freemarker Updated Branches: refs/heads/3 bb82fa6fa -> 6774e61fa
(Class movement oversight) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6774e61f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6774e61f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6774e61f Branch: refs/heads/3 Commit: 6774e61fa12ae036d66807705b9c13e3b12aa2d3 Parents: bb82fa6 Author: ddekany <[email protected]> Authored: Fri Feb 24 00:08:08 2017 +0100 Committer: ddekany <[email protected]> Committed: Fri Feb 24 00:08:08 2017 +0100 ---------------------------------------------------------------------- .../apache/freemarker/core/Configuration.java | 1 + .../freemarker/core/JavaScriptOutputFormat.java | 55 -------------------- .../impl/JavaScriptOutputFormat.java | 55 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6774e61f/src/main/java/org/apache/freemarker/core/Configuration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/Configuration.java b/src/main/java/org/apache/freemarker/core/Configuration.java index db45422..4ddc98a 100644 --- a/src/main/java/org/apache/freemarker/core/Configuration.java +++ b/src/main/java/org/apache/freemarker/core/Configuration.java @@ -55,6 +55,7 @@ import org.apache.freemarker.core.outputformat.impl.CSSOutputFormat; import org.apache.freemarker.core.outputformat.impl.CombinedMarkupOutputFormat; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.JSONOutputFormat; +import org.apache.freemarker.core.outputformat.impl.JavaScriptOutputFormat; import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; import org.apache.freemarker.core.outputformat.impl.RTFOutputFormat; import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6774e61f/src/main/java/org/apache/freemarker/core/JavaScriptOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/JavaScriptOutputFormat.java b/src/main/java/org/apache/freemarker/core/JavaScriptOutputFormat.java deleted file mode 100644 index 82e20d5..0000000 --- a/src/main/java/org/apache/freemarker/core/JavaScriptOutputFormat.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.freemarker.core; - -import org.apache.freemarker.core.outputformat.OutputFormat; - -/** - * Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript"). This format doesn't - * support escaping. - * - * @since 2.3.24 - */ -public class JavaScriptOutputFormat extends OutputFormat { - - /** - * The only instance (singleton) of this {@link OutputFormat}. - */ - public static final JavaScriptOutputFormat INSTANCE = new JavaScriptOutputFormat(); - - private JavaScriptOutputFormat() { - // Only to decrease visibility - } - - @Override - public String getName() { - return "JavaScript"; - } - - @Override - public String getMimeType() { - return "application/javascript"; - } - - @Override - public boolean isOutputFormatMixingAllowed() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6774e61f/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java b/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java new file mode 100644 index 0000000..3144578 --- /dev/null +++ b/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.freemarker.core.outputformat.impl; + +import org.apache.freemarker.core.outputformat.OutputFormat; + +/** + * Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript"). This format doesn't + * support escaping. + * + * @since 2.3.24 + */ +public class JavaScriptOutputFormat extends OutputFormat { + + /** + * The only instance (singleton) of this {@link OutputFormat}. + */ + public static final JavaScriptOutputFormat INSTANCE = new JavaScriptOutputFormat(); + + private JavaScriptOutputFormat() { + // Only to decrease visibility + } + + @Override + public String getName() { + return "JavaScript"; + } + + @Override + public String getMimeType() { + return "application/javascript"; + } + + @Override + public boolean isOutputFormatMixingAllowed() { + return false; + } + +}
