|
Juan Hernandez |
7ded42c |
From 6a6d43bd62a8ff7134642ffeb2d8bf4732634c67 Mon Sep 17 00:00:00 2001
|
|
Juan Hernandez |
7ded42c |
From: Juan Hernandez <juan.hernandez@redhat.com>
|
|
Juan Hernandez |
7ded42c |
Date: Tue, 21 Feb 2012 20:43:04 +0100
|
|
Juan Hernandez |
7ded42c |
Subject: [PATCH 5/5] Remove encoding option
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
---
|
|
Juan Hernandez |
7ded42c |
.../java/org/jvnet/mjiip/v_2_2/OptionsFactory.java | 22 --------------------
|
|
Juan Hernandez |
7ded42c |
1 files changed, 0 insertions(+), 22 deletions(-)
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
diff --git a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
|
|
Juan Hernandez |
7ded42c |
index b72a2e3..dc9159f 100644
|
|
Juan Hernandez |
7ded42c |
--- a/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
|
|
Juan Hernandez |
7ded42c |
+++ b/plugin-2.2/src/main/java/org/jvnet/mjiip/v_2_2/OptionsFactory.java
|
|
Juan Hernandez |
7ded42c |
@@ -36,10 +36,6 @@ public class OptionsFactory implements
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
options.target = SpecVersion.V2_2;
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
- final String encoding = optionsConfiguration.getEncoding();
|
|
Juan Hernandez |
7ded42c |
- if (encoding != null) {
|
|
Juan Hernandez |
7ded42c |
- options.encoding = createEncoding(encoding);
|
|
Juan Hernandez |
7ded42c |
- }
|
|
Juan Hernandez |
7ded42c |
options.setSchemaLanguage(createLanguage(optionsConfiguration
|
|
Juan Hernandez |
7ded42c |
.getSchemaLanguage()));
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
@@ -99,24 +95,6 @@ public class OptionsFactory implements
|
|
Juan Hernandez |
7ded42c |
return options;
|
|
Juan Hernandez |
7ded42c |
}
|
|
Juan Hernandez |
7ded42c |
|
|
Juan Hernandez |
7ded42c |
- private String createEncoding(String encoding)
|
|
Juan Hernandez |
7ded42c |
- throws MojoExecutionException {
|
|
Juan Hernandez |
7ded42c |
- if (encoding == null) {
|
|
Juan Hernandez |
7ded42c |
- return null;
|
|
Juan Hernandez |
7ded42c |
- }
|
|
Juan Hernandez |
7ded42c |
- try {
|
|
Juan Hernandez |
7ded42c |
- if (!Charset.isSupported(encoding)) {
|
|
Juan Hernandez |
7ded42c |
- throw new MojoExecutionException(MessageFormat.format(
|
|
Juan Hernandez |
7ded42c |
- "Unsupported encoding [{0}].", encoding));
|
|
Juan Hernandez |
7ded42c |
- }
|
|
Juan Hernandez |
7ded42c |
- return encoding;
|
|
Juan Hernandez |
7ded42c |
- } catch (IllegalCharsetNameException icne) {
|
|
Juan Hernandez |
7ded42c |
- throw new MojoExecutionException(MessageFormat.format(
|
|
Juan Hernandez |
7ded42c |
- "Unsupported encoding [{0}].", encoding));
|
|
Juan Hernandez |
7ded42c |
- }
|
|
Juan Hernandez |
7ded42c |
-
|
|
Juan Hernandez |
7ded42c |
- }
|
|
Juan Hernandez |
7ded42c |
-
|
|
Juan Hernandez |
7ded42c |
private Language createLanguage(String schemaLanguage)
|
|
Juan Hernandez |
7ded42c |
throws MojoExecutionException {
|
|
Juan Hernandez |
7ded42c |
if (StringUtils.isEmpty(schemaLanguage)) {
|
|
Juan Hernandez |
7ded42c |
--
|
|
Juan Hernandez |
7ded42c |
1.7.9
|
|
Juan Hernandez |
7ded42c |
|