Repository: incubator-freemarker Updated Branches: refs/heads/3 5c98c0ed5 -> bb82fa6fa
(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/bb82fa6f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bb82fa6f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bb82fa6f Branch: refs/heads/3 Commit: bb82fa6fa1ab5874840385c9e1801d83d4215090 Parents: 5c98c0e Author: ddekany <ddek...@apache.org> Authored: Fri Feb 24 00:06:14 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Feb 24 00:06:14 2017 +0100 ---------------------------------------------------------------------- .../apache/freemarker/core/CSSOutputFormat.java | 54 -------------------- .../apache/freemarker/core/Configuration.java | 1 + .../core/outputformat/impl/CSSOutputFormat.java | 54 ++++++++++++++++++++ 3 files changed, 55 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bb82fa6f/src/main/java/org/apache/freemarker/core/CSSOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/CSSOutputFormat.java b/src/main/java/org/apache/freemarker/core/CSSOutputFormat.java deleted file mode 100644 index c171ad1..0000000 --- a/src/main/java/org/apache/freemarker/core/CSSOutputFormat.java +++ /dev/null @@ -1,54 +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 CSS output format (MIME type "text/css", name "CSS"). This format doesn't support escaping. - * - * @since 2.3.24 - */ -public class CSSOutputFormat extends OutputFormat { - - /** - * The only instance (singleton) of this {@link OutputFormat}. - */ - public static final CSSOutputFormat INSTANCE = new CSSOutputFormat(); - - private CSSOutputFormat() { - // Only to decrease visibility - } - - @Override - public String getName() { - return "CSS"; - } - - @Override - public String getMimeType() { - return "text/css"; - } - - @Override - public boolean isOutputFormatMixingAllowed() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bb82fa6f/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 af86664..db45422 100644 --- a/src/main/java/org/apache/freemarker/core/Configuration.java +++ b/src/main/java/org/apache/freemarker/core/Configuration.java @@ -51,6 +51,7 @@ import org.apache.freemarker.core.model.impl.DefaultObjectWrapperBuilder; import org.apache.freemarker.core.outputformat.MarkupOutputFormat; import org.apache.freemarker.core.outputformat.OutputFormat; import org.apache.freemarker.core.outputformat.UnregisteredOutputFormatException; +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; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bb82fa6f/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java b/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java new file mode 100644 index 0000000..72d872c --- /dev/null +++ b/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java @@ -0,0 +1,54 @@ +/* + * 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 CSS output format (MIME type "text/css", name "CSS"). This format doesn't support escaping. + * + * @since 2.3.24 + */ +public class CSSOutputFormat extends OutputFormat { + + /** + * The only instance (singleton) of this {@link OutputFormat}. + */ + public static final CSSOutputFormat INSTANCE = new CSSOutputFormat(); + + private CSSOutputFormat() { + // Only to decrease visibility + } + + @Override + public String getName() { + return "CSS"; + } + + @Override + public String getMimeType() { + return "text/css"; + } + + @Override + public boolean isOutputFormatMixingAllowed() { + return false; + } + +}
