[Jaxx-commits] 03/06: Rename compiler package to org.nuiton.jaxx.compiler (See #3669)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit af1539eb3327ffee1fba808eb965706658c86ef0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 09:17:47 2016 +0100 Rename compiler package to org.nuiton.jaxx.compiler (See #3669) --- .../jaxx/compiler/finalizers/DefaultFinalizer.java | 1191 -------------------- .../jaxx/compiler/finalizers/SwingFinalizer.java | 89 -- .../compiler/finalizers/ValidatorFinalizer.java | 278 ----- .../{ => org/nuiton}/jaxx/compiler/ClassMap.java | 6 +- .../nuiton}/jaxx/compiler/CompiledObject.java | 18 +- .../jaxx/compiler/CompiledObjectDecorator.java | 4 +- .../jaxx/compiler/CompilerConfiguration.java | 6 +- .../nuiton}/jaxx/compiler/CompilerException.java | 2 +- .../compiler/DefaultCompilerConfiguration.java | 6 +- .../nuiton}/jaxx/compiler/EventHandler.java | 6 +- .../{ => org/nuiton}/jaxx/compiler/I18nHelper.java | 2 +- .../{ => org/nuiton}/jaxx/compiler/IDHelper.java | 2 +- .../nuiton}/jaxx/compiler/JAXXCompiler.java | 42 +- .../nuiton}/jaxx/compiler/JAXXCompilerFile.java | 2 +- .../{ => org/nuiton}/jaxx/compiler/JAXXEngine.java | 26 +- .../nuiton}/jaxx/compiler/JAXXFactory.java | 6 +- .../nuiton}/jaxx/compiler/JAXXProfile.java | 12 +- .../nuiton}/jaxx/compiler/SymbolTable.java | 6 +- .../compiler/UnsupportedAttributeException.java | 6 +- .../jaxx/compiler/UnsupportedTagException.java | 2 +- .../nuiton}/jaxx/compiler/beans/BeanInfoUtil.java | 2 +- .../jaxx/compiler/beans/JAXXBeanDescriptor.java | 4 +- .../nuiton}/jaxx/compiler/beans/JAXXBeanInfo.java | 4 +- .../compiler/beans/JAXXEventSetDescriptor.java | 6 +- .../jaxx/compiler/beans/JAXXFeatureDescriptor.java | 4 +- .../jaxx/compiler/beans/JAXXIntrospector.java | 8 +- .../compiler/beans/JAXXPropertyDescriptor.java | 8 +- .../nuiton}/jaxx/compiler/binding/DataBinding.java | 16 +- .../jaxx/compiler/binding/DataBindingHelper.java | 6 +- .../jaxx/compiler/binding/DataListener.java | 2 +- .../nuiton}/jaxx/compiler/binding/DataSource.java | 42 +- .../jaxx/compiler/binding/JavaParserUtil.java | 6 +- .../compiler/binding/PseudoClassDataBinding.java | 18 +- .../binding/writers/AbstractJAXXBindingWriter.java | 14 +- .../binding/writers/DefaultJAXXBindingWriter.java | 18 +- .../binding/writers/JAXXBindingWriter.java | 6 +- .../writers/SimpleJAXXObjectBindingWriter.java | 18 +- .../jaxx/compiler/css/StylesheetHelper.java | 38 +- .../nuiton}/jaxx/compiler/css/parser/CSS.jj | 0 .../nuiton}/jaxx/compiler/css/parser/CSS.jjt | 0 .../jaxx/compiler/css/parser/CSSParser.java | 2 +- .../compiler/css/parser/CSSParserConstants.java | 2 +- .../compiler/css/parser/CSSParserTokenManager.java | 2 +- .../css/parser/CSSParserTreeConstants.java | 2 +- .../compiler/css/parser/JJTCSSParserState.java | 2 +- .../nuiton}/jaxx/compiler/css/parser/Node.java | 2 +- .../jaxx/compiler/css/parser/ParseException.java | 4 +- .../jaxx/compiler/css/parser/SimpleCharStream.java | 2 +- .../jaxx/compiler/css/parser/SimpleNode.java | 2 +- .../nuiton}/jaxx/compiler/css/parser/Token.java | 2 +- .../jaxx/compiler/css/parser/TokenMgrError.java | 2 +- .../decorators/BoxedCompiledObjectDecorator.java | 12 +- .../decorators/DefaultCompiledObjectDecorator.java | 28 +- .../HelpRootCompiledObjectDecorator.java | 24 +- .../compiler/finalizers/AbstractFinalizer.java | 10 +- .../compiler/finalizers/JAXXCompilerFinalizer.java | 8 +- .../nuiton}/jaxx/compiler/java/JavaArgument.java | 2 +- .../jaxx/compiler/java/JavaConstructor.java | 2 +- .../nuiton}/jaxx/compiler/java/JavaElement.java | 2 +- .../jaxx/compiler/java/JavaElementFactory.java | 2 +- .../nuiton}/jaxx/compiler/java/JavaField.java | 2 +- .../nuiton}/jaxx/compiler/java/JavaFile.java | 6 +- .../jaxx/compiler/java/JavaFileGenerator.java | 11 +- .../nuiton}/jaxx/compiler/java/JavaMethod.java | 2 +- .../compiler/java/parser/JJTJavaParserState.java | 2 +- .../nuiton}/jaxx/compiler/java/parser/Java1.5.jj | 0 .../nuiton}/jaxx/compiler/java/parser/Java1.5.jjt | 0 .../jaxx/compiler/java/parser/JavaCharStream.java | 2 +- .../jaxx/compiler/java/parser/JavaParser.java | 2 +- .../compiler/java/parser/JavaParserConstants.java | 2 +- .../java/parser/JavaParserTokenManager.java | 2 +- .../java/parser/JavaParserTreeConstants.java | 2 +- .../nuiton}/jaxx/compiler/java/parser/Node.java | 2 +- .../jaxx/compiler/java/parser/ParseException.java | 6 +- .../jaxx/compiler/java/parser/SimpleNode.java | 4 +- .../nuiton}/jaxx/compiler/java/parser/Token.java | 2 +- .../jaxx/compiler/java/parser/TokenMgrError.java | 2 +- .../jaxx/compiler/reflect/ClassDescriptor.java | 2 +- .../compiler/reflect/ClassDescriptorHelper.java | 20 +- .../compiler/reflect/ClassDescriptorResolver.java | 2 +- .../jaxx/compiler/reflect/FieldDescriptor.java | 2 +- .../jaxx/compiler/reflect/MemberDescriptor.java | 2 +- .../jaxx/compiler/reflect/MethodDescriptor.java | 4 +- .../ClassDescriptorResolverFromJavaClass.java | 12 +- .../ClassDescriptorResolverFromJavaFile.java | 30 +- .../ClassDescriptorResolverFromJaxxFile.java | 24 +- .../jaxx/compiler/script/ScriptInitializer.java | 8 +- .../jaxx/compiler/script/ScriptManager.java | 28 +- .../jaxx/compiler/spi/DefaultInitializer.java | 92 +- .../nuiton}/jaxx/compiler/spi/Initializer.java | 2 +- .../compiler/tags/DefaultComponentHandler.java | 20 +- .../jaxx/compiler/tags/DefaultObjectHandler.java | 40 +- .../nuiton}/jaxx/compiler/tags/ImportHandler.java | 4 +- .../nuiton}/jaxx/compiler/tags/ScriptHandler.java | 8 +- .../nuiton}/jaxx/compiler/tags/StyleHandler.java | 14 +- .../nuiton}/jaxx/compiler/tags/TagHandler.java | 6 +- .../nuiton}/jaxx/compiler/tags/TagManager.java | 12 +- .../compiler/tags/swing/ApplicationHandler.java | 14 +- .../jaxx/compiler/tags/swing/CellHandler.java | 12 +- .../compiler/tags/swing/CompiledItemContainer.java | 10 +- .../jaxx/compiler/tags/swing/ItemHandler.java | 16 +- .../compiler/tags/swing/JAXXComboBoxHandler.java | 16 +- .../jaxx/compiler/tags/swing/JAXXListHandler.java | 16 +- .../jaxx/compiler/tags/swing/JAXXTabHandler.java | 4 +- .../jaxx/compiler/tags/swing/JAXXTreeHandler.java | 16 +- .../jaxx/compiler/tags/swing/JCheckBoxHandler.java | 8 +- .../jaxx/compiler/tags/swing/JComboBoxHandler.java | 12 +- .../compiler/tags/swing/JInternalFrameHandler.java | 14 +- .../jaxx/compiler/tags/swing/JListHandler.java | 12 +- .../jaxx/compiler/tags/swing/JMenuHandler.java | 8 +- .../compiler/tags/swing/JPasswordFieldHandler.java | 6 +- .../compiler/tags/swing/JPopupMenuHandler.java | 12 +- .../compiler/tags/swing/JProgressBarHandler.java | 8 +- .../compiler/tags/swing/JRadioButtonHandler.java | 18 +- .../compiler/tags/swing/JScrollPaneHandler.java | 16 +- .../jaxx/compiler/tags/swing/JSliderHandler.java | 14 +- .../jaxx/compiler/tags/swing/JSpinnerHandler.java | 16 +- .../compiler/tags/swing/JSplitPaneHandler.java | 14 +- .../compiler/tags/swing/JTabbedPaneHandler.java | 20 +- .../compiler/tags/swing/JTextComponentHandler.java | 14 +- .../jaxx/compiler/tags/swing/JToolBarHandler.java | 10 +- .../jaxx/compiler/tags/swing/JTreeHandler.java | 12 +- .../jaxx/compiler/tags/swing/JWindowHandler.java | 14 +- .../jaxx/compiler/tags/swing/JXLayerHandler.java | 14 +- .../jaxx/compiler/tags/swing/RowHandler.java | 10 +- .../jaxx/compiler/tags/swing/TabHandler.java | 20 +- .../jaxx/compiler/tags/swing/TableHandler.java | 20 +- .../tags/validator/BeanValidatorHandler.java | 22 +- .../validator/ExcludeFieldValidatorHandler.java | 14 +- .../tags/validator/FieldValidatorHandler.java | 18 +- .../jaxx/compiler/tasks/CompileFirstPassTask.java | 8 +- .../jaxx/compiler/tasks/CompileSecondPassTask.java | 8 +- .../nuiton}/jaxx/compiler/tasks/FinalizeTask.java | 8 +- .../compiler/tasks/GenerateConstructorsTask.java | 32 +- .../compiler/tasks/GenerateMissingRulesTask.java | 10 +- .../nuiton}/jaxx/compiler/tasks/GenerateTask.java | 18 +- .../nuiton}/jaxx/compiler/tasks/InitTask.java | 8 +- .../jaxx/compiler/tasks/JAXXEngineTask.java | 8 +- .../nuiton}/jaxx/compiler/tasks/ProfileTask.java | 4 +- .../jaxx/compiler/tasks/StyleSheetTask.java | 8 +- .../nuiton}/jaxx/compiler/tools/PrintTagInfo.java | 20 +- .../tools/jaxxcapture/AbstractContextNode.java | 2 +- .../compiler/tools/jaxxcapture/CapturedObject.java | 6 +- .../compiler/tools/jaxxcapture/ContextNode.java | 2 +- .../compiler/tools/jaxxcapture/JAXXCapture.java | 22 +- .../compiler/tools/jaxxcapture/LiteralNode.java | 2 +- .../compiler/tools/jaxxcapture/MethodNode.java | 2 +- .../compiler/tools/jaxxcapture/PropertyNode.java | 2 +- .../jaxx/compiler/tools/jaxxcapture/ValueNode.java | 2 +- .../jaxxcapture/handlers/JTabbedPaneHandler.java | 8 +- .../tools/jaxxcapture/handlers/ObjectHandler.java | 24 +- .../tools/jaxxcapture/handlers/TableHandler.java | 6 +- .../jaxx/compiler/types/ColorConverter.java | 2 +- .../types/GridBagConstraintsConverter.java | 2 +- .../jaxx/compiler/types/InsetsConverter.java | 2 +- .../jaxx/compiler/types/KeyStrokeConverter.java | 2 +- .../jaxx/compiler/types/PrimitiveConverter.java | 4 +- .../nuiton}/jaxx/compiler/types/TypeConverter.java | 2 +- .../nuiton}/jaxx/compiler/types/TypeManager.java | 2 +- .../services/jaxx.compiler.CompiledObjectDecorator | 3 - .../services/jaxx.compiler.JAXXCompilerFinalizer | 3 - .../services/jaxx.compiler.spi.Initializer | 1 - .../services/jaxx.compiler.types.TypeConverter | 5 - ...rg.nuiton.jaxx.compiler.CompiledObjectDecorator | 3 + ....jaxx.compiler.finalizers.JAXXCompilerFinalizer | 3 + .../org.nuiton.jaxx.compiler.spi.Initializer | 1 + .../org.nuiton.jaxx.compiler.types.TypeConverter | 5 + .../jaxx/compiler/beans/BeanIntoUtilTest.java | 2 +- .../jaxx/compiler/binding/JavaParserUtilTest.java | 6 +- .../nuiton}/jaxx/compiler/java/JavaFieldTest.java | 2 +- .../nuiton}/jaxx/compiler/java/JavaMethodTest.java | 4 +- .../jaxx/compiler/java/parser/JavaParserTest.java | 10 +- .../jaxx/compiler/reflect/ClassDescriptorTest.java | 2 +- .../jaxx/compiler/reflect/MyAbstractClass.java | 2 +- .../jaxx/compiler/reflect/MyChildClass.java | 2 +- .../jaxx/compiler/reflect/MyChildClass2.java | 2 +- .../nuiton}/jaxx/compiler/reflect/MyClass.java | 2 +- .../nuiton}/jaxx/compiler/reflect/MyEnum.java | 2 +- .../nuiton}/jaxx/compiler/reflect/MyInterface.java | 2 +- .../jaxx/compiler/reflect/MyInterface2.java | 2 +- .../jaxx/compiler/reflect/MyInterface3.java | 2 +- .../ClassDescriptorResolverFromJavaFileTest.java | 26 +- .../nuiton}/jaxx/compiler/tags/TagManagerTest.java | 16 +- .../jaxx/compiler/types/ColorConverterTest.java | 2 +- .../jaxx/compiler/types/InsetsConverterTest.java | 2 +- .../compiler/types/PrimitiveConverterTest.java | 2 +- .../jaxx/compiler/types/TypeManagerTest.java | 2 +- jaxx-compiler/src/test/resources/log4j.properties | 2 +- .../nuiton/jaxx/plugin/GenerateHelpIdsMojo.java | 2 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 26 +- .../java/org/nuiton/jaxx/plugin/Bug1124Test.java | 1 - .../java/org/nuiton/jaxx/plugin/Bug1750Test.java | 2 +- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 8 +- .../src/test/resources/log4j.properties | 2 +- 194 files changed, 853 insertions(+), 2409 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java deleted file mode 100644 index afcc93f..0000000 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java +++ /dev/null @@ -1,1191 +0,0 @@ -/* - * #%L - * JAXX :: Compiler - * %% - * Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package jaxx.compiler.finalizers; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerException; -import jaxx.compiler.EventHandler; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.binding.writers.DefaultJAXXBindingWriter; -import jaxx.compiler.binding.writers.JAXXBindingWriter; -import jaxx.compiler.binding.writers.SimpleJAXXObjectBindingWriter; -import jaxx.compiler.java.JavaArgument; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.types.TypeManager; -import jaxx.runtime.Base64Coder; -import jaxx.runtime.JAXXBinding; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXObjectDescriptor; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.awt.Container; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import static java.lang.reflect.Modifier.FINAL; -import static java.lang.reflect.Modifier.PRIVATE; -import static java.lang.reflect.Modifier.PROTECTED; -import static java.lang.reflect.Modifier.PUBLIC; -import static java.lang.reflect.Modifier.STATIC; -import static java.lang.reflect.Modifier.isProtected; -import static java.lang.reflect.Modifier.isPublic; -import static jaxx.compiler.java.JavaElementFactory.newArgument; -import static jaxx.compiler.java.JavaElementFactory.newField; -import static jaxx.compiler.java.JavaElementFactory.newMethod; - -/** - * This class is a refactoring of the {@link JAXXCompiler}. - * - * We delegate now the generation of a {@link JAXXObject} to this class, the - * {@link JAXXCompiler} now only deals with the compilation of files. - * - * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="default" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" - */ -public class DefaultFinalizer extends AbstractFinalizer { - - /** Logger. */ - protected static final Log log = LogFactory.getLog(DefaultFinalizer.class); - - private static final String PARAMETER_NAME_$BINDING = "$binding"; - - public static final String FIELD_NAME_$BINDING_SOURCES = "$bindingSources"; - - public static final String FIELD_NAME_$OBJECT_MAP = "$objectMap"; - - public static final String FIELD_NAME_$ACTIVE_BINDINGS = "$activeBindings"; - - public static final String FIELD_NAME_$PREVIOUS_VALUES = "$previousValues"; - - public static final String FIELD_NAME_$BINDINGS = "$bindings"; - - public static final String FIELD_NAME_$PROPERTY_CHANGE_SUPPORT = "$propertyChangeSupport"; - - public static final String FIELD_NAME_DELEGATE_CONTEXT = "delegateContext"; - - public static final String FIELD_NAME_SERIAL_VERSION_UID = "serialVersionUID"; - - public static final String FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR = "$jaxxObjectDescriptor"; - - public static final String METHOD_NAME_$GET_JAXXOBJECT_DESCRIPTOR = "$getJAXXObjectDescriptor"; - - public static final String METHOD_NAME_REGISTER_DATA_BINDING = "registerDataBinding"; - - public static final String METHOD_NAME_REMOVE_DATA_BINDING = "removeDataBinding"; - - public static final String METHOD_NAME_APPLY_DATA_BINDING = "applyDataBinding"; - - public static final String METHOD_NAME_PROCESS_DATA_BINDING = "processDataBinding"; - - public static final String METHOD_NAME_FIRE_PROPERTY_CHANGE = "firePropertyChange"; - - public static final String METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT = "$getPropertyChangeSupport"; - - public static final String METHOD_NAME_$INITIALIZE = "$initialize"; - public static final String METHOD_NAME_$INITIALIZE_01_CREATE_COMPONENTS = "$initialize_01_createComponents"; - public static final String METHOD_NAME_$INITIALIZE_02_REGISTER_DATA_BINDINGS = "$initialize_02_registerDataBindings"; - public static final String METHOD_NAME_$INITIALIZE_03_FINALIZE_CREATE_COMPONENTS = "$initialize_03_finalizeCreateComponents"; - public static final String METHOD_NAME_$INITIALIZE_04_APPLY_DATA_BINDINGS = "$initialize_04_applyDataBindings"; - public static final String METHOD_NAME_$INITIALIZE_05_SET_PROPERTIES = "$initialize_05_setProperties"; - public static final String METHOD_NAME_$INITIALIZE_06_FINALIZE_INITIALIZE = "$initialize_06_finalizeInitialize"; - - /** serialVersionUID field */ - - protected static final JavaField SERIAL_VERSION_UID_FIELD = newField( - PRIVATE | STATIC | FINAL, - "long", - FIELD_NAME_SERIAL_VERSION_UID, - false, - "1L" - ); - - /** - * - */ - protected static final JavaField ACTIVE_BINDINGS_FIELD = newField( - PROTECTED, - List.class.getName() + "<" + TYPE_OBJECT + ">", - FIELD_NAME_$ACTIVE_BINDINGS, - false, - "new %s<" + TYPE_OBJECT + ">()", - ArrayList.class.getName() - ); - - /** - * - */ - protected static final JavaField BINDING_SOURCES_FIELD = newField( - PROTECTED, - Map.class.getName() + "<" + TYPE_STRING + ", " + TYPE_OBJECT + ">", - FIELD_NAME_$BINDING_SOURCES, - false, - "new %s<" + TYPE_STRING + ", " + TYPE_OBJECT + ">()", - HashMap.class.getName() - ); - - /** - * - */ - protected static final JavaField OBJECT_MAP_FIELD = newField( - PROTECTED, - Map.class.getName() + "<" + TYPE_STRING + ", " + TYPE_OBJECT + ">", - FIELD_NAME_$OBJECT_MAP, - true, - "new %s<" + TYPE_STRING + ", " + TYPE_OBJECT + ">()", - HashMap.class.getName() - ); - - /** - * - */ - protected static final JavaField PREVIOUS_VALUES_FIELD = newField( - PROTECTED, - Map.class.getName() + "<?,?>", FIELD_NAME_$PREVIOUS_VALUES, - false, - "new %s<" + TYPE_OBJECT + ", " + TYPE_OBJECT + ">()", - HashMap.class.getName() - ); - - /** - * - */ - protected static final JavaField BINDINGS_FIELD = newField( - PROTECTED | FINAL, - Map.class.getName() + "<" + TYPE_STRING + ", " + JAXXBinding.class.getName() + ">", - FIELD_NAME_$BINDINGS, - false, - "new %s<" + TYPE_STRING + ", %s>()", - TreeMap.class.getName(), - JAXXBinding.class.getName() - ); - - /** - * - */ - protected static final JavaField PROPERTY_CHANGE_SUPPORT_FIELD = newField( - PROTECTED, - PropertyChangeSupport.class.getName(), - FIELD_NAME_$PROPERTY_CHANGE_SUPPORT, - false - ); - - /** - * - */ - protected static final JavaMethod GET_CONTEXT_VALUE_METHOD = newMethod( - PUBLIC, - "<T> T", - "getContextValue", - "return " + FIELD_NAME_DELEGATE_CONTEXT + ".getContextValue(clazz, null);", - true, - newArgument("Class<T>", "clazz") - ); - - /** - * - */ - protected static final JavaMethod GET_CONTEXT_VALUE_NAMED_METHOD = newMethod( - PUBLIC, - "<T> T", - "getContextValue", - "return " + FIELD_NAME_DELEGATE_CONTEXT + ".getContextValue(clazz, name);", - true, - newArgument("Class<T>", "clazz"), newArgument(TYPE_STRING, "name") - ); - - /** - * - */ - protected static final JavaMethod SET_CONTEXT_VALUE_NAMED_METHOD = newMethod( - PUBLIC, - "<T> " + TYPE_VOID, - "setContextValue", - FIELD_NAME_DELEGATE_CONTEXT + ".setContextValue(o, name);", - true, - newArgument("T", "o"), newArgument(TYPE_STRING, "name")); - - /** - * - */ - protected static final JavaMethod SET_CONTEXT_VALUE_METHOD = newMethod( - PUBLIC, - "<T> " + TYPE_VOID, - "setContextValue", - FIELD_NAME_DELEGATE_CONTEXT + ".setContextValue(o, null);", - true, - newArgument("T", "o") - ); - - /** - * - */ - protected static final JavaMethod REMOVE_CONTEXT_VALUE_NAMED_METHOD = newMethod( - PUBLIC, - "<T> " + TYPE_VOID, - "removeContextValue", - FIELD_NAME_DELEGATE_CONTEXT + ".removeContextValue(clazz, name);", - true, - newArgument("Class<T>", "clazz"), - newArgument(TYPE_STRING, "name") - ); - - /** - * - */ - protected static final JavaMethod REMOVE_CONTEXT_VALUE_METHOD = newMethod( - PUBLIC, - "<T> " + TYPE_VOID, - "removeContextValue", - FIELD_NAME_DELEGATE_CONTEXT + ".removeContextValue(clazz, null);", - true, - newArgument("Class<T>", "clazz") - ); - - /** - * - */ - protected static final JavaMethod GET_PARENT_CONTAINER_MORE_METHOD = newMethod( - PUBLIC, - "<O extends Container> O", - "getParentContainer", - "return %s.getParentContainer(source, clazz);", - true, - newArgument(TYPE_OBJECT, "source"), - newArgument("Class<O>", "clazz") - ); - - /** - * - */ - protected static final JavaMethod GET_PARENT_CONTAINER_METHOD = newMethod( - PUBLIC, - "<O extends Container> O", - "getParentContainer", - "return %s.getParentContainer(this, clazz);", - true, - newArgument("Class<O>", "clazz") - ); - - /** - * - */ - protected static final JavaMethod GET_OBJECT_BY_ID_METHOD = newMethod( - PUBLIC, TYPE_OBJECT, "getObjectById", - "return " + FIELD_NAME_$OBJECT_MAP + ".get(id);", - true, - newArgument(TYPE_STRING, "id") - ); - - /** - * - */ - protected static final JavaMethod GET_JAXX_OBJECT_DESCRIPTOR_METHOD = newMethod( - PUBLIC | STATIC, - JAXXObjectDescriptor.class.getName(), - METHOD_NAME_$GET_JAXXOBJECT_DESCRIPTOR, - "return %s.decodeCompressedJAXXObjectDescriptor(" + - FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR + ");", - false - ); - - /** - * - */ - protected static final JavaMethod PROCESS_DATA_BINDING_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_PROCESS_DATA_BINDING, - METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ", false);", - true, - newArgument(TYPE_STRING, PARAMETER_NAME_$BINDING) - ); - - /** - * - */ - protected static final JavaMethod REGISTER_DATA_BINDING_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_REGISTER_DATA_BINDING, - FIELD_NAME_$BINDINGS + ".put(binding.getId(), binding);", - true, - newArgument(JAXXBinding.class.getName(), "binding") - ); - - /** - * - */ - protected static final JavaMethod GET_DATA_BINDINGS_METHOD = newMethod( - PUBLIC, - JAXXBinding.class.getName() + "[]", - "getDataBindings", - "return " + FIELD_NAME_$BINDINGS + ".values().toArray(new %s[" + FIELD_NAME_$BINDINGS + ".size()]);", - true - ); - - /** - * - */ - protected static final JavaMethod GET_DATA_BINDING_METHOD = newMethod( - PUBLIC, - JAXXBinding.class.getName(), - "getDataBinding", - "return " + FIELD_NAME_$BINDINGS + ".get(bindingId);", - true, - newArgument(TYPE_STRING, "bindingId") - ); - - - /** - * - */ - protected static final JavaMethod FIRE_PROPERTY_CHANGE_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_FIRE_PROPERTY_CHANGE, - "super." + METHOD_NAME_FIRE_PROPERTY_CHANGE + "(propertyName, oldValue, newValue);", - true, - newArgument(TYPE_STRING, "propertyName"), - newArgument(TYPE_OBJECT, "oldValue"), - newArgument(TYPE_OBJECT, "newValue") - ); - - /** - * - */ - protected static final JavaMethod FIRE_PROPERTY_CHANGE_NAMED_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_FIRE_PROPERTY_CHANGE, - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT + "()." + METHOD_NAME_FIRE_PROPERTY_CHANGE + "(propertyName, oldValue, newValue);", - true, - newArgument(TYPE_STRING, "propertyName"), - newArgument(TYPE_OBJECT, "oldValue"), - newArgument(TYPE_OBJECT, "newValue") - ); - - /** - * - */ - protected static final JavaMethod GET_PROPERTY_CHANGE_SUPPORT_METHOD = newMethod( - 0, - PropertyChangeSupport.class.getName(), - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT, - "if (" + FIELD_NAME_$PROPERTY_CHANGE_SUPPORT + " == null)\n" + - " " + FIELD_NAME_$PROPERTY_CHANGE_SUPPORT + " = new PropertyChangeSupport(this);\n" + - "return " + FIELD_NAME_$PROPERTY_CHANGE_SUPPORT + ";", - false - ); - - /** - * - */ - protected static final JavaMethod ADD_PROPERTY_CHANGE_SUPPORT_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - "addPropertyChangeListener", - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT + "().addPropertyChangeListener(listener);", - true, - newArgument(PropertyChangeListener.class.getName(), "listener") - ); - - /** - * - */ - protected static final JavaMethod ADD_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - "addPropertyChangeListener", - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT + "().addPropertyChangeListener(property, listener);", - true, - newArgument(TYPE_STRING, "property"), - newArgument(PropertyChangeListener.class.getName(), "listener") - ); - - /** - * - */ - protected static final JavaMethod REMOVE_PROPERTY_CHANGE_SUPPORT_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - "removePropertyChangeListener", - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT + "().removePropertyChangeListener(listener);", - true, - newArgument(PropertyChangeListener.class.getName(), "listener") - ); - - /** - * - */ - protected static final JavaMethod REMOVE_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD = newMethod( - PUBLIC, - TYPE_VOID, - "removePropertyChangeListener", - METHOD_NAME_$GET_PROPERTY_CHANGE_SUPPORT + "().removePropertyChangeListener(property, listener);", - true, - newArgument(TYPE_STRING, "property"), - newArgument(PropertyChangeListener.class.getName(), "listener") - ); - - public static final String METHOD_NAME$BEFORE_INIT = "beforeInit"; - - private static final String METHOD_NAME$AFTER_INIT = "afterInit"; - - @Override - public boolean accept(JAXXCompiler compiler) { - - // alwyas use the default finalizer - return true; - } - - @Override - public void finalizeCompiler(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) throws ClassNotFoundException { - - String fullClassName = packageName != null ? - packageName + "." + className : className; - if (root == null) { - throw new CompilerException("root tag can not be null"); - } - ClassDescriptor superclass = root.getObjectClass(); - boolean superclassIsJAXXObject = - compiler.isSuperClassAware(JAXXObject.class); - javaFile.setModifiers(PUBLIC); - javaFile.setName(fullClassName); - javaFile.setSimpleName(className); - - javaFile.setSuperClass(JAXXCompiler.getCanonicalName(superclass)); - javaFile.setSuperclassIsJAXXObject(superclassIsJAXXObject); - - javaFile.addInterface(compiler.getExtraInterfaces()); - javaFile.setAbstractClass(compiler.isAbstractClass()); - javaFile.setGenericType(compiler.getGenericType()); - javaFile.setSuperGenericType(compiler.getSuperGenericType()); - - if (!superclassIsJAXXObject) { - javaFile.addInterface(JAXXObject.class.getName()); - } - } - - @Override - public void prepareJavaFile(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) throws ClassNotFoundException { - - // add logger support if required - addLoggerSupport(compiler, javaFile, className); - - // add JAXXObject support if required - addJAXXObjectSupport(compiler, root, javaFile); - - addSimpleField(javaFile, SERIAL_VERSION_UID_FIELD); - - addJAXXObjectDescriptorField(compiler, javaFile); - addMethod(javaFile, GET_JAXX_OBJECT_DESCRIPTOR_METHOD, JAXXUtil.class.getName()); - - addPreviousValuesField(compiler, javaFile, root); - - DataBinding[] bindings = compiler.getBindingHelper().getDataBindings(); - - addInitializerMethod(compiler, javaFile); - addInitialize_01_createComponents(compiler, javaFile); - addInitialize_02_registerDataBindings(compiler, javaFile); - addInitialize_03_finalizeCreateComponents(compiler, javaFile); - addInitialize_04_applyDataBindings(compiler, javaFile); - addInitialize_05_setProperties(compiler, javaFile); - addInitialize_06_finalizeInitialize(compiler, javaFile); - - javaFile.addBodyCode(compiler.getBodyCode().toString()); - - addDataBindings(compiler, javaFile, bindings); - addEventHandlers(compiler, javaFile); - } - - protected void addDataBindings(JAXXCompiler compiler, - JavaFile javaFile, - DataBinding[] bindings) { - - if (bindings.length < 1) { - // no data bindings - return; - } - - // add import on each type of JAXXBinding used - for (JAXXBindingWriter<?> writer : bindingWriters) { - if (writer.isUsed()) { - javaFile.addImport(writer.getType()); - } - } - - // for each binding declare the constant Id - - for (DataBinding binding : bindings) { - - String constantId = binding.getConstantId(); - - // add the data binding constant Id - - compiler.addSimpleField(newField( - (constantId.startsWith("BINDING_$") ? PRIVATE : PUBLIC) | FINAL | STATIC, - TYPE_STRING, - constantId, - false, - TypeManager.getJavaCode(binding.getRealId())) - ); - } - } - - protected void addJAXXObjectSupport(JAXXCompiler compiler, - CompiledObject root, - JavaFile javaFile) { - - String jaxxContextImplementorClass = - compiler.getConfiguration().getJaxxContextClass().getName(); - - boolean superclassIsJAXXObject = javaFile.isSuperclassIsJAXXObject(); - - if (superclassIsJAXXObject) { - - //FIXME tchemit 2011-01-30 : We should not add it (if user want to use it in script it must add the correct import - // Will be removed in version 3.0 with strict imports features - javaFile.addImport(JAXXContext.class); - - } else { - - // add JAXXObject support - addField(javaFile, OBJECT_MAP_FIELD); - addSimpleField(javaFile, BINDING_SOURCES_FIELD); - addSimpleField(javaFile, ACTIVE_BINDINGS_FIELD); - addSimpleField(javaFile, BINDINGS_FIELD); - javaFile.addMethod(GET_OBJECT_BY_ID_METHOD); - addMethod(javaFile, REGISTER_DATA_BINDING_METHOD); - addMethod(javaFile, GET_DATA_BINDINGS_METHOD, JAXXBinding.class.getSimpleName()); - addMethod(javaFile, GET_DATA_BINDING_METHOD, JAXXBinding.class.getSimpleName()); - - javaFile.addMethod(createApplyDataBindingMethod()); - javaFile.addMethod(createProcessDataBindingMethod()); - javaFile.addMethod(createRemoveDataBindingMethod()); - - // JAXXContext - - String type = - javaFile.getImportedType(jaxxContextImplementorClass); - - javaFile.addField(newField( - PROTECTED | FINAL, - JAXXContext.class.getName(), - FIELD_NAME_DELEGATE_CONTEXT, - true, - "new " + type + "()") - ); - - javaFile.addImport(Container.class); - - javaFile.addMethod(SET_CONTEXT_VALUE_METHOD); - javaFile.addMethod(SET_CONTEXT_VALUE_NAMED_METHOD); - javaFile.addMethod(GET_CONTEXT_VALUE_METHOD); - javaFile.addMethod(GET_CONTEXT_VALUE_NAMED_METHOD); - javaFile.addMethod(REMOVE_CONTEXT_VALUE_METHOD); - javaFile.addMethod(REMOVE_CONTEXT_VALUE_NAMED_METHOD); - addMethod(javaFile, GET_PARENT_CONTAINER_METHOD, SwingUtil.class.getName()); - addMethod(javaFile, GET_PARENT_CONTAINER_MORE_METHOD, SwingUtil.class.getName()); - - // PropertyChangeSupport - addPropertyChangeSupport(root, javaFile); - - // DataBinding - javaFile.addMethod(PROCESS_DATA_BINDING_METHOD); - } - } - - protected void addLoggerSupport(JAXXCompiler compiler, JavaFile javaFile, String className) { - if (compiler.getConfiguration().isAddLogger()) { - - javaFile.addSimpleField(newField( - PRIVATE | STATIC | FINAL, - Log.class.getName(), - "log", - false, - "%s.getLog(" + className + ".class)", - LogFactory.class.getName() - ) - ); - } - } - - protected final JAXXBindingWriter<?>[] bindingWriters = new - JAXXBindingWriter[]{new SimpleJAXXObjectBindingWriter(), - new DefaultJAXXBindingWriter() - }; - - /*---------------------------------------------------------------------------------*/ - /*-- Create fields ----------------------------------------------------------------*/ - /*---------------------------------------------------------------------------------*/ - protected JavaField addJAXXObjectDescriptorField(JAXXCompiler compiler, - JavaFile javaFile) { - JavaField field; - try { - JAXXObjectDescriptor descriptor = compiler.getJAXXObjectDescriptor(); - String data = Base64Coder.serialize(descriptor, true); - /*ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(new GZIPOutputStream(buffer)); - out.writeObject(descriptor); - out.close(); - // the use of the weird deprecated constructor is deliberate -- we need to store the data as a String - // in the compiled class file, since byte array initialization is horribly inefficient compared to - // String initialization. So we store the bytes in the String, and we quite explicitly want a 1:1 - // mapping between bytes and chars, with the high byte of the char set to zero. We can then safely - // reconstitute the original byte[] at a later date. This is unquestionably an abuse of the String - // type, but if we could efficiently store a byte[] we wouldn't have to do this. - String data = new String(buffer.toByteArray(), 0);*/ - - int sizeLimit = 65000; // constant strings are limited to 64K, and I'm not brave enough to push right up to the limit - if (data.length() < sizeLimit) { - field = newField(PRIVATE | STATIC | FINAL, - TYPE_STRING, - FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR, - false, - TypeManager.getJavaCode(data) - ); - - } else { - StringBuilder initializer = new StringBuilder(); - for (int i = 0; i < data.length(); i += sizeLimit) { - String name = FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR + i; - javaFile.addField(newField( - PRIVATE | STATIC, - TYPE_STRING, - name, - false, - TypeManager.getJavaCode(data.substring(i, Math.min(i + sizeLimit, data.length())))) - ); - if (initializer.length() > 0) { - initializer.append(" + "); - } - initializer.append(TYPE_STRING + ".valueOf("); - initializer.append(name); - initializer.append(")"); - } - field = newField(PRIVATE | STATIC | FINAL, - TYPE_STRING, - FIELD_NAME_$JAXX_OBJECT_DESCRIPTOR, - false, - initializer.toString() - ); - } - } catch (IOException e) { - throw new RuntimeException("Internal error: can't-happen error", e); - } - javaFile.addSimpleField(field); - return field; - } - - protected void addPreviousValuesField(JAXXCompiler compiler, - JavaFile javaFile, CompiledObject root) { - - boolean superclassIsJAXXObject = javaFile.isSuperclassIsJAXXObject(); - - if (compiler.getStylesheet() != null) { - boolean needField = true; - if (superclassIsJAXXObject) { - // check alreay exists on parent - ClassDescriptor superclass = root.getObjectClass(); - if (log.isDebugEnabled()) { - log.debug("superclass : " + superclass); - } - JAXXCompiler parentCompiler = - compiler.getEngine().getJAXXCompiler( - superclass.getName() - ); - - if (parentCompiler != null) { - needField = parentCompiler.getStylesheet() == null; - } else { - try { - superclass.getDeclaredFieldDescriptor( - PREVIOUS_VALUES_FIELD.getName()); - needField = false; - } catch (NoSuchFieldException ex) { - // field not found - } - } - if (needField && log.isDebugEnabled()) { - log.debug("no " + PREVIOUS_VALUES_FIELD.getName() + - " field in super class"); - } - } - if (needField) { - addSimpleField(javaFile, PREVIOUS_VALUES_FIELD); - } - } - } - - /*---------------------------------------------------------------------------------*/ - /*-- Create methods ---------------------------------------------------------------*/ - /*---------------------------------------------------------------------------------*/ - protected void addPropertyChangeSupport(CompiledObject root, - JavaFile javaFile) { - ClassDescriptor currentClass = root.getObjectClass(); - MethodDescriptor firePropertyChange = null; - while (firePropertyChange == null && currentClass != null) { - try { - firePropertyChange = currentClass.getDeclaredMethodDescriptor( - METHOD_NAME_FIRE_PROPERTY_CHANGE, - ClassDescriptorHelper.getClassDescriptor(String.class), - ClassDescriptorHelper.getClassDescriptor(Object.class), - ClassDescriptorHelper.getClassDescriptor(Object.class) - ); - - } catch (NoSuchMethodException e) { - currentClass = currentClass.getSuperclass(); - } - } - - int modifiers = firePropertyChange != null ? - firePropertyChange.getModifiers() : 0; - if (isPublic(modifiers)) { - // we have all the support we need - return; - } - if (isProtected(modifiers)) { - - // there is property change support but the firePropertyChange method is protected - javaFile.addMethod(FIRE_PROPERTY_CHANGE_METHOD); - } else { - - addField(javaFile, PROPERTY_CHANGE_SUPPORT_FIELD); - addMethod(javaFile, GET_PROPERTY_CHANGE_SUPPORT_METHOD, - PropertyChangeSupport.class.getName()); - addMethod(javaFile, ADD_PROPERTY_CHANGE_SUPPORT_METHOD); - addMethod(javaFile, ADD_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); - addMethod(javaFile, REMOVE_PROPERTY_CHANGE_SUPPORT_METHOD); - addMethod(javaFile, REMOVE_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); - addMethod(javaFile, FIRE_PROPERTY_CHANGE_NAMED_METHOD); - } - } - - protected void addInitialize_01_createComponents(JAXXCompiler compiler, JavaFile javaFile) { - StringBuilder body = new StringBuilder(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - String eol = JAXXCompiler.getLineSeparator(); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_01_CREATE_COMPONENTS)).append(eol); - } - - CompiledObject root = compiler.getRootObject(); - - String rootId = root.getId(); - body.append(FIELD_NAME_$OBJECT_MAP + ".put(").append(TypeManager.getJavaCode(rootId)).append(", ").append(rootId).append(");").append(eol); - - Iterator<CompiledObject> i = compiler.getObjectCreationOrder(); - boolean lastWasMethodCall = false; - //TODO-TC20091025 should do init of root first ? -// root.getDecorator().createInitializer(compiler, root, root, code, lastWasMethodCall); - while (i.hasNext()) { - CompiledObject object = i.next(); - if (object == root) { - continue; - } - CompiledObjectDecorator decorator = object.getDecorator(); - lastWasMethodCall = decorator.createInitializer(compiler, - root, - object, - body, - lastWasMethodCall - ); - } - root.getDecorator().createInitializer(compiler, - root, - root, - body, - lastWasMethodCall - ); - if (compiler.getInitializer().length() > 0) { - body.append(compiler.getInitializer()); - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_01_CREATE_COMPONENTS, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addInitialize_02_registerDataBindings(JAXXCompiler compiler, JavaFile javaFile) { - StringBuilder body = new StringBuilder(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - String eol = JAXXCompiler.getLineSeparator(); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_02_REGISTER_DATA_BINDINGS)).append(eol); - } - JavaFileGenerator generator = new JavaFileGenerator(eol, true); - //TODO use optimized writer for simple cases - - for (JAXXBindingWriter<?> writer : bindingWriters) { - writer.reset(); - } - - // add import on each type of JAXXBinding used - - for (JAXXBindingWriter<?> writer : bindingWriters) { - if (writer.isUsed()) { - compiler.getJavaFile().addImport(writer.getType()); - } - } - - DataBinding[] bindings = compiler.getBindingHelper().getDataBindings(); - body.append("// register "); - body.append(bindings.length); - body.append(" data bindings"); - body.append(eol); - - for (DataBinding binding : bindings) { - - for (JAXXBindingWriter<?> writer : bindingWriters) { - if (writer.accept(binding)) { - writer.write(binding, generator, body); - break; - } - } - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_02_REGISTER_DATA_BINDINGS, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addInitialize_03_finalizeCreateComponents(JAXXCompiler compiler, JavaFile javaFile) { - - StringBuilder body = new StringBuilder(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - String eol = JAXXCompiler.getLineSeparator(); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_03_FINALIZE_CREATE_COMPONENTS)).append(eol); - } - for (CompiledObject object : compiler.getObjects().values()) { - CompiledObjectDecorator decorator = object.getDecorator(); - body.append(decorator.createCompleteSetupMethod(compiler, - object, - javaFile) - ); - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_03_FINALIZE_CREATE_COMPONENTS, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addInitialize_04_applyDataBindings(JAXXCompiler compiler, JavaFile javaFile) { - StringBuilder body = new StringBuilder(); - String eol = JAXXCompiler.getLineSeparator(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_04_APPLY_DATA_BINDINGS)).append(eol); - } - DataBinding[] bindings = compiler.getBindingHelper().getDataBindings(); - if (bindings.length > 0) { - - body.append(eol); - body.append("// apply "); - body.append(bindings.length); - body.append(" data bindings"); - body.append(eol); - body.append(JAXXUtil.class.getSimpleName()); - body.append("." + METHOD_NAME_APPLY_DATA_BINDING + "(this, " + FIELD_NAME_$BINDINGS + ".keySet());"); - body.append(eol); - - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_04_APPLY_DATA_BINDINGS, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addInitialize_05_setProperties(JAXXCompiler compiler, JavaFile javaFile) { - StringBuilder body = new StringBuilder(); - String eol = JAXXCompiler.getLineSeparator(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_05_SET_PROPERTIES)).append(eol); - } - DataBinding[] bindings = compiler.getBindingHelper().getSimpleBindings(); - if (bindings.length > 0) { - - StringBuilder initCode = new StringBuilder(); - - for (DataBinding binding : bindings) { - - String binding1 = binding.getInitDataBinding(); - if (binding1 != null && !binding1.trim().isEmpty()) { - initCode.append(binding1); - } - } - - if (initCode.length() > 0) { - - body.append(eol); - body.append("// apply "); - body.append(bindings.length); - body.append(" property setters"); - body.append(eol); - body.append(initCode.toString().trim()); - - } - } - - if (compiler.getLateInitializer().length() > 0) { - body.append("// late initializer").append(eol); - body.append(compiler.getLateInitializer()).append(eol); - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_05_SET_PROPERTIES, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addInitialize_06_finalizeInitialize(JAXXCompiler compiler, JavaFile javaFile) { - StringBuilder body = new StringBuilder(); - body.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - String eol = JAXXCompiler.getLineSeparator(); - if (javaFile.isSuperclassIsJAXXObject()) { - body.append(String.format("super.%s();", METHOD_NAME_$INITIALIZE_06_FINALIZE_INITIALIZE)).append(eol); - } - JavaMethod method = newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE_06_FINALIZE_INITIALIZE, - body.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - } - - protected void addEventHandlers(JAXXCompiler compiler, - JavaFile javaFile) { - - for (Map.Entry<String, Map<ClassDescriptor, List<EventHandler>>> e1 : compiler.getEventHandlers().entrySet()) { - - // outer loop is iterating over different objects (well, technically, different Java expressions) - for (Map.Entry<ClassDescriptor, List<EventHandler>> e2 : e1.getValue().entrySet()) { - - // iterate over different types of listeners for this particular object (MouseListener, ComponentListener, etc.) - for (EventHandler handler : e2.getValue()) { - - // iterate over individual event handlers of a single type - String methodName = compiler.getEventHandlerMethodName(handler); - MethodDescriptor listenerMethod = handler.getListenerMethod(); - if (listenerMethod.getParameterTypes().length != 1) { - throw new CompilerException( - "Expected event handler " + - listenerMethod.getName() + " of class " + - handler.getListenerClass() + - " to have exactly one argument" - ); - } - - ClassDescriptor eventType = - listenerMethod.getParameterTypes()[0]; - - JavaArgument argument = - JavaElementFactory.newArgument( - JAXXCompiler.getCanonicalName(eventType), - "event" - ); - - String body = JavaFileGenerator.addDebugLoggerInvocation(compiler, "event"); - body += handler.getJavaCode(); - javaFile.addMethod(JavaElementFactory.newMethod( - PUBLIC, - TYPE_VOID, - methodName, - body, - false, - argument) - ); - } - } - } - } - - public JavaMethod addInitializerMethod(JAXXCompiler compiler, JavaFile javaFile) { - - String eol = JAXXCompiler.getLineSeparator(); - StringBuilder code = new StringBuilder(); - code.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - code.append(compiler.getRootObject().getId()).append(" = this;").append(eol); - - boolean useHandler = compiler.isUseHandler(); - - if (useHandler) { - String handler = compiler.getUiHandler(); - String handlerType = compiler.getImportedType(handler); - code.append("handler = new ").append(handlerType).append("();").append(eol); - code.append("handler." + METHOD_NAME$BEFORE_INIT + "(this);").append(eol); - } - - if (javaFile.isSuperclassIsJAXXObject()) { - code.append("super." + METHOD_NAME_$INITIALIZE + "();").append(eol); - } else { - code.append(METHOD_NAME_$INITIALIZE_01_CREATE_COMPONENTS + "();"); - code.append(eol); - - code.append(METHOD_NAME_$INITIALIZE_02_REGISTER_DATA_BINDINGS + "();"); - code.append(eol); - - code.append(METHOD_NAME_$INITIALIZE_03_FINALIZE_CREATE_COMPONENTS + "();"); - code.append(eol); - - code.append(METHOD_NAME_$INITIALIZE_04_APPLY_DATA_BINDINGS + "();"); - code.append(eol); - code.append(METHOD_NAME_$INITIALIZE_05_SET_PROPERTIES + "();"); - code.append(eol); - code.append(METHOD_NAME_$INITIALIZE_06_FINALIZE_INITIALIZE + "();"); - code.append(eol); - } - - if (useHandler) { - code.append("handler." + METHOD_NAME$AFTER_INIT + "(this);").append(eol); - } - JavaMethod method = JavaElementFactory.newMethod(PROTECTED, - TYPE_VOID, - METHOD_NAME_$INITIALIZE, - code.toString(), - javaFile.isSuperclassIsJAXXObject() - ); - javaFile.addMethod(method); - return method; - } - - protected JavaMethod createApplyDataBindingMethod() { - StringBuilder buffer = new StringBuilder(); - String eol = JAXXCompiler.getLineSeparator(); - - buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); - buffer.append(eol); - buffer.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();"); - buffer.append(eol); - buffer.append("}"); - buffer.append(eol); - buffer.append(METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");"); - return JavaElementFactory.newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_APPLY_DATA_BINDING, - buffer.toString(), - true, - JavaElementFactory.newArgument(TYPE_STRING, PARAMETER_NAME_$BINDING) - ); - } - - protected JavaMethod createRemoveDataBindingMethod() { - StringBuilder buffer = new StringBuilder(); - String eol = JAXXCompiler.getLineSeparator(); - - buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); - buffer.append(eol); - buffer.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();"); - buffer.append(eol); - buffer.append("}"); - return JavaElementFactory.newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_REMOVE_DATA_BINDING, - buffer.toString(), - true, - JavaElementFactory.newArgument(TYPE_STRING, PARAMETER_NAME_$BINDING) - ); - } - - protected JavaMethod createProcessDataBindingMethod() { - StringBuilder code = new StringBuilder(); - String eol = JAXXCompiler.getLineSeparator(); - - // the force parameter forces the update to happen even if it is already in activeBindings. This - // is used on superclass invocations b/c by the time the call gets to the superclass, it is already - // marked active and would otherwise be skipped - - code.append(" if (!$force && " + FIELD_NAME_$ACTIVE_BINDINGS + ".contains(" + PARAMETER_NAME_$BINDING + ")) { "); - code.append(eol); - code.append(" return;"); - code.append(eol); - code.append("}").append(eol); - code.append(FIELD_NAME_$ACTIVE_BINDINGS + ".add(" + PARAMETER_NAME_$BINDING + ");"); - code.append(eol); - code.append("try {").append(eol); - code.append(" if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); - code.append(eol); - code.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_PROCESS_DATA_BINDING + "();"); - code.append(eol); - code.append(" }").append(eol); - code.append("} finally {").append(eol); - code.append(" " + FIELD_NAME_$ACTIVE_BINDINGS + ".remove(" + PARAMETER_NAME_$BINDING + ");"); - code.append(eol); - code.append("}").append(eol); - return JavaElementFactory.newMethod( - PUBLIC, - TYPE_VOID, - METHOD_NAME_PROCESS_DATA_BINDING, - code.toString(), - true, - newArgument(TYPE_STRING, PARAMETER_NAME_$BINDING), - newArgument(TYPE_BOOLEAN, "$force") - ); - } -} diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java deleted file mode 100644 index bf58823..0000000 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/SwingFinalizer.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * #%L - * JAXX :: Compiler - * %% - * Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package jaxx.compiler.finalizers; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.runtime.swing.Application; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.SwingUtilities; -import java.lang.reflect.Modifier; - -/** - * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="swing" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" - */ -public class SwingFinalizer extends AbstractFinalizer { - - /** Logger. */ - protected static final Log log = LogFactory.getLog(DefaultFinalizer.class); - - @Override - public boolean accept(JAXXCompiler compiler) { - - ClassDescriptor descriptor = - ClassDescriptorHelper.getClassDescriptor(Application.class); - CompiledObject root = compiler.getRootObject(); - return descriptor.isAssignableFrom(root.getObjectClass()); - } - - @Override - public void finalizeCompiler(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) { - } - - @Override - public void prepareJavaFile(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) throws ClassNotFoundException { - - if (compiler.isMainDeclared()) { - - // main method was already defined, can not generate this method. - return; - } - - javaFile.addImport(SwingUtilities.class); - String code = "SwingUtilities.invokeLater(new Runnable() { " + - "public void run() { new " + className + - "().setVisible(true); } });"; - javaFile.addMethod(JavaElementFactory.newMethod( - Modifier.PUBLIC | Modifier.STATIC, - TYPE_VOID, - "main", - code, - false, - JavaElementFactory.newArgument("String[]", "arg"))); - } -} diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java b/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java deleted file mode 100644 index 77031f9..0000000 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java +++ /dev/null @@ -1,278 +0,0 @@ -/* - * #%L - * JAXX :: Compiler - * %% - * Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package jaxx.compiler.finalizers; - -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObject.ChildRef; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaElement; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.tags.validator.BeanValidatorHandler; -import jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; -import jaxx.compiler.types.TypeManager; -import org.nuiton.jaxx.validator.JAXXValidator; -import jaxx.runtime.SwingUtil; -import org.nuiton.jaxx.validator.swing.SwingValidator; -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; -import org.nuiton.jaxx.validator.swing.meta.Validator; -import org.nuiton.jaxx.validator.swing.meta.ValidatorField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * To finalize validators fields. - * - * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="validators" role="jaxx.compiler.finalizers.JAXXCompilerFinalizer" - */ -public class ValidatorFinalizer extends AbstractFinalizer { - - /** Logger. */ - static Log log = LogFactory.getLog(ValidatorFinalizer.class); - - protected static final JavaField VALIDATOR_IDS_FIELD = - JavaElementFactory.newField( - Modifier.PROTECTED, - List.class.getName() + "<String>", - "validatorIds", - true, - "new %s<String>()", - ArrayList.class.getName() - ); - - @Override - public boolean accept(JAXXCompiler compiler) { - - //use this finalizer if compiler is validation aware - return BeanValidatorHandler.hasValidator(compiler); - } - - @Override - public void finalizeCompiler(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) { - - for (CompiledObject object : compiler.getObjects().values()) { - List<ChildRef> childs = object.getChilds(); - if (childs == null || childs.isEmpty()) { - continue; - } - for (ChildRef child : childs) { - String javaCode = child.getChildJavaCode(); - - // some validators are defined on this object - boolean found = - BeanValidatorHandler.isComponentUsedByValidator( - compiler, - child.getChild().getId() - ); - - if (found) { -// compiler.setNeedSwingUtil(true); - String type = - compiler.getImportedType(SwingUtil.class); - // box the child component in a JxLayer - child.setChildJavaCode( - type + - ".boxComponentWithJxLayer(" + javaCode + ")"); - } - } - } - String eol = JAXXCompiler.getLineSeparator(); - StringBuilder builder = new StringBuilder(); - // register validators - List<CompiledBeanValidator> validators = - BeanValidatorHandler.getValidators(compiler); -// javaFile.addImport(Validator.class); -// javaFile.addImport(ValidatorField.class); -// javaFile.addImport(SwingValidatorUtil.class); - String validatorUtilPrefix = - compiler.getImportedType(SwingValidatorUtil.class) + - "."; - - compiler.getJavaFile().addMethod(JavaElementFactory.newMethod( - Modifier.PUBLIC, - TYPE_VOID, - "registerValidatorFields", - validatorUtilPrefix + "detectValidatorFields(this);", - true) - ); - builder.append("// register "); - builder.append(validators.size()); - builder.append(" validator(s)"); - builder.append(eol); - - builder.append("validatorIds = "); - builder.append(validatorUtilPrefix).append("detectValidators(this);"); - builder.append(eol); - - builder.append(validatorUtilPrefix).append("installUI(this);"); - builder.append(eol); - compiler.appendLateInitializer(builder.toString()); - - for (CompiledBeanValidator validator : validators) { - - registerValidator(validator, compiler, javaFile); - } - } - - @Override - public void prepareJavaFile(CompiledObject root, - JAXXCompiler compiler, - JavaFile javaFile, - String packageName, - String className) throws ClassNotFoundException { - Class<?> validatorClass = SwingValidator.class; - - Class<?> validatorInterface = JAXXValidator.class; - - boolean parentIsValidator = - compiler.isSuperClassAware(validatorInterface); - - if (parentIsValidator) { - - // nothing to generate (use the parent directly) - return; - } - - // add JAXXValidator interface - javaFile.addInterface(JAXXCompiler.getCanonicalName(validatorInterface)); - - // implements JAXXValidator - addField(javaFile, VALIDATOR_IDS_FIELD); - - String type = compiler.getImportedType(validatorClass); - - String initializer = "return (" + type + - "<?>) (validatorIds.contains(validatorId) ? " + - "getObjectById(validatorId) : null);"; - - - javaFile.addMethod(JavaElementFactory.newMethod( - Modifier.PUBLIC, - type + "<?>", - "getValidator", - initializer, - true, - JavaElementFactory.newArgument(TYPE_STRING, "validatorId")) - ); - } - - public void registerValidator(CompiledBeanValidator validator, - JAXXCompiler compiler, - JavaFile javaFile) { - - JavaField validatorField = javaFile.getField(validator.getId()); - - String validatorId = TypeManager.getJavaCode(validator.getId()); - - String type = compiler.getImportedType(Validator.class); - String fieldType = compiler.getImportedType(ValidatorField.class); - - String validatorAnnotation = type + - "( validatorId = " + validatorId + ")"; - validatorField.addAnnotation(validatorAnnotation); -// Map<String, String> fields = validator.getFields(); - - for (String component : validator.getFieldEditors()) { - - Collection<String> propertyNames = validator.getFieldPropertyNames(component); - List<String> keyCodes = - Lists.newArrayListWithCapacity(propertyNames.size()); - for (String propertyName : propertyNames) { - if (!validator.checkBeanProperty(compiler, propertyName)) { - // property not find on bean - continue; - } - String keyCode = TypeManager.getJavaCode(propertyName); - keyCodes.add(keyCode); - } - - if (keyCodes.isEmpty()) { - // no property - continue; - } - String keyCode = Joiner.on(", ").join(keyCodes); - if (keyCodes.size() > 1) { - keyCode = "{ " + keyCode + " }"; - } - -// String keyCode = TypeManager.getJavaCode(propertyName); - String editorCode = TypeManager.getJavaCode(component); - JavaElement editor = javaFile.getField(component); - if (editor == null) { - if (log.isDebugEnabled()) { - String message = "Could not find editor [" + component + - "] for property(ies) [" + propertyNames + - "] for file " + javaFile.getName(); - log.debug(message); - } - - // find in the compiler the object - CompiledObject compiledObject = - compiler.getCompiledObject(component); - - if (compiledObject == null) { - - // this is an error, editor is unknown (this case should - // never happen) - - String errorMessage = - "Could not find editor [" + component + - "] for property(ies) [" + propertyNames + - "] for file " + javaFile.getName(); - - throw new CompilerException(errorMessage); - } - - // now must add a getter in the javaFile - String fqn = JAXXCompiler.getCanonicalName(compiledObject); - - editor = javaFile.addGetterMethod(component, - Modifier.PUBLIC, - fqn, - true, - true - ); - } - - String annotation = fieldType + - "( validatorId = " + validatorId + "," + - " propertyName = " + keyCode + "," + - " editorName = " + editorCode + "" + ")"; - editor.addAnnotation(annotation); - } - } -} diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java index ef67dba..7ddbb43 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/ClassMap.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/ClassMap.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java index a60782b..a3e76f9 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler; - -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.tags.TagManager; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler; + +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObjectDecorator.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObjectDecorator.java index b9c2bd6..c41f81f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObjectDecorator.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.java.JavaFile; /** * Contract of compiled object decorator at generation time. diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java index 1028b2f..61faaea 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.spi.Initializer; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; import jaxx.runtime.spi.UIHandler; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerException.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/CompilerException.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerException.java index 8619361..a06af1f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerException.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; /** Thrown by the compiler when an error occurs. */ public class CompilerException extends RuntimeException { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java index 52ca240..d60cd01 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.spi.Initializer; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.spi.UIHandler; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/EventHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/EventHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java index 5fe8bf6..9ae8cd1 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/EventHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/EventHandler.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; public class EventHandler { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java index 930923f..f9a25c6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.CharUtils; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java index 8b1b0ce..4730858 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/IDHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/IDHelper.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java index b12e9a1..b6ce475 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java @@ -20,25 +20,25 @@ * #L% */ -package jaxx.compiler; - -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.css.StylesheetHelper; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; -import jaxx.compiler.java.parser.ParseException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.script.ScriptManager; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.tags.TagManager; +package org.nuiton.jaxx.compiler; + +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.css.StylesheetHelper; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaField; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.java.parser.ParseException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.script.ScriptManager; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; import jaxx.runtime.ComponentDescriptor; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; @@ -1057,8 +1057,8 @@ public class JAXXCompiler { registerStylesheet(style); } catch (CompilerException e) { String message= "Css file content is not valid :" + styleFile; - if (e instanceof jaxx.compiler.css.parser.ParseException) { - jaxx.compiler.css.parser.ParseException parseException = (jaxx.compiler.css.parser.ParseException) e; + if (e instanceof org.nuiton.jaxx.compiler.css.parser.ParseException) { + org.nuiton.jaxx.compiler.css.parser.ParseException parseException = (org.nuiton.jaxx.compiler.css.parser.ParseException) e; message += " (line: " + parseException.getLine() + " - col:" + parseException.getColumn() + ") "; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFile.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java index d622a22..8ea5beb 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompilerFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompilerFile.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java index 634137f..f6fb095 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java @@ -20,19 +20,19 @@ * #L% */ -package jaxx.compiler; - -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tasks.CompileFirstPassTask; -import jaxx.compiler.tasks.CompileSecondPassTask; -import jaxx.compiler.tasks.FinalizeTask; -import jaxx.compiler.tasks.GenerateConstructorsTask; -import jaxx.compiler.tasks.GenerateMissingRulesTask; -import jaxx.compiler.tasks.GenerateTask; -import jaxx.compiler.tasks.InitTask; -import jaxx.compiler.tasks.JAXXEngineTask; -import jaxx.compiler.tasks.ProfileTask; -import jaxx.compiler.tasks.StyleSheetTask; +package org.nuiton.jaxx.compiler; + +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tasks.CompileFirstPassTask; +import org.nuiton.jaxx.compiler.tasks.CompileSecondPassTask; +import org.nuiton.jaxx.compiler.tasks.FinalizeTask; +import org.nuiton.jaxx.compiler.tasks.GenerateConstructorsTask; +import org.nuiton.jaxx.compiler.tasks.GenerateMissingRulesTask; +import org.nuiton.jaxx.compiler.tasks.GenerateTask; +import org.nuiton.jaxx.compiler.tasks.InitTask; +import org.nuiton.jaxx.compiler.tasks.JAXXEngineTask; +import org.nuiton.jaxx.compiler.tasks.ProfileTask; +import org.nuiton.jaxx.compiler.tasks.StyleSheetTask; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXFactory.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXFactory.java index 9bb73d8..4afe4b8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXFactory.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.spi.Initializer; -import jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.spi.Initializer; +import org.nuiton.jaxx.compiler.tags.TagManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java index 2c729b6..d9261f7 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/JAXXProfile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXProfile.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.tasks.CompileFirstPassTask; -import jaxx.compiler.tasks.CompileSecondPassTask; -import jaxx.compiler.tasks.FinalizeTask; -import jaxx.compiler.tasks.GenerateTask; -import jaxx.compiler.tasks.StyleSheetTask; +import org.nuiton.jaxx.compiler.tasks.CompileFirstPassTask; +import org.nuiton.jaxx.compiler.tasks.CompileSecondPassTask; +import org.nuiton.jaxx.compiler.tasks.FinalizeTask; +import org.nuiton.jaxx.compiler.tasks.GenerateTask; +import org.nuiton.jaxx.compiler.tasks.StyleSheetTask; import org.nuiton.util.StringUtil; import java.util.ArrayList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java index 26e0fa1..ff46043 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/SymbolTable.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/SymbolTable.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; import java.util.ArrayList; import java.util.HashMap; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedAttributeException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedAttributeException.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedAttributeException.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedAttributeException.java index 3799bc2..902f7a6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedAttributeException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedAttributeException.java @@ -20,12 +20,14 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; + +import org.nuiton.jaxx.compiler.tags.TagHandler; /** * Thrown by <code>TagHandler</code> when an unsupported attribute is encountered. * - * @see jaxx.compiler.tags.TagHandler + * @see TagHandler */ public class UnsupportedAttributeException extends CompilerException { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedTagException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedTagException.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedTagException.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedTagException.java index 7287b76..b3f0a18 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/UnsupportedTagException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/UnsupportedTagException.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler; +package org.nuiton.jaxx.compiler; /** Thrown by the compiler when an unregistered tag is encountered. */ public class UnsupportedTagException extends CompilerException { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/BeanInfoUtil.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/BeanInfoUtil.java index c674be5..3c1a904 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/BeanInfoUtil.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/BeanInfoUtil.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; import java.beans.Introspector; import java.util.ArrayList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanDescriptor.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanDescriptor.java index abfc829..3d09fc0 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanDescriptor.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; /** * Mirrors the class <code>java.beans.BeanDescriptor</code>. JAXX uses its own introspector rather than the built-in diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanInfo.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanInfo.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java index 0023a01..b0f4a21 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXBeanInfo.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXBeanInfo.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; /** * Mirrors the class <code>java.beans.BeanInfo</code>. JAXX uses its own introspector rather than the built-in diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXEventSetDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXEventSetDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java index a76be0f..76cafcd 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXEventSetDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXEventSetDescriptor.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; /** * Mirrors the class <code>java.beans.EventSetDescriptor</code>. JAXX uses its own introspector rather than the built-in diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXFeatureDescriptor.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXFeatureDescriptor.java index 873bf22..7820e39 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXFeatureDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXFeatureDescriptor.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; import java.util.HashMap; import java.util.Map; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java index c7634aa..504962f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXIntrospector.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; import java.beans.BeanDescriptor; import java.beans.BeanInfo; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXPropertyDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXPropertyDescriptor.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXPropertyDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXPropertyDescriptor.java index a632ba2..760ba33 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXPropertyDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/beans/JAXXPropertyDescriptor.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; -import jaxx.compiler.CompilerException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; /** * Mirrors the class <code>java.beans.PropertyDescriptor</code>. JAXX uses its own introspector rather than the built-in diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java index e9d33ce..d0823e5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBinding.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.binding; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.binding; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBindingHelper.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBindingHelper.java index bb6bb48..02d10bf 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBindingHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataBindingHelper.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding; +package org.nuiton.jaxx.compiler.binding; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; import java.util.ArrayList; import java.util.Iterator; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataListener.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataListener.java index c5c0286..423ec22 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding; +package org.nuiton.jaxx.compiler.binding; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java index a43a6b8..9cb1c99 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java @@ -20,27 +20,27 @@ * #L% */ -package jaxx.compiler.binding; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; -import jaxx.compiler.java.parser.JavaParser; -import jaxx.compiler.java.parser.JavaParserConstants; -import jaxx.compiler.java.parser.JavaParserTreeConstants; -import jaxx.compiler.java.parser.SimpleNode; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.tags.TagManager; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.binding; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.java.parser.JavaParser; +import org.nuiton.jaxx.compiler.java.parser.JavaParserConstants; +import org.nuiton.jaxx.compiler.java.parser.JavaParserTreeConstants; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/JavaParserUtil.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/JavaParserUtil.java index 9d78e56..1c95557 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/JavaParserUtil.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/JavaParserUtil.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding; +package org.nuiton.jaxx.compiler.binding; -import jaxx.compiler.java.parser.JavaParserTreeConstants; -import jaxx.compiler.java.parser.SimpleNode; +import org.nuiton.jaxx.compiler.java.parser.JavaParserTreeConstants; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/PseudoClassDataBinding.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/PseudoClassDataBinding.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/PseudoClassDataBinding.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/PseudoClassDataBinding.java index a5566d3..934d0b2 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/PseudoClassDataBinding.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/PseudoClassDataBinding.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler.binding; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.parser.JavaParser; -import jaxx.compiler.java.parser.JavaParserTreeConstants; -import jaxx.compiler.java.parser.SimpleNode; +package org.nuiton.jaxx.compiler.binding; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.parser.JavaParser; +import org.nuiton.jaxx.compiler.java.parser.JavaParserTreeConstants; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java index 9a73c30..86a3ccc 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding.writers; +package org.nuiton.jaxx.compiler.binding.writers; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.binding.DataListener; -import jaxx.compiler.finalizers.DefaultFinalizer; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.binding.DataBinding; +import org.nuiton.jaxx.compiler.binding.DataListener; +import org.nuiton.jaxx.compiler.finalizers.DefaultFinalizer; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; import jaxx.runtime.JAXXBinding; import java.util.List; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java similarity index 90% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java index cdee04e..2409a56 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java @@ -19,16 +19,16 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding.writers; +package org.nuiton.jaxx.compiler.binding.writers; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.binding.DataListener; -import jaxx.compiler.finalizers.DefaultFinalizer; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.binding.DataBinding; +import org.nuiton.jaxx.compiler.binding.DataListener; +import org.nuiton.jaxx.compiler.finalizers.DefaultFinalizer; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; import jaxx.runtime.binding.DefaultJAXXBinding; import java.util.List; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/JAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/JAXXBindingWriter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java index 8ab3060..38a654c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/JAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding.writers; +package org.nuiton.jaxx.compiler.binding.writers; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.binding.DataBinding; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; import jaxx.runtime.JAXXBinding; /** diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java similarity index 86% rename from jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java index 5efae36..5fd1b41 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java @@ -19,16 +19,16 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding.writers; +package org.nuiton.jaxx.compiler.binding.writers; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.binding.DataListener; -import jaxx.compiler.binding.JavaParserUtil; -import jaxx.compiler.finalizers.DefaultFinalizer; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.binding.DataBinding; +import org.nuiton.jaxx.compiler.binding.DataListener; +import org.nuiton.jaxx.compiler.binding.JavaParserUtil; +import org.nuiton.jaxx.compiler.finalizers.DefaultFinalizer; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.java.JavaMethod; import jaxx.runtime.binding.SimpleJAXXObjectBinding; import java.lang.reflect.Modifier; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java index e6a4ada..eee6424 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java @@ -20,25 +20,25 @@ * #L% */ -package jaxx.compiler.css; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBinding; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.binding.PseudoClassDataBinding; -import jaxx.compiler.css.parser.CSSParser; -import jaxx.compiler.css.parser.CSSParserConstants; -import jaxx.compiler.css.parser.CSSParserTreeConstants; -import jaxx.compiler.css.parser.SimpleNode; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.tags.TagManager; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.css; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.binding.DataBinding; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.binding.PseudoClassDataBinding; +import org.nuiton.jaxx.compiler.css.parser.CSSParser; +import org.nuiton.jaxx.compiler.css.parser.CSSParserConstants; +import org.nuiton.jaxx.compiler.css.parser.CSSParserTreeConstants; +import org.nuiton.jaxx.compiler.css.parser.SimpleNode; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.css.Pseudoclasses; import jaxx.runtime.css.Rule; import jaxx.runtime.css.Selector; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSS.jj b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSS.jj similarity index 100% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSS.jj rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSS.jj diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSS.jjt b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSS.jjt similarity index 100% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSS.jjt rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSS.jjt diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParser.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParser.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java index dd6d9fb..7c2d3d3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParser.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParser.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. CSSParser.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public class CSSParser/*@bgen(jjtree)*/ implements CSSParserTreeConstants, CSSParserConstants {/*@bgen(jjtree)*/ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserConstants.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserConstants.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserConstants.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserConstants.java index 22774f6..a270c00 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserConstants.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserConstants.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. CSSParserConstants.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public interface CSSParserConstants { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTokenManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTokenManager.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTokenManager.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTokenManager.java index a75517b..27841e4 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTokenManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTokenManager.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. CSSParserTokenManager.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public class CSSParserTokenManager implements CSSParserConstants { public java.io.PrintStream debugStream = System.out; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTreeConstants.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTreeConstants.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTreeConstants.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTreeConstants.java index 3a97370..b870801 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/CSSParserTreeConstants.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/CSSParserTreeConstants.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. .\CSSParserTreeConstants.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public interface CSSParserTreeConstants { int JJTSTYLESHEET = 0; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java index aaa5b40..91030ab 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/JJTCSSParserState.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/JJTCSSParserState.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. .\JJTCSSParserState.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; class JJTCSSParserState { private java.util.Stack<Node> nodes; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Node.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Node.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java index 8c532ac..a5c4716 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Node.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Node.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. Node.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; /* All AST nodes must implement this interface. It provides basic machinery for constructing the parent and child relationships diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/ParseException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/ParseException.java similarity index 89% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/ParseException.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/ParseException.java index 03dad51..6e06c79 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/ParseException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/ParseException.java @@ -21,9 +21,9 @@ */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; -public class ParseException extends jaxx.compiler.java.parser.ParseException { +public class ParseException extends org.nuiton.jaxx.compiler.java.parser.ParseException { private static final long serialVersionUID = 229575674880359031L; public ParseException() { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleCharStream.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleCharStream.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleCharStream.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleCharStream.java index a84b46c..1f147f4 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleCharStream.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleCharStream.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; /** * An implementation of interface CharStream, where the stream is assumed to diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java index 19a84a1..d8123ac 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/SimpleNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/SimpleNode.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. SimpleNode.java */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public class SimpleNode implements Node { protected Node parent; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Token.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Token.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Token.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Token.java index d07fbee..6f001dd 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/Token.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/Token.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; /** Describes the input token stream. */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/TokenMgrError.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/TokenMgrError.java index d7b95cd..6587f99 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/css/parser/TokenMgrError.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/parser/TokenMgrError.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */ -package jaxx.compiler.css.parser; +package org.nuiton.jaxx.compiler.css.parser; public class TokenMgrError extends Error { /* diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java similarity index 87% rename from jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java index 8162923..6353e66 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.compiler.decorators; +package org.nuiton.jaxx.compiler.decorators; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObject.ChildRef; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompiledObject.ChildRef; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.java.JavaFile; import jaxx.runtime.SwingUtil; /** @@ -33,7 +33,7 @@ import jaxx.runtime.SwingUtil; * with a JXLayer. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="boxed" role="jaxx.compiler.CompiledObjectDecorator" + * @plexus.component role-hint="boxed" role="org.nuiton.jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ public class BoxedCompiledObjectDecorator extends DefaultCompiledObjectDecorator { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java index 86f2fb8..cd6495e 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java @@ -20,19 +20,19 @@ * #L% */ -package jaxx.compiler.decorators; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.java.JavaMethod; -import jaxx.compiler.script.ScriptInitializer; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.decorators; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompiledObjectDecorator; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaField; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.script.ScriptInitializer; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,7 +44,7 @@ import java.util.Map.Entry; * The default decorator to use on all compiled objects. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="default" role="jaxx.compiler.CompiledObjectDecorator" + * @plexus.component role-hint="default" role="org.nuiton.jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ public class DefaultCompiledObjectDecorator implements CompiledObjectDecorator { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index 28c1149..04ad8fc 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.decorators; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerConfiguration; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.reflect.ClassDescriptor; +package org.nuiton.jaxx.compiler.decorators; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompiledObjectDecorator; +import org.nuiton.jaxx.compiler.CompilerConfiguration; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; import jaxx.runtime.swing.help.JAXXHelpUI; import java.awt.Component; @@ -38,13 +38,13 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import static jaxx.compiler.java.JavaElementFactory.newArgument; +import static org.nuiton.jaxx.compiler.java.JavaElementFactory.newArgument; /** * A decorator to place on a root compiled object to process javaHelp on the file. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role-hint="help" role="jaxx.compiler.CompiledObjectDecorator" + * @plexus.component role-hint="help" role="org.nuiton.jaxx.compiler.CompiledObjectDecorator" * @since 1.2 */ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecorator { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/AbstractFinalizer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/AbstractFinalizer.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/finalizers/AbstractFinalizer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/AbstractFinalizer.java index 23e839e..4312a4d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/AbstractFinalizer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/AbstractFinalizer.java @@ -19,12 +19,12 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.finalizers; +package org.nuiton.jaxx.compiler.finalizers; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaField; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.java.JavaMethod; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaField; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.java.JavaMethod; /** * Base implementation of a {@link JAXXCompilerFinalizer}. diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java index 40c2b31..30906e2 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/finalizers/JAXXCompilerFinalizer.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.finalizers; +package org.nuiton.jaxx.compiler.finalizers; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.java.JavaFile; /** * Contract of any object to interact with a {@link JAXXCompiler} before the diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java index bede7b5..986e10b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaArgument.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaArgument.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; /** * Represents an argument to a <code>JavaMethod</code>. diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java index 8bc718f..dff5afd 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaConstructor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaConstructor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElement.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElement.java index c4a2e9a..65b5c7d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElement.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import org.apache.commons.collections4.CollectionUtils; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElementFactory.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElementFactory.java index 59ffb08..e9b30f6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElementFactory.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaElementFactory.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java index 3c64027..c8bc810 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaField.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaField.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java index fdb4570..6f23ba5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFile.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFileGenerator.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFileGenerator.java index 740f1ea..5da12fc 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaFileGenerator.java @@ -20,10 +20,9 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaMethod.MethodOrder; +import org.nuiton.jaxx.compiler.JAXXCompiler; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -236,7 +235,7 @@ public class JavaFileGenerator { // add constructors : - result.append(addIndentation(MethodOrder.constructors.getHeader(), 4, eol)); + result.append(addIndentation(JavaMethod.MethodOrder.constructors.getHeader(), 4, eol)); result.append(eol); result.append(eol); @@ -249,10 +248,10 @@ public class JavaFileGenerator { } // generate methods - EnumMap<MethodOrder, List<JavaMethod>> map = + EnumMap<JavaMethod.MethodOrder, List<JavaMethod>> map = JavaMethod.getSortedMethods(f.getMethods()); - for (Entry<MethodOrder, List<JavaMethod>> entry : map.entrySet()) { + for (Entry<JavaMethod.MethodOrder, List<JavaMethod>> entry : map.entrySet()) { List<JavaMethod> list = entry.getValue(); if (!list.isEmpty()) { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java index 4896759..cf2c7e6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/JavaMethod.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java index 08bf924..d4ddc70 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JJTJavaParserState.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JJTJavaParserState.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. .\JJTJavaParserState.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; class JJTJavaParserState { private java.util.Stack<Node> nodes; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Java1.5.jj b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Java1.5.jj similarity index 100% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Java1.5.jj rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Java1.5.jj diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Java1.5.jjt b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Java1.5.jjt similarity index 100% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Java1.5.jjt rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Java1.5.jjt diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaCharStream.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaCharStream.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaCharStream.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaCharStream.java index 7902fde..2a20b54 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaCharStream.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaCharStream.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 4.0 */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; /** * An implementation of interface CharStream, where the stream is assumed to diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParser.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParser.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java index 02e65b5..2507f6a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParser.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParser.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParser.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; import java.io.File; import java.io.FileInputStream; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserConstants.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserConstants.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserConstants.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserConstants.java index d7c2d2c..a0b5820 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserConstants.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserConstants.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParserConstants.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; public interface JavaParserConstants { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java index 2384639..c19f7a3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTokenManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTokenManager.java @@ -21,7 +21,7 @@ */ /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParserTokenManager.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; import java.io.IOException; import java.io.PrintStream; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTreeConstants.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTreeConstants.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTreeConstants.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTreeConstants.java index 279f2d4..5c1b375 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/JavaParserTreeConstants.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTreeConstants.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. ./JavaParserTreeConstants.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; public interface JavaParserTreeConstants { int JJTLINE = 0; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Node.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Node.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Node.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Node.java index a947768..645de07 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Node.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Node.java @@ -22,7 +22,7 @@ /* Generated By:JJTree: Do not edit this line. Node.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; /* All AST nodes must implement this interface. It provides basic machinery for constructing the parent and child relationships diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java index ba7fd4b..59bc494 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/ParseException.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/ParseException.java @@ -21,7 +21,9 @@ */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; + +import org.nuiton.jaxx.compiler.CompilerException; /** * This exception is thrown when parse errors are encountered. @@ -32,7 +34,7 @@ package jaxx.compiler.java.parser; * You can modify this class to customize your error reporting * mechanisms so long as you retain the public fields. */ -public class ParseException extends jaxx.compiler.CompilerException { +public class ParseException extends CompilerException { int line; int column; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java index 164007d..e709676 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/SimpleNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/SimpleNode.java @@ -22,9 +22,9 @@ /* Generated By:JJTree: Do not edit this line. SimpleNode.java */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; public class SimpleNode implements Node { protected Node parent; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Token.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Token.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Token.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Token.java index 67adb03..52cf807 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/Token.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/Token.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; /** Describes the input token stream. */ diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/TokenMgrError.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/TokenMgrError.java index fc091e1..6a2f46d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/java/parser/TokenMgrError.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/java/parser/TokenMgrError.java @@ -21,7 +21,7 @@ */ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; public class TokenMgrError extends Error { /* diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java index 13df107..59e36f7 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java index 520eb84..04a912f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.reflect; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaClass; -import jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile; -import jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJaxxFile; +package org.nuiton.jaxx.compiler.reflect; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaClass; +import org.nuiton.jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile; +import org.nuiton.jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJaxxFile; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorResolver.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorResolver.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java index 7e4f754..052d899 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/ClassDescriptorResolver.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorResolver.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import java.net.URL; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java index 4b7f6c8..2c1805d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/FieldDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/FieldDescriptor.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * Mirrors the class <code>java.lang.ref.Field</code>. JAXX uses <code>ClassDescriptor</code> instead of <code>Class</code> diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/MemberDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/MemberDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java index 99d653b..3cf4b9b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/MemberDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MemberDescriptor.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * Mirrors the class <code>java.lang.ref.Member</code>. JAXX uses <code>ClassDescriptor</code> instead of <code>Class</code> diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/MethodDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/MethodDescriptor.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java index 4f1f4b9..dabc5ca 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/MethodDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/MethodDescriptor.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompiler; import java.util.Arrays; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java index 6ab03de..d54caed 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect.resolvers; +package org.nuiton.jaxx.compiler.reflect.resolvers; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.ClassDescriptorResolver; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorResolver; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; import jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java index c7571d4..8183984 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java @@ -19,21 +19,21 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect.resolvers; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.java.parser.JavaParser; -import jaxx.compiler.java.parser.JavaParserTreeConstants; -import jaxx.compiler.java.parser.ParseException; -import jaxx.compiler.java.parser.SimpleNode; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.ClassDescriptorResolver; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.TagManager; +package org.nuiton.jaxx.compiler.reflect.resolvers; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.java.parser.JavaParser; +import org.nuiton.jaxx.compiler.java.parser.JavaParserTreeConstants; +import org.nuiton.jaxx.compiler.java.parser.ParseException; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorResolver; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.TagManager; import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java index fff0079..9956e43 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java @@ -19,18 +19,18 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect.resolvers; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.SymbolTable; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.ClassDescriptorResolver; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; +package org.nuiton.jaxx.compiler.reflect.resolvers; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.SymbolTable; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorResolver; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptInitializer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptInitializer.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptInitializer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptInitializer.java index e7a1cc2..ca608b6 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptInitializer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptInitializer.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.script; +package org.nuiton.jaxx.compiler.script; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; /** * A dummy CompiledObject which serves to initialize scripted field. This is handled by diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java index 5403f8e..5587f82 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/script/ScriptManager.java @@ -20,20 +20,20 @@ * #L% */ -package jaxx.compiler.script; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.java.JavaArgument; -import jaxx.compiler.java.JavaConstructor; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.parser.JavaParser; -import jaxx.compiler.java.parser.JavaParserTreeConstants; -import jaxx.compiler.java.parser.SimpleNode; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.TagManager; +package org.nuiton.jaxx.compiler.script; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.java.JavaArgument; +import org.nuiton.jaxx.compiler.java.JavaConstructor; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.parser.JavaParser; +import org.nuiton.jaxx.compiler.java.parser.JavaParserTreeConstants; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.TagManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java similarity index 73% rename from jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java index d5d42f8..b84d161 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java @@ -20,51 +20,51 @@ * #L% */ -package jaxx.compiler.spi; - -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.beans.BeanInfoUtil; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.tags.ImportHandler; -import jaxx.compiler.tags.ScriptHandler; -import jaxx.compiler.tags.StyleHandler; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.tags.TagManager; -import jaxx.compiler.tags.swing.ApplicationHandler; -import jaxx.compiler.tags.swing.CellHandler; -import jaxx.compiler.tags.swing.ItemHandler; -import jaxx.compiler.tags.swing.JAXXComboBoxHandler; -import jaxx.compiler.tags.swing.JAXXListHandler; -import jaxx.compiler.tags.swing.JAXXTabHandler; -import jaxx.compiler.tags.swing.JAXXTreeHandler; -import jaxx.compiler.tags.swing.JCheckBoxHandler; -import jaxx.compiler.tags.swing.JComboBoxHandler; -import jaxx.compiler.tags.swing.JInternalFrameHandler; -import jaxx.compiler.tags.swing.JListHandler; -import jaxx.compiler.tags.swing.JMenuHandler; -import jaxx.compiler.tags.swing.JPasswordFieldHandler; -import jaxx.compiler.tags.swing.JPopupMenuHandler; -import jaxx.compiler.tags.swing.JProgressBarHandler; -import jaxx.compiler.tags.swing.JRadioButtonHandler; -import jaxx.compiler.tags.swing.JScrollPaneHandler; -import jaxx.compiler.tags.swing.JSliderHandler; -import jaxx.compiler.tags.swing.JSpinnerHandler; -import jaxx.compiler.tags.swing.JSplitPaneHandler; -import jaxx.compiler.tags.swing.JTabbedPaneHandler; -import jaxx.compiler.tags.swing.JTextComponentHandler; -import jaxx.compiler.tags.swing.JToolBarHandler; -import jaxx.compiler.tags.swing.JTreeHandler; -import jaxx.compiler.tags.swing.JWindowHandler; -import jaxx.compiler.tags.swing.JXLayerHandler; -import jaxx.compiler.tags.swing.RowHandler; -import jaxx.compiler.tags.swing.TabHandler; -import jaxx.compiler.tags.swing.TableHandler; -import jaxx.compiler.tags.validator.BeanValidatorHandler; -import jaxx.compiler.tags.validator.ExcludeFieldValidatorHandler; -import jaxx.compiler.tags.validator.FieldValidatorHandler; +package org.nuiton.jaxx.compiler.spi; + +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.beans.BeanInfoUtil; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.tags.ImportHandler; +import org.nuiton.jaxx.compiler.tags.ScriptHandler; +import org.nuiton.jaxx.compiler.tags.StyleHandler; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.tags.swing.ApplicationHandler; +import org.nuiton.jaxx.compiler.tags.swing.CellHandler; +import org.nuiton.jaxx.compiler.tags.swing.ItemHandler; +import org.nuiton.jaxx.compiler.tags.swing.JAXXComboBoxHandler; +import org.nuiton.jaxx.compiler.tags.swing.JAXXListHandler; +import org.nuiton.jaxx.compiler.tags.swing.JAXXTabHandler; +import org.nuiton.jaxx.compiler.tags.swing.JAXXTreeHandler; +import org.nuiton.jaxx.compiler.tags.swing.JCheckBoxHandler; +import org.nuiton.jaxx.compiler.tags.swing.JComboBoxHandler; +import org.nuiton.jaxx.compiler.tags.swing.JInternalFrameHandler; +import org.nuiton.jaxx.compiler.tags.swing.JListHandler; +import org.nuiton.jaxx.compiler.tags.swing.JMenuHandler; +import org.nuiton.jaxx.compiler.tags.swing.JPasswordFieldHandler; +import org.nuiton.jaxx.compiler.tags.swing.JPopupMenuHandler; +import org.nuiton.jaxx.compiler.tags.swing.JProgressBarHandler; +import org.nuiton.jaxx.compiler.tags.swing.JRadioButtonHandler; +import org.nuiton.jaxx.compiler.tags.swing.JScrollPaneHandler; +import org.nuiton.jaxx.compiler.tags.swing.JSliderHandler; +import org.nuiton.jaxx.compiler.tags.swing.JSpinnerHandler; +import org.nuiton.jaxx.compiler.tags.swing.JSplitPaneHandler; +import org.nuiton.jaxx.compiler.tags.swing.JTabbedPaneHandler; +import org.nuiton.jaxx.compiler.tags.swing.JTextComponentHandler; +import org.nuiton.jaxx.compiler.tags.swing.JToolBarHandler; +import org.nuiton.jaxx.compiler.tags.swing.JTreeHandler; +import org.nuiton.jaxx.compiler.tags.swing.JWindowHandler; +import org.nuiton.jaxx.compiler.tags.swing.JXLayerHandler; +import org.nuiton.jaxx.compiler.tags.swing.RowHandler; +import org.nuiton.jaxx.compiler.tags.swing.TabHandler; +import org.nuiton.jaxx.compiler.tags.swing.TableHandler; +import org.nuiton.jaxx.compiler.tags.validator.BeanValidatorHandler; +import org.nuiton.jaxx.compiler.tags.validator.ExcludeFieldValidatorHandler; +import org.nuiton.jaxx.compiler.tags.validator.FieldValidatorHandler; import jaxx.runtime.swing.Application; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.JAXXComboBox; @@ -110,7 +110,7 @@ import java.awt.Component; /** * Initializes support provided from JAXX (java, swing and validation). * - * @plexus.component role-hint="default" role="jaxx.compiler.spi.Initializer" + * @plexus.component role-hint="default" role="org.nuiton.jaxx.compiler.spi.Initializer" */ public class DefaultInitializer implements Initializer { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/spi/Initializer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/Initializer.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/spi/Initializer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/Initializer.java index a4f9389..009ca70 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/spi/Initializer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/Initializer.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.spi; +package org.nuiton.jaxx.compiler.spi; import java.util.ServiceLoader; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java index 7ac06b5..1c38eaa 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.tags; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.I18nHelper; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java index ec9b096..e99671f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java @@ -20,26 +20,26 @@ * #L% */ -package jaxx.compiler.tags; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerException; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.beans.JAXXBeanInfo; -import jaxx.compiler.beans.JAXXEventSetDescriptor; -import jaxx.compiler.beans.JAXXIntrospector; -import jaxx.compiler.beans.JAXXPropertyDescriptor; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.css.StylesheetHelper; -import jaxx.compiler.java.parser.ParseException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompiledObjectDecorator; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.I18nHelper; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.beans.JAXXBeanInfo; +import org.nuiton.jaxx.compiler.beans.JAXXEventSetDescriptor; +import org.nuiton.jaxx.compiler.beans.JAXXIntrospector; +import org.nuiton.jaxx.compiler.beans.JAXXPropertyDescriptor; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.css.StylesheetHelper; +import org.nuiton.jaxx.compiler.java.parser.ParseException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.ComponentDescriptor; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ImportHandler.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ImportHandler.java index d05be76..6929ff9 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/ImportHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ImportHandler.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.tags; +package org.nuiton.jaxx.compiler.tags; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompiler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ScriptHandler.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ScriptHandler.java index 2ea6264..e337b28 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/ScriptHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/ScriptHandler.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.tags; +package org.nuiton.jaxx.compiler.tags; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java index 6dfe719..aa50523 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/StyleHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.compiler.tags; +package org.nuiton.jaxx.compiler.tags; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.css.StylesheetHelper; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.css.StylesheetHelper; import jaxx.runtime.css.Stylesheet; import org.w3c.dom.Attr; import org.w3c.dom.Element; @@ -93,8 +93,8 @@ public class StyleHandler implements TagHandler { compiler.registerStylesheet(stylesheet); } catch (CompilerException e) { String message = "Inline Css content is not valid"; - if (e instanceof jaxx.compiler.css.parser.ParseException) { - jaxx.compiler.css.parser.ParseException parseException = (jaxx.compiler.css.parser.ParseException) e; + if (e instanceof org.nuiton.jaxx.compiler.css.parser.ParseException) { + org.nuiton.jaxx.compiler.css.parser.ParseException parseException = (org.nuiton.jaxx.compiler.css.parser.ParseException) e; message += " (line: " + parseException.getLine() + " - col:" + parseException.getColumn() + ") "; } diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagHandler.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/TagHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagHandler.java index bc8b9af..1e6d078 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagHandler.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.tags; +package org.nuiton.jaxx.compiler.tags; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; import org.w3c.dom.Element; import java.io.IOException; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java index a8b162d..96e8a0a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/TagManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags; +package org.nuiton.jaxx.compiler.tags; -import jaxx.compiler.ClassMap; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.ClassMap; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ApplicationHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ApplicationHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java index ea61a89..b078c21 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ApplicationHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Application; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CellHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CellHandler.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CellHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CellHandler.java index 5707cc9..e5584e2 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CellHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CellHandler.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java index 5f9df6d..f94f7d4 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/CompiledItemContainer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; import jaxx.runtime.swing.Item; import java.util.ArrayList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ItemHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ItemHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java index a442c9b..7efe827 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/ItemHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Item; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java similarity index 87% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java index 433a84d..5089c9d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Item; import jaxx.runtime.swing.JAXXComboBox; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXListHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXListHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java index 1200ae2..df0d4a5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXListHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Item; import jaxx.runtime.swing.JAXXList; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTabHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTabHandler.java similarity index 90% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTabHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTabHandler.java index aaea97f..02a66e3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTabHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTabHandler.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; /** @author Tony Chemit - chemit@codelutin.com */ public class JAXXTabHandler extends TableHandler { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTreeHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java similarity index 89% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTreeHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java index 8429221..100ba26 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JAXXTreeHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Item; import jaxx.runtime.swing.JAXXTree; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JCheckBoxHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JCheckBoxHandler.java similarity index 85% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JCheckBoxHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JCheckBoxHandler.java index fa313c2..a7c314e 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JCheckBoxHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JCheckBoxHandler.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import javax.swing.AbstractButton; import javax.swing.event.ChangeListener; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JComboBoxHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JComboBoxHandler.java similarity index 84% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JComboBoxHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JComboBoxHandler.java index dcbbdf1..6207f58 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JComboBoxHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JComboBoxHandler.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JInternalFrameHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JInternalFrameHandler.java similarity index 87% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JInternalFrameHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JInternalFrameHandler.java index a966f28..7b2694d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JInternalFrameHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JInternalFrameHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import javax.swing.JInternalFrame; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JListHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JListHandler.java similarity index 86% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JListHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JListHandler.java index 17e17bd..fbc4779 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JListHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JListHandler.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JMenuHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JMenuHandler.java similarity index 84% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JMenuHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JMenuHandler.java index d657b67..5a64b3b 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JMenuHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JMenuHandler.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import javax.swing.JMenu; import javax.swing.event.MenuListener; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPasswordFieldHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPasswordFieldHandler.java similarity index 88% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPasswordFieldHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPasswordFieldHandler.java index 91dc4da..3b42edd 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPasswordFieldHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPasswordFieldHandler.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import javax.swing.JPasswordField; import javax.swing.event.DocumentListener; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPopupMenuHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPopupMenuHandler.java similarity index 80% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPopupMenuHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPopupMenuHandler.java index d472d77..cd3c363 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JPopupMenuHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JPopupMenuHandler.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import javax.swing.JPopupMenu; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JProgressBarHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JProgressBarHandler.java similarity index 85% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JProgressBarHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JProgressBarHandler.java index a4d8dad..41caad3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JProgressBarHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JProgressBarHandler.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import javax.swing.JProgressBar; import javax.swing.event.ChangeListener; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JRadioButtonHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java similarity index 90% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JRadioButtonHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java index 89c148f..851df2f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JRadioButtonHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.JAXXButtonGroup; import javax.swing.AbstractButton; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JScrollPaneHandler.java similarity index 89% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JScrollPaneHandler.java index 1469ced..2d2155a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JScrollPaneHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JScrollPaneHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.apache.commons.lang3.StringUtils; import javax.swing.JScrollPane; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSliderHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSliderHandler.java similarity index 84% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSliderHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSliderHandler.java index 5d38db4..9b0ab2a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSliderHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSliderHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSpinnerHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSpinnerHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java index 32d0317..e87fea8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSpinnerHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSpinnerHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import javax.swing.JSpinner; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSplitPaneHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSplitPaneHandler.java similarity index 90% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSplitPaneHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSplitPaneHandler.java index 7a60aa2..2d414df 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JSplitPaneHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JSplitPaneHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import javax.swing.JSplitPane; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java index cb502c0..d461e33 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.I18nHelper; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.TabInfo; import jaxx.runtime.swing.TabInfoPropertyChangeListener; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTextComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTextComponentHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java index a9d88bf..2de9d21 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTextComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import jaxx.runtime.SwingUtil; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JToolBarHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JToolBarHandler.java similarity index 89% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JToolBarHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JToolBarHandler.java index b4152a2..a9c2cff 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JToolBarHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JToolBarHandler.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import javax.swing.JToolBar; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTreeHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTreeHandler.java similarity index 86% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTreeHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTreeHandler.java index 3e08f7d..08080b8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTreeHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTreeHandler.java @@ -20,13 +20,13 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JWindowHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JWindowHandler.java similarity index 87% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JWindowHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JWindowHandler.java index 5d68583..183b80d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JWindowHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JWindowHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.w3c.dom.Element; import javax.swing.JDialog; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JXLayerHandler.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JXLayerHandler.java index aa7c6ca..5a063c9 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JXLayerHandler.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.jxlayer.JXLayer; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/RowHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/RowHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java index 58ddacc..66214f3 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/RowHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java @@ -20,12 +20,12 @@ * #L% */ -package jaxx.compiler.tags.swing; +package org.nuiton.jaxx.compiler.tags.swing; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.TagHandler; import jaxx.runtime.swing.Table; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java index a3829f0..8440043 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TabHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.I18nHelper; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.TabInfo; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Attr; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java index 5353a38..8f968f7 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/TableHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java @@ -20,16 +20,16 @@ * #L% */ -package jaxx.compiler.tags.swing; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.UnsupportedAttributeException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultComponentHandler; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tags.swing; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.UnsupportedAttributeException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultComponentHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import jaxx.runtime.swing.Table; import java.awt.GridBagConstraints; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java index c2e506a..22599b2 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/BeanValidatorHandler.java @@ -20,20 +20,20 @@ * #L% */ -package jaxx.compiler.tags.validator; +package org.nuiton.jaxx.compiler.tags.validator; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.beans.JAXXBeanInfo; -import jaxx.compiler.beans.JAXXPropertyDescriptor; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.types.TypeManager; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.beans.JAXXBeanInfo; +import org.nuiton.jaxx.compiler.beans.JAXXPropertyDescriptor; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.jaxx.validator.swing.ui.AbstractBeanValidatorUI; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java index 3d56050..a5becfb 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags.validator; +package org.nuiton.jaxx.compiler.tags.validator; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java similarity index 91% rename from jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java index 0a8f3c5..3960847 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/validator/FieldValidatorHandler.java @@ -20,15 +20,15 @@ * #L% */ -package jaxx.compiler.tags.validator; - -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tags.TagHandler; -import jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; +package org.nuiton.jaxx.compiler.tags.validator; + +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tags.TagHandler; +import org.nuiton.jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileFirstPassTask.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileFirstPassTask.java index a16a91b..2bf96d8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileFirstPassTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileFirstPassTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileSecondPassTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileSecondPassTask.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileSecondPassTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileSecondPassTask.java index 5730d3d..441a056 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/CompileSecondPassTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/CompileSecondPassTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/FinalizeTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/FinalizeTask.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/FinalizeTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/FinalizeTask.java index a36fe42..8c4c508 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/FinalizeTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/FinalizeTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java index 56fbdd5..54aed33 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java @@ -19,22 +19,22 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; - -import jaxx.compiler.CompiledObject; -import jaxx.compiler.CompilerException; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.finalizers.DefaultFinalizer; -import jaxx.compiler.java.JavaArgument; -import jaxx.compiler.java.JavaConstructor; -import jaxx.compiler.java.JavaElementFactory; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.TagManager; +package org.nuiton.jaxx.compiler.tasks; + +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.finalizers.DefaultFinalizer; +import org.nuiton.jaxx.compiler.java.JavaArgument; +import org.nuiton.jaxx.compiler.java.JavaConstructor; +import org.nuiton.jaxx.compiler.java.JavaElementFactory; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.TagManager; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java index dd28682..911dd90 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateMissingRulesTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateMissingRulesTask.java @@ -19,12 +19,12 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateTask.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateTask.java index a9d7d6f..e99c9f5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateTask.java @@ -19,15 +19,15 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; - -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.java.JavaArgument; -import jaxx.compiler.java.JavaConstructor; -import jaxx.compiler.java.JavaFile; -import jaxx.compiler.java.JavaFileGenerator; +package org.nuiton.jaxx.compiler.tasks; + +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.java.JavaArgument; +import org.nuiton.jaxx.compiler.java.JavaConstructor; +import org.nuiton.jaxx.compiler.java.JavaFile; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.java.extension.ImportsManager; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/InitTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/InitTask.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/InitTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/InitTask.java index 4970b3b..715974d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/InitTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/InitTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.CompilerConfiguration; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.CompilerConfiguration; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/JAXXEngineTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/JAXXEngineTask.java similarity index 93% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/JAXXEngineTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/JAXXEngineTask.java index a8a486a..8eaf3ec 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/JAXXEngineTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/JAXXEngineTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; /** * Base class to implement a task to be launched by a {@link JAXXEngine}. diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/ProfileTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/ProfileTask.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/ProfileTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/ProfileTask.java index 112b4b5..9ae465d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/ProfileTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/ProfileTask.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/StyleSheetTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/StyleSheetTask.java similarity index 92% rename from jaxx-compiler/src/main/java/jaxx/compiler/tasks/StyleSheetTask.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/StyleSheetTask.java index b5e500f..80ceb07 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tasks/StyleSheetTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/StyleSheetTask.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.tasks; +package org.nuiton.jaxx.compiler.tasks; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/PrintTagInfo.java similarity index 90% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/PrintTagInfo.java index 48870bf..cd0ee9f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/PrintTagInfo.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/PrintTagInfo.java @@ -20,17 +20,17 @@ * #L% */ -package jaxx.compiler.tools; +package org.nuiton.jaxx.compiler.tools; -import jaxx.compiler.DefaultCompilerConfiguration; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.beans.JAXXPropertyDescriptor; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.tags.DefaultObjectHandler; -import jaxx.compiler.tags.TagManager; +import org.nuiton.jaxx.compiler.DefaultCompilerConfiguration; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.beans.JAXXPropertyDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.tags.DefaultObjectHandler; +import org.nuiton.jaxx.compiler.tags.TagManager; import org.apache.commons.lang3.StringUtils; import java.io.BufferedWriter; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java index feedd6c..754288f 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/AbstractContextNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; import java.util.ArrayList; import java.util.List; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java index cafb7a9..e817221 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/CapturedObject.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/CapturedObject.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; import java.awt.Component; import java.util.HashMap; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ContextNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ContextNode.java similarity index 94% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ContextNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ContextNode.java index cd2d039..d6d0308 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ContextNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ContextNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; public interface ContextNode { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java index 4aeeb12..caae67d 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java @@ -20,17 +20,17 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; - -import jaxx.compiler.ClassMap; -import jaxx.compiler.CompiledObject; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.tools.jaxxcapture.handlers.JTabbedPaneHandler; -import jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; -import jaxx.compiler.tools.jaxxcapture.handlers.TableHandler; -import jaxx.compiler.types.TypeManager; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; + +import org.nuiton.jaxx.compiler.ClassMap; +import org.nuiton.jaxx.compiler.CompiledObject; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers.JTabbedPaneHandler; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers.ObjectHandler; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers.TableHandler; +import org.nuiton.jaxx.compiler.types.TypeManager; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/LiteralNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/LiteralNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java index da582c6..eff19fa 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/LiteralNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/LiteralNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class LiteralNode extends AbstractContextNode { private String javaCode; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/MethodNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/MethodNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java index d9173cf..b028ba5 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/MethodNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/MethodNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class MethodNode extends AbstractContextNode { private String methodName; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/PropertyNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/PropertyNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java index 2ac611a..6cfbeba 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/PropertyNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/PropertyNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class PropertyNode extends AbstractContextNode { private String property; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ValueNode.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ValueNode.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java index eaeee35..0213e1c 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/ValueNode.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/ValueNode.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture; +package org.nuiton.jaxx.compiler.tools.jaxxcapture; public class ValueNode extends AbstractContextNode { private Object value; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java similarity index 85% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java index 1181737..ef95f8a 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/JTabbedPaneHandler.java @@ -20,11 +20,11 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture.handlers; +package org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers; -import jaxx.compiler.tools.jaxxcapture.ContextNode; -import jaxx.compiler.tools.jaxxcapture.JAXXCapture; -import jaxx.compiler.tools.jaxxcapture.MethodNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.ContextNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.JAXXCapture; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.MethodNode; import org.w3c.dom.Element; import java.util.Arrays; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java similarity index 95% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java index 4569c9b..d7e2db1 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/ObjectHandler.java @@ -20,18 +20,18 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture.handlers; - -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.java.JavaFileGenerator; -import jaxx.compiler.tools.jaxxcapture.CapturedObject; -import jaxx.compiler.tools.jaxxcapture.ContextNode; -import jaxx.compiler.tools.jaxxcapture.JAXXCapture; -import jaxx.compiler.tools.jaxxcapture.LiteralNode; -import jaxx.compiler.tools.jaxxcapture.MethodNode; -import jaxx.compiler.tools.jaxxcapture.PropertyNode; -import jaxx.compiler.tools.jaxxcapture.ValueNode; +package org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers; + +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.java.JavaFileGenerator; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.CapturedObject; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.ContextNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.JAXXCapture; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.LiteralNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.MethodNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.PropertyNode; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.ValueNode; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java similarity index 85% rename from jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java index a66f8be..0c28827 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/handlers/TableHandler.java @@ -20,10 +20,10 @@ * #L% */ -package jaxx.compiler.tools.jaxxcapture.handlers; +package org.nuiton.jaxx.compiler.tools.jaxxcapture.handlers; -import jaxx.compiler.tools.jaxxcapture.CapturedObject; -import jaxx.compiler.tools.jaxxcapture.JAXXCapture; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.CapturedObject; +import org.nuiton.jaxx.compiler.tools.jaxxcapture.JAXXCapture; public class TableHandler extends ObjectHandler { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/ColorConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/ColorConverter.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/ColorConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/ColorConverter.java index ad1d8c6..c566e02 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/ColorConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/ColorConverter.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import java.awt.Color; import java.lang.reflect.Field; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/GridBagConstraintsConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/GridBagConstraintsConverter.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/GridBagConstraintsConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/GridBagConstraintsConverter.java index 69d6d94..edebd44 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/GridBagConstraintsConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/GridBagConstraintsConverter.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import java.awt.GridBagConstraints; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/InsetsConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/InsetsConverter.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/InsetsConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/InsetsConverter.java index b7120bc..d9f1d95 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/InsetsConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/InsetsConverter.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import java.awt.Insets; import java.util.StringTokenizer; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/KeyStrokeConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/KeyStrokeConverter.java similarity index 97% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/KeyStrokeConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/KeyStrokeConverter.java index 704db81..27a1c3e 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/KeyStrokeConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/KeyStrokeConverter.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import javax.swing.KeyStroke; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/PrimitiveConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/PrimitiveConverter.java similarity index 98% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/PrimitiveConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/PrimitiveConverter.java index e550058..fabe605 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/PrimitiveConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/PrimitiveConverter.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompiler; public class PrimitiveConverter implements TypeConverter { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeConverter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeConverter.java similarity index 96% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/TypeConverter.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeConverter.java index 92c6a94..2851a05 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeConverter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeConverter.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; public interface TypeConverter { diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeManager.java similarity index 99% rename from jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java rename to jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeManager.java index 88e889c..aa93aec 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/types/TypeManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/types/TypeManager.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import java.util.HashMap; import java.util.Map; diff --git a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.CompiledObjectDecorator b/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.CompiledObjectDecorator deleted file mode 100644 index 55f046a..0000000 --- a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.CompiledObjectDecorator +++ /dev/null @@ -1,3 +0,0 @@ -jaxx.compiler.decorators.DefaultCompiledObjectDecorator -jaxx.compiler.decorators.BoxedCompiledObjectDecorator -jaxx.compiler.decorators.HelpRootCompiledObjectDecorator diff --git a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.JAXXCompilerFinalizer b/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.JAXXCompilerFinalizer deleted file mode 100644 index abb8df4..0000000 --- a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.JAXXCompilerFinalizer +++ /dev/null @@ -1,3 +0,0 @@ -jaxx.compiler.finalizers.DefaultFinalizer -jaxx.compiler.finalizers.SwingFinalizer -jaxx.compiler.finalizers.ValidatorFinalizer diff --git a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.spi.Initializer b/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.spi.Initializer deleted file mode 100644 index 763ca46..0000000 --- a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.spi.Initializer +++ /dev/null @@ -1 +0,0 @@ -jaxx.compiler.spi.DefaultInitializer \ No newline at end of file diff --git a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.types.TypeConverter b/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.types.TypeConverter deleted file mode 100644 index 440367e..0000000 --- a/jaxx-compiler/src/main/resources/META-INF/services/jaxx.compiler.types.TypeConverter +++ /dev/null @@ -1,5 +0,0 @@ -jaxx.compiler.types.ColorConverter -jaxx.compiler.types.GridBagConstraintsConverter -jaxx.compiler.types.InsetsConverter -jaxx.compiler.types.KeyStrokeConverter -jaxx.compiler.types.PrimitiveConverter diff --git a/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.CompiledObjectDecorator b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.CompiledObjectDecorator new file mode 100644 index 0000000..8f372c3 --- /dev/null +++ b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.CompiledObjectDecorator @@ -0,0 +1,3 @@ +org.nuiton.jaxx.compiler.decorators.DefaultCompiledObjectDecorator +org.nuiton.jaxx.compiler.decorators.BoxedCompiledObjectDecorator +org.nuiton.jaxx.compiler.decorators.HelpRootCompiledObjectDecorator diff --git a/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer new file mode 100644 index 0000000..1359878 --- /dev/null +++ b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer @@ -0,0 +1,3 @@ +org.nuiton.jaxx.compiler.finalizers.DefaultFinalizer +org.nuiton.jaxx.compiler.finalizers.SwingFinalizer +org.nuiton.jaxx.compiler.finalizers.ValidatorFinalizer diff --git a/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.spi.Initializer b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.spi.Initializer new file mode 100644 index 0000000..669f777 --- /dev/null +++ b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.spi.Initializer @@ -0,0 +1 @@ +org.nuiton.jaxx.compiler.spi.DefaultInitializer \ No newline at end of file diff --git a/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.types.TypeConverter b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.types.TypeConverter new file mode 100644 index 0000000..4d3009a --- /dev/null +++ b/jaxx-compiler/src/main/resources/META-INF/services/org.nuiton.jaxx.compiler.types.TypeConverter @@ -0,0 +1,5 @@ +org.nuiton.jaxx.compiler.types.ColorConverter +org.nuiton.jaxx.compiler.types.GridBagConstraintsConverter +org.nuiton.jaxx.compiler.types.InsetsConverter +org.nuiton.jaxx.compiler.types.KeyStrokeConverter +org.nuiton.jaxx.compiler.types.PrimitiveConverter diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/beans/BeanIntoUtilTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java similarity index 97% rename from jaxx-compiler/src/test/java/jaxx/compiler/beans/BeanIntoUtilTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java index a33f606..35d6fb8 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/beans/BeanIntoUtilTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.beans; +package org.nuiton.jaxx.compiler.beans; import org.junit.Assert; import org.junit.Test; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java similarity index 98% rename from jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java index 4e596f0..b29bd25 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/binding/JavaParserUtilTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/binding/JavaParserUtilTest.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.binding; +package org.nuiton.jaxx.compiler.binding; -import jaxx.compiler.java.parser.JavaParser; -import jaxx.compiler.java.parser.SimpleNode; +import org.nuiton.jaxx.compiler.java.parser.JavaParser; +import org.nuiton.jaxx.compiler.java.parser.SimpleNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaFieldTest.java similarity index 99% rename from jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaFieldTest.java index 2cf92f4..67fab45 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaFieldTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaFieldTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaMethodTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaMethodTest.java similarity index 97% rename from jaxx-compiler/src/test/java/jaxx/compiler/java/JavaMethodTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaMethodTest.java index 60801bb..bc12f03 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/java/JavaMethodTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/JavaMethodTest.java @@ -20,9 +20,9 @@ * #L% */ -package jaxx.compiler.java; +package org.nuiton.jaxx.compiler.java; -import jaxx.compiler.java.JavaMethod.MethodOrder; +import org.nuiton.jaxx.compiler.java.JavaMethod.MethodOrder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTest.java similarity index 93% rename from jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTest.java index 429e255..dd41a35 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/java/parser/JavaParserTest.java @@ -1,4 +1,4 @@ -package jaxx.compiler.java.parser; +package org.nuiton.jaxx.compiler.java.parser; /* * #%L @@ -22,10 +22,10 @@ package jaxx.compiler.java.parser; * #L% */ -import jaxx.compiler.CompilerException; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.MethodDescriptor; -import jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile; +import org.nuiton.jaxx.compiler.CompilerException; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.MethodDescriptor; +import org.nuiton.jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.FileUtil; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorTest.java similarity index 99% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorTest.java index 00e3794..47aa4a8 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/ClassDescriptorTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorTest.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyAbstractClass.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyAbstractClass.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyAbstractClass.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyAbstractClass.java index 4e7c82e..6858255 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyAbstractClass.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyAbstractClass.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * To test parser on abstract class file. diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass.java index 7d5fcac..2101e33 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * A child class to test the bug https://forge.nuiton.org/issues/show/1470 diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass2.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass2.java index 61fad5f..2f37353 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyChildClass2.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyChildClass2.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * To test the bug : https://forge.nuiton.org/issues/show/1442 diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyClass.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyClass.java similarity index 97% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyClass.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyClass.java index 8f900ea..d9fd8a5 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyClass.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyClass.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import java.io.Serializable; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyEnum.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyEnum.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyEnum.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyEnum.java index a625e5b..90c414d 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyEnum.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyEnum.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import java.io.Serializable; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface.java index 11e198d..4254a73 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; /** * Simple interface to test. diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface2.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface2.java index 09248e9..c1c5430 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface2.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface2.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import org.nuiton.config.ConfigOptionDef; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface3.java similarity index 96% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface3.java index d84ea50..a98eadd 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/MyInterface3.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/MyInterface3.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect; +package org.nuiton.jaxx.compiler.reflect; import org.nuiton.config.ConfigOptionDef; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java similarity index 95% rename from jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java index 506fa21..c6c9ee7 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFileTest.java @@ -19,19 +19,19 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.reflect.resolvers; - -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; -import jaxx.compiler.reflect.FieldDescriptor; -import jaxx.compiler.reflect.MyAbstractClass; -import jaxx.compiler.reflect.MyChildClass; -import jaxx.compiler.reflect.MyChildClass2; -import jaxx.compiler.reflect.MyClass; -import jaxx.compiler.reflect.MyEnum; -import jaxx.compiler.reflect.MyInterface; -import jaxx.compiler.reflect.MyInterface2; -import jaxx.compiler.reflect.MyInterface3; +package org.nuiton.jaxx.compiler.reflect.resolvers; + +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; +import org.nuiton.jaxx.compiler.reflect.FieldDescriptor; +import org.nuiton.jaxx.compiler.reflect.MyAbstractClass; +import org.nuiton.jaxx.compiler.reflect.MyChildClass; +import org.nuiton.jaxx.compiler.reflect.MyChildClass2; +import org.nuiton.jaxx.compiler.reflect.MyClass; +import org.nuiton.jaxx.compiler.reflect.MyEnum; +import org.nuiton.jaxx.compiler.reflect.MyInterface; +import org.nuiton.jaxx.compiler.reflect.MyInterface2; +import org.nuiton.jaxx.compiler.reflect.MyInterface3; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/tags/TagManagerTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java similarity index 95% rename from jaxx-compiler/src/test/java/jaxx/compiler/tags/TagManagerTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java index c01c7f2..952a539 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/tags/TagManagerTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java @@ -20,14 +20,14 @@ * #L% */ -package jaxx.compiler.tags; - -import jaxx.compiler.CompilerConfiguration; -import jaxx.compiler.DefaultCompilerConfiguration; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.reflect.ClassDescriptor; -import jaxx.compiler.reflect.ClassDescriptorHelper; +package org.nuiton.jaxx.compiler.tags; + +import org.nuiton.jaxx.compiler.CompilerConfiguration; +import org.nuiton.jaxx.compiler.DefaultCompilerConfiguration; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptor; +import org.nuiton.jaxx.compiler.reflect.ClassDescriptorHelper; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/types/ColorConverterTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/ColorConverterTest.java similarity index 98% rename from jaxx-compiler/src/test/java/jaxx/compiler/types/ColorConverterTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/ColorConverterTest.java index 75377d4..420cc58 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/types/ColorConverterTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/ColorConverterTest.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import org.junit.Assert; import org.junit.Before; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/types/InsetsConverterTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/InsetsConverterTest.java similarity index 98% rename from jaxx-compiler/src/test/java/jaxx/compiler/types/InsetsConverterTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/InsetsConverterTest.java index 2fdcb71..836fcd5 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/types/InsetsConverterTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/InsetsConverterTest.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import org.junit.Assert; import org.junit.Before; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/types/PrimitiveConverterTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/PrimitiveConverterTest.java similarity index 98% rename from jaxx-compiler/src/test/java/jaxx/compiler/types/PrimitiveConverterTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/PrimitiveConverterTest.java index 1f01b05..c009965 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/types/PrimitiveConverterTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/PrimitiveConverterTest.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import org.junit.Assert; import org.junit.Before; diff --git a/jaxx-compiler/src/test/java/jaxx/compiler/types/TypeManagerTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/TypeManagerTest.java similarity index 98% rename from jaxx-compiler/src/test/java/jaxx/compiler/types/TypeManagerTest.java rename to jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/TypeManagerTest.java index 9282456..84ec2c0 100644 --- a/jaxx-compiler/src/test/java/jaxx/compiler/types/TypeManagerTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/types/TypeManagerTest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.compiler.types; +package org.nuiton.jaxx.compiler.types; import org.junit.Assert; import org.junit.Test; diff --git a/jaxx-compiler/src/test/resources/log4j.properties b/jaxx-compiler/src/test/resources/log4j.properties index b049741..384fb94 100644 --- a/jaxx-compiler/src/test/resources/log4j.properties +++ b/jaxx-compiler/src/test/resources/log4j.properties @@ -26,4 +26,4 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.logger.jaxx=INFO +log4j.logger.org.nuiton.jaxx=INFO diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java index 4f71664..3c12297 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.plugin; import com.google.common.base.Charsets; import com.google.common.io.Closeables; import com.google.common.io.Files; -import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; +import org.nuiton.jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; diff --git a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java index c21c27b..98fd8c0 100644 --- a/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java +++ b/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java @@ -22,17 +22,17 @@ package org.nuiton.jaxx.plugin; -import jaxx.compiler.CompiledObjectDecorator; -import jaxx.compiler.CompilerConfiguration; -import jaxx.compiler.I18nHelper; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.JAXXFactory; -import jaxx.compiler.beans.BeanInfoUtil; -import jaxx.compiler.binding.DataBindingHelper; -import jaxx.compiler.finalizers.JAXXCompilerFinalizer; -import jaxx.compiler.spi.DefaultInitializer; -import jaxx.compiler.spi.Initializer; +import org.nuiton.jaxx.compiler.CompiledObjectDecorator; +import org.nuiton.jaxx.compiler.CompilerConfiguration; +import org.nuiton.jaxx.compiler.I18nHelper; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.JAXXFactory; +import org.nuiton.jaxx.compiler.beans.BeanInfoUtil; +import org.nuiton.jaxx.compiler.binding.DataBindingHelper; +import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; +import org.nuiton.jaxx.compiler.spi.DefaultInitializer; +import org.nuiton.jaxx.compiler.spi.Initializer; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.spi.UIHandler; @@ -96,7 +96,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat /** * FQN of compiler to use (by default swing one). */ - @Parameter(property = "jaxx.compilerFQN", defaultValue = "jaxx.compiler.JAXXCompiler", required = true) + @Parameter(property = "jaxx.compilerFQN", defaultValue = "org.nuiton.jaxx.compiler.JAXXCompiler", required = true) protected String compilerFQN; /** @@ -122,7 +122,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat * * @see CompiledObjectDecorator */ - @Parameter(property = "jaxx.defaultDecoratorFQN", defaultValue = "jaxx.compiler.decorators.DefaultCompiledObjectDecorator") + @Parameter(property = "jaxx.defaultDecoratorFQN", defaultValue = "org.nuiton.jaxx.compiler.decorators.DefaultCompiledObjectDecorator") protected String defaultDecoratorFQN; /** diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java index 9277367..8bc4b91 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1124Test.java @@ -21,7 +21,6 @@ */ package org.nuiton.jaxx.plugin; -import jaxx.compiler.I18nHelper; import jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java index 62f307f..d860b8d 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1750Test.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.plugin; import jaxx.runtime.Base64Coder; -import jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompiler; import jaxx.runtime.JAXXObjectDescriptor; import jaxx.runtime.JAXXUtil; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java index 5218d42..5e5ea3e 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java @@ -22,10 +22,10 @@ package org.nuiton.jaxx.plugin; -import jaxx.compiler.JAXXCompiler; -import jaxx.compiler.JAXXCompilerFile; -import jaxx.compiler.JAXXEngine; -import jaxx.compiler.decorators.DefaultCompiledObjectDecorator; +import org.nuiton.jaxx.compiler.JAXXCompiler; +import org.nuiton.jaxx.compiler.JAXXCompilerFile; +import org.nuiton.jaxx.compiler.JAXXEngine; +import org.nuiton.jaxx.compiler.decorators.DefaultCompiledObjectDecorator; import jaxx.runtime.context.DefaultJAXXContext; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.io.FileUtils; diff --git a/jaxx-maven-plugin/src/test/resources/log4j.properties b/jaxx-maven-plugin/src/test/resources/log4j.properties index f17426c..b48ebf0 100644 --- a/jaxx-maven-plugin/src/test/resources/log4j.properties +++ b/jaxx-maven-plugin/src/test/resources/log4j.properties @@ -29,4 +29,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n log4j.logger.org.nuiton.plugin.AbstractMojoTest=INFO log4j.logger.org.nuiton.jaxx=INFO log4j.logger.jaxx.compiler=INFO -#log4j.logger.jaxx.compiler.binding=DEBUG +#log4j.logger.org.nuiton.jaxx.compiler.binding=DEBUG -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.