You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2015/12/30 19:11:36 UTC
[16/35] incubator-freemarker git commit: New output formats were in
the wrong source directory
New output formats were in the wrong source directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bec1430b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bec1430b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bec1430b
Branch: refs/heads/2.3
Commit: bec1430b44ec205f08c8045825c8a0b10a7f87ab
Parents: 7051e55
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 24 01:56:07 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 24 01:56:07 2015 +0100
----------------------------------------------------------------------
.../java/freemarker/core/CSSOutputFormat.java | 34 +++++++++++++++++++
.../java/freemarker/core/JSONOutputFormat.java | 34 +++++++++++++++++++
.../freemarker/core/JavaScriptOutputFormat.java | 35 ++++++++++++++++++++
.../java/freemarker/core/CSSOutputFormat.java | 34 -------------------
.../java/freemarker/core/JSONOutputFormat.java | 34 -------------------
.../freemarker/core/JavaScriptOutputFormat.java | 35 --------------------
6 files changed, 103 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bec1430b/src/main/java/freemarker/core/CSSOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/CSSOutputFormat.java b/src/main/java/freemarker/core/CSSOutputFormat.java
new file mode 100644
index 0000000..e60e1c5
--- /dev/null
+++ b/src/main/java/freemarker/core/CSSOutputFormat.java
@@ -0,0 +1,34 @@
+package freemarker.core;
+
+/**
+ * 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/bec1430b/src/main/java/freemarker/core/JSONOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JSONOutputFormat.java b/src/main/java/freemarker/core/JSONOutputFormat.java
new file mode 100644
index 0000000..7b0d9fe
--- /dev/null
+++ b/src/main/java/freemarker/core/JSONOutputFormat.java
@@ -0,0 +1,34 @@
+package freemarker.core;
+
+/**
+ * Represents the JSON output format (MIME type "application/json", name "JSON"). This format doesn't support escaping.
+ *
+ * @since 2.3.24
+ */
+public class JSONOutputFormat extends OutputFormat {
+
+ /**
+ * The only instance (singleton) of this {@link OutputFormat}.
+ */
+ public static final JSONOutputFormat INSTANCE = new JSONOutputFormat();
+
+ private JSONOutputFormat() {
+ // Only to decrease visibility
+ }
+
+ @Override
+ public String getName() {
+ return "JSON";
+ }
+
+ @Override
+ public String getMimeType() {
+ return "application/json";
+ }
+
+ @Override
+ public boolean isOutputFormatMixingAllowed() {
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bec1430b/src/main/java/freemarker/core/JavaScriptOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/JavaScriptOutputFormat.java b/src/main/java/freemarker/core/JavaScriptOutputFormat.java
new file mode 100644
index 0000000..a6375af
--- /dev/null
+++ b/src/main/java/freemarker/core/JavaScriptOutputFormat.java
@@ -0,0 +1,35 @@
+package freemarker.core;
+
+/**
+ * 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/bec1430b/src/test/java/freemarker/core/CSSOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CSSOutputFormat.java b/src/test/java/freemarker/core/CSSOutputFormat.java
deleted file mode 100644
index e60e1c5..0000000
--- a/src/test/java/freemarker/core/CSSOutputFormat.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package freemarker.core;
-
-/**
- * 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/bec1430b/src/test/java/freemarker/core/JSONOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/JSONOutputFormat.java b/src/test/java/freemarker/core/JSONOutputFormat.java
deleted file mode 100644
index 7b0d9fe..0000000
--- a/src/test/java/freemarker/core/JSONOutputFormat.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package freemarker.core;
-
-/**
- * Represents the JSON output format (MIME type "application/json", name "JSON"). This format doesn't support escaping.
- *
- * @since 2.3.24
- */
-public class JSONOutputFormat extends OutputFormat {
-
- /**
- * The only instance (singleton) of this {@link OutputFormat}.
- */
- public static final JSONOutputFormat INSTANCE = new JSONOutputFormat();
-
- private JSONOutputFormat() {
- // Only to decrease visibility
- }
-
- @Override
- public String getName() {
- return "JSON";
- }
-
- @Override
- public String getMimeType() {
- return "application/json";
- }
-
- @Override
- public boolean isOutputFormatMixingAllowed() {
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bec1430b/src/test/java/freemarker/core/JavaScriptOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/JavaScriptOutputFormat.java b/src/test/java/freemarker/core/JavaScriptOutputFormat.java
deleted file mode 100644
index a6375af..0000000
--- a/src/test/java/freemarker/core/JavaScriptOutputFormat.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package freemarker.core;
-
-/**
- * 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;
- }
-
-}