Issue #22. Minor refactoring.

highsource · highsource · commit b4be7521ccb5 · 2015-04-25T12:02:06.000+02:00
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaClassInfoCompiler.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaClassInfoCompiler.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaKeywords.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaKeywords.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 public class JsonSchemaKeywords {
 	private JsonSchemaKeywords() {
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaMappingCompiler.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaMappingCompiler.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import org.apache.commons.lang3.Validate;
 import org.hisrc.jsonix.definition.Mapping;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaModuleCompiler.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaModuleCompiler.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaModulesCompiler.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaModulesCompiler.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import javax.json.JsonBuilderFactory;
 import javax.json.spi.JsonProvider;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaPropertyInfoCompilerVisitor.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaPropertyInfoCompilerVisitor.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaRefTypeInfoCompilerVisitor.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaRefTypeInfoCompilerVisitor.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import java.text.MessageFormat;
 import java.util.Map;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaTypeInfoCompiler.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaTypeInfoCompiler.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import org.hisrc.jsonix.jsonschema.JsonSchemaBuilder;
 import org.jvnet.jaxb2_commons.xml.bind.model.MTypeInfo;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonStructureWriter.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonStructureWriter.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import javax.json.JsonStructure;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonixJsonSchemaConstants.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonixJsonSchemaConstants.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 public class JsonixJsonSchemaConstants {
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/XmlSchemaJsonSchemaConstants.java b/compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/XmlSchemaJsonSchemaConstants.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.compilation.jsc;
+package org.hisrc.jsonix.compilation.jsonschema;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/execution/JsonixInvoker.java b/compiler/src/main/java/org/hisrc/jsonix/execution/JsonixInvoker.java
@@ -2,8 +2,8 @@
 
 import org.hisrc.jsonix.compilation.ModulesCompiler;
 import org.hisrc.jsonix.compilation.ProgramWriter;
-import org.hisrc.jsonix.compilation.jsc.JsonSchemaModulesCompiler;
-import org.hisrc.jsonix.compilation.jsc.JsonStructureWriter;
+import org.hisrc.jsonix.compilation.jsonschema.JsonSchemaModulesCompiler;
+import org.hisrc.jsonix.compilation.jsonschema.JsonStructureWriter;
 import org.hisrc.jsonix.configuration.JsonSchemaConfiguration;
 import org.hisrc.jsonix.configuration.ModulesConfiguration;
 import org.hisrc.jsonix.configuration.ModulesConfigurationUnmarshaller;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/xjc/plugin/CodeModelJsonStructureWriter.java b/compiler/src/main/java/org/hisrc/jsonix/xjc/plugin/CodeModelJsonStructureWriter.java
@@ -11,7 +11,7 @@
 import javax.json.stream.JsonGenerator;
 
 import org.apache.commons.lang3.Validate;
-import org.hisrc.jsonix.compilation.jsc.JsonStructureWriter;
+import org.hisrc.jsonix.compilation.jsonschema.JsonStructureWriter;
 import org.hisrc.jsonix.definition.Module;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/xjc/plugin/JsonixPlugin.java b/compiler/src/main/java/org/hisrc/jsonix/xjc/plugin/JsonixPlugin.java
@@ -38,7 +38,7 @@
 
 import org.hisrc.jsonix.args4j.PartialCmdLineParser;
 import org.hisrc.jsonix.compilation.ProgramWriter;
-import org.hisrc.jsonix.compilation.jsc.JsonStructureWriter;
+import org.hisrc.jsonix.compilation.jsonschema.JsonStructureWriter;
 import org.hisrc.jsonix.configuration.PluginCustomizations;
 import org.hisrc.jsonix.execution.JsonixInvoker;
 import org.hisrc.jsonix.settings.Settings;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hisrc.jsonix.compilation.jsc;`
	`1`	`+package org.hisrc.jsonix.compilation.jsonschema;`
`2`	`2`
`3`	`3`	`import java.util.LinkedHashMap;`
`4`	`4`	`import java.util.Map;`