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>.

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 1ddc6ecb9462ef673a693289dc0c6e66482925d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 30 10:08:59 2016 +0100 Rename runtime package to org.nuiton.jaxx.runtime (See #3669) --- .../swing/AbstractApplicationUIHandler.java | 32 +- .../jaxx/application/swing/ApplicationUI.java | 2 +- .../swing/action/ApplicationActionUI.jaxx | 2 +- .../swing/action/ApplicationActionUIHandler.java | 2 +- .../jaxx/application/swing/tab/CustomTab.java | 2 +- .../swing/table/AbstractApplicationTableModel.java | 2 +- .../swing/util/ApplicationExceptionHandler.java | 2 +- .../application/swing/util/ApplicationUIUtil.java | 4 +- .../org/nuiton/jaxx/compiler/CompiledObject.java | 2 +- .../jaxx/compiler/CompilerConfiguration.java | 4 +- .../compiler/DefaultCompilerConfiguration.java | 6 +- .../java/org/nuiton/jaxx/compiler/I18nHelper.java | 2 +- .../org/nuiton/jaxx/compiler/JAXXCompiler.java | 12 +- .../java/org/nuiton/jaxx/compiler/JAXXEngine.java | 4 +- .../nuiton/jaxx/compiler/binding/DataSource.java | 2 +- .../binding/writers/AbstractJAXXBindingWriter.java | 2 +- .../binding/writers/DefaultJAXXBindingWriter.java | 2 +- .../binding/writers/JAXXBindingWriter.java | 2 +- .../writers/SimpleJAXXObjectBindingWriter.java | 2 +- .../nuiton/jaxx/compiler/css/StylesheetHelper.java | 10 +- .../decorators/BoxedCompiledObjectDecorator.java | 2 +- .../HelpRootCompiledObjectDecorator.java | 2 +- .../jaxx/compiler/reflect/ClassDescriptor.java | 2 +- .../compiler/reflect/ClassDescriptorHelper.java | 4 +- .../ClassDescriptorResolverFromJavaClass.java | 2 +- .../ClassDescriptorResolverFromJavaFile.java | 2 +- .../ClassDescriptorResolverFromJaxxFile.java | 4 +- .../jaxx/compiler/spi/DefaultInitializer.java | 34 +- .../compiler/tags/DefaultComponentHandler.java | 2 +- .../jaxx/compiler/tags/DefaultObjectHandler.java | 10 +- .../nuiton/jaxx/compiler/tags/StyleHandler.java | 2 +- .../org/nuiton/jaxx/compiler/tags/TagManager.java | 2 +- .../compiler/tags/swing/ApplicationHandler.java | 2 +- .../compiler/tags/swing/CompiledItemContainer.java | 2 +- .../jaxx/compiler/tags/swing/ItemHandler.java | 2 +- .../compiler/tags/swing/JAXXComboBoxHandler.java | 6 +- .../jaxx/compiler/tags/swing/JAXXListHandler.java | 6 +- .../jaxx/compiler/tags/swing/JAXXTreeHandler.java | 6 +- .../compiler/tags/swing/JRadioButtonHandler.java | 2 +- .../compiler/tags/swing/JTabbedPaneHandler.java | 4 +- .../compiler/tags/swing/JTextComponentHandler.java | 2 +- .../jaxx/compiler/tags/swing/RowHandler.java | 2 +- .../jaxx/compiler/tags/swing/TabHandler.java | 2 +- .../jaxx/compiler/tags/swing/TableHandler.java | 2 +- .../compiler/tasks/GenerateConstructorsTask.java | 4 +- .../compiler/tools/jaxxcapture/JAXXCapture.java | 2 +- .../jaxx/compiler/beans/BeanIntoUtilTest.java | 2 +- .../nuiton/jaxx/compiler/tags/TagManagerTest.java | 4 +- .../jaxx/config/ConfigCallBackUIHandler.java | 2 +- .../jaxx/config/ConfigCategoryUIHandler.java | 8 +- .../org/nuiton/jaxx/config/ConfigTableEditor.java | 12 +- .../org/nuiton/jaxx/config/ConfigUIHandler.java | 6 +- .../org/nuiton/jaxx/config/ConfigUIHelper.java | 4 +- .../nuiton/jaxx/config/model/CategoryModel.java | 2 +- .../nuiton/jaxx/config/model/ConfigUIModel.java | 2 +- .../jaxx/config/model/MyDelegateConfigTest.java | 4 +- .../jaxx/config/model/MyInheritedConfigTest.java | 4 +- .../nuiton/jaxx/demo/DemoApplicationContext.java | 12 +- .../main/java/org/nuiton/jaxx/demo/DemoConfig.java | 2 +- .../java/org/nuiton/jaxx/demo/DemoHelpBroker.java | 16 +- .../java/org/nuiton/jaxx/demo/DemoSources.jaxx | 4 +- .../org/nuiton/jaxx/demo/DemoSourcesHandler.java | 8 +- .../src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx | 6 +- .../java/org/nuiton/jaxx/demo/DemoUIHandler.java | 20 +- .../main/java/org/nuiton/jaxx/demo/RunDemo.java | 6 +- .../demo/component/jaxx/BoxedDecoratorDemo.jaxx | 6 +- .../component/jaxx/StatusMessagePanelDemo.jaxx | 3 +- .../component/jaxx/editor/BeanComboBoxDemo.jaxx | 2 +- .../jaxx/editor/BeanComboBoxDemoHandler.java | 2 +- .../component/jaxx/editor/BeanDoubleListDemo.jaxx | 2 +- .../jaxx/editor/BeanDoubleListDemoHandler.java | 2 +- .../jaxx/editor/BeanFilterableComboBoxDemo.jaxx | 2 +- .../editor/BeanFilterableComboBoxDemoHandler.java | 2 +- .../demo/component/jaxx/editor/FileEditorDemo.jaxx | 2 +- .../demo/component/jaxx/editor/I18nEditorDemo.jaxx | 2 +- .../component/jaxx/editor/ListSelectorDemo.jaxx | 6 +- .../component/jaxx/editor/NumberEditorDemo.jaxx | 4 +- .../jaxx/editor/SimpleTimeEditorDemo.jaxx | 2 +- .../jaxx/editor/SimpleTimeEditorDemoHandler.java | 2 +- .../jaxx/editor/SimpleTimeEditorDemoModel.java | 2 +- .../demo/component/jaxx/editor/TimeEditorDemo.jaxx | 4 +- .../component/jaxx/editor/TimeEditorDemoModel.java | 2 +- .../component/jaxx/editor/gis/CoordinateDemo.jaxx | 10 +- .../jaxx/editor/gis/CoordinateDemoHandler.java | 6 +- .../datetime/DateTimeEditorDemoHandler.java | 2 +- .../widgets/datetime/TimeEditorDemoHandler.java | 2 +- .../widgets/gis/CoordinatesEditorDemoHandler.java | 2 +- .../widgets/number/NumberEditorDemoHandler.java | 2 +- .../select/FilterableDoubleListDemoHandler.java | 2 +- .../jaxx/demo/component/swing/HidorButtonDemo.jaxx | 4 +- .../jaxx/demo/entities/DemoDataProvider.java | 2 +- .../feature/databinding/BindingExtremeDemo.jaxx | 4 +- .../jaxx/demo/feature/nav/NavDemoHandler.java | 12 +- .../demo/feature/nav/content/ActorsContentUI.jaxx | 4 +- .../demo/feature/nav/content/MoviesContentUI.jaxx | 4 +- .../feature/nav/tree/ActorsTreeNodeLoador.java | 4 +- .../feature/nav/tree/MoviesTreeNodeLoador.java | 6 +- .../feature/nav/tree/NavDemoTreeCellRenderer.java | 2 +- .../demo/feature/nav/tree/NavDemoTreeHelper.java | 2 +- .../demo/feature/nav/tree/NavDemoTreeNode.java | 4 +- .../nav/treetable/ActorsTreeTableNodeLoador.java | 4 +- .../nav/treetable/MoviesTreeTableNodeLoador.java | 6 +- .../nav/treetable/NavDemoTreeTableHelper.java | 4 +- .../nav/treetable/NavDemoTreeTableModel.java | 4 +- .../nav/treetable/NavDemoTreeTableNode.java | 4 +- .../list/ListBeanValidationDemoHandler.java | 4 +- .../feature/validation/list/PeopleTableModel.java | 2 +- .../nuiton/jaxx/demo/tree/DemoCellRenderer.java | 2 +- .../nuiton/jaxx/demo/tree/DemoDataProvider.java | 2 +- .../java/org/nuiton/jaxx/demo/tree/DemoNode.java | 2 +- .../org/nuiton/jaxx/demo/tree/DemoNodeLoador.java | 6 +- .../org/nuiton/jaxx/demo/tree/DemoTreeHelper.java | 2 +- .../java/org/nuiton/jaxx/plugin/GenerateMojo.java | 12 +- .../java/org/nuiton/jaxx/plugin/Bug1124Test.java | 2 +- .../java/org/nuiton/jaxx/plugin/Bug1404Test.java | 4 +- .../java/org/nuiton/jaxx/plugin/Bug1750Test.java | 6 +- .../java/org/nuiton/jaxx/plugin/CompilerTest.java | 2 +- .../java/org/nuiton/jaxx/plugin/JaxxBaseTest.java | 2 +- .../jaxx/plugin/lambdaTest/LambdaHandler.java | 4 +- .../main/java/jaxx/runtime/FileChooserUtil.java | 359 ---------- .../jaxx/runtime/swing/session/JTableState.java | 155 ----- .../{ => org/nuiton}/jaxx/runtime/Base64Coder.java | 2 +- .../nuiton}/jaxx/runtime/ComponentDescriptor.java | 2 +- .../nuiton}/jaxx/runtime/DataBindingListener.java | 2 +- .../jaxx/runtime/DataBindingUpdateListener.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/JAXXAction.java | 4 +- .../{ => org/nuiton}/jaxx/runtime/JAXXBinding.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/JAXXContext.java | 4 +- .../{ => org/nuiton}/jaxx/runtime/JAXXObject.java | 2 +- .../nuiton}/jaxx/runtime/JAXXObjectDescriptor.java | 4 +- .../{ => org/nuiton}/jaxx/runtime/JAXXUtil.java | 6 +- .../{ => org/nuiton}/jaxx/runtime/SwingUtil.java | 20 +- .../jaxx/runtime/awt/visitor/BuildTreeVisitor.java | 2 +- .../runtime/awt/visitor/ComponentTreeNode.java | 2 +- .../awt/visitor/ComponentTreeNodeVisitor.java | 2 +- .../awt/visitor/DebugComponentTreeNodeVisitor.java | 2 +- .../awt/visitor/GetCompopentAtPointVisitor.java | 2 +- .../nuiton}/jaxx/runtime/awt/visitor/package.html | 0 .../nuiton}/jaxx/runtime/bean/BeanTypeAware.java | 2 +- .../jaxx/runtime/binding/DefaultJAXXBinding.java | 8 +- .../runtime/binding/SimpleJAXXObjectBinding.java | 4 +- .../nuiton}/jaxx/runtime/context/DataContext.java | 6 +- .../runtime/context/DefaultApplicationContext.java | 4 +- .../jaxx/runtime/context/DefaultJAXXContext.java | 8 +- .../jaxx/runtime/context/JAXXContextEntryDef.java | 4 +- .../jaxx/runtime/context/JAXXInitialContext.java | 6 +- .../nuiton}/jaxx/runtime/css/DataBinding.java | 2 +- .../nuiton}/jaxx/runtime/css/Pseudoclasses.java | 4 +- .../{ => org/nuiton}/jaxx/runtime/css/Rule.java | 2 +- .../nuiton}/jaxx/runtime/css/Selector.java | 2 +- .../nuiton}/jaxx/runtime/css/Stylesheet.java | 2 +- .../nuiton}/jaxx/runtime/spi/UIHandler.java | 4 +- .../nuiton}/jaxx/runtime/swing/Application.java | 2 +- .../jaxx/runtime/swing/BlockingLayerUI.java | 2 +- .../jaxx/runtime/swing/BlockingLayerUI2.java | 2 +- .../nuiton}/jaxx/runtime/swing/CardLayout2.java | 2 +- .../nuiton}/jaxx/runtime/swing/CardLayout2Ext.java | 4 +- .../nuiton}/jaxx/runtime/swing/ComponentMover.java | 2 +- .../jaxx/runtime/swing/ComponentResizer.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/swing/GBC.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/swing/HBox.java | 2 +- .../nuiton}/jaxx/runtime/swing/HBoxBeanInfo.java | 2 +- .../nuiton}/jaxx/runtime/swing/HBoxLayout.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/swing/Item.java | 2 +- .../jaxx/runtime/swing/JAXXButtonGroup.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXComboBox.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXList.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXTab.java | 2 +- .../jaxx/runtime/swing/JAXXToggleButton.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXTree.java | 2 +- .../nuiton}/jaxx/runtime/swing/JTables.java | 2 +- .../runtime/swing/OneClicListSelectionModel.java | 2 +- .../nuiton}/jaxx/runtime/swing/Spacer.java | 2 +- .../nuiton}/jaxx/runtime/swing/TabInfo.java | 2 +- .../swing/TabInfoPropertyChangeListener.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/swing/Table.java | 2 +- .../{ => org/nuiton}/jaxx/runtime/swing/VBox.java | 2 +- .../nuiton}/jaxx/runtime/swing/VBoxBeanInfo.java | 2 +- .../nuiton}/jaxx/runtime/swing/VBoxLayout.java | 2 +- .../runtime/swing/application/ActionExecutor.java | 2 +- .../runtime/swing/application/ActionWorker.java | 2 +- .../swing/application/ApplicationRunner.java | 2 +- .../runtime/swing/editor/BooleanCellEditor.java | 2 +- .../jaxx/runtime/swing/editor/ClassCellEditor.java | 2 +- .../jaxx/runtime/swing/editor/ColorCellEditor.java | 2 +- .../jaxx/runtime/swing/editor/EnumEditor.java | 2 +- .../jaxx/runtime/swing/editor/LocaleEditor.java | 2 +- .../runtime/swing/editor/MyDefaultCellEditor.java | 2 +- .../jaxx/runtime/swing/help/JAXXHelpBroker.java | 12 +- .../jaxx/runtime/swing/help/JAXXHelpUI.java | 2 +- .../jaxx/runtime/swing/help/JAXXHelpUIHandler.java | 4 +- .../model/AbstractGenericListSelectionModel.java | 2 +- .../swing/model/AbstractSelectionListModel.java | 2 +- .../jaxx/runtime/swing/model/ComboBoxModel2.java | 2 +- .../swing/model/ComboBoxSelectionEvent.java | 2 +- .../jaxx/runtime/swing/model/GenericListEvent.java | 2 +- .../runtime/swing/model/GenericListListener.java | 2 +- .../jaxx/runtime/swing/model/GenericListModel.java | 2 +- .../swing/model/GenericListSelectionModel.java | 2 +- .../swing/model/JaxxDefaultComboBoxModel.java | 2 +- .../runtime/swing/model/JaxxDefaultListModel.java | 2 +- .../swing/model/JaxxFilterableComboBoxModel.java | 2 +- .../swing/model/JaxxFilterableListModel.java | 2 +- .../model/WillChangeSelectedItemListener.java | 2 +- .../model/WillChangeSelectedItemVetoException.java | 2 +- .../nuiton}/jaxx/runtime/swing/nav/NavBridge.java | 2 +- .../jaxx/runtime/swing/nav/NavDataProvider.java | 4 +- .../nuiton}/jaxx/runtime/swing/nav/NavHelper.java | 4 +- .../nuiton}/jaxx/runtime/swing/nav/NavNode.java | 4 +- .../jaxx/runtime/swing/nav/NavNodeChildLoador.java | 2 +- .../nuiton}/jaxx/runtime/swing/nav/package.html | 0 .../nav/tree/AbstractNavTreeCellRenderer.java | 6 +- .../jaxx/runtime/swing/nav/tree/NavTreeBridge.java | 4 +- .../jaxx/runtime/swing/nav/tree/NavTreeHelper.java | 4 +- .../jaxx/runtime/swing/nav/tree/NavTreeNode.java | 8 +- .../swing/nav/tree/NavTreeNodeChildLoador.java | 4 +- .../jaxx/runtime/swing/nav/tree/package.html | 0 .../swing/nav/treetable/NavTreeTableBridge.java | 4 +- .../swing/nav/treetable/NavTreeTableHelper.java | 6 +- .../swing/nav/treetable/NavTreeTableModel.java | 2 +- .../swing/nav/treetable/NavTreeTableNode.java | 8 +- .../nav/treetable/NavTreeTableNodeChildLoador.java | 4 +- .../jaxx/runtime/swing/nav/treetable/package.html | 0 .../swing/renderer/BooleanCellRenderer.java | 2 +- .../swing/renderer/ClassTableCellRenderer.java | 2 +- .../runtime/swing/renderer/ColorCellRenderer.java | 2 +- .../swing/renderer/DecoratorListCellRenderer.java | 2 +- .../DecoratorProviderListCellRenderer.java | 2 +- .../DecoratorProviderTableCellRenderer.java | 2 +- .../swing/renderer/DecoratorTableCellRenderer.java | 2 +- .../renderer/EmptyNumberTableCellRenderer.java | 2 +- .../runtime/swing/renderer/EnumEditorRenderer.java | 2 +- .../swing/renderer/EnumTableCellRenderer.java | 2 +- .../FilteredDecoratorListCellRenderer.java | 2 +- .../swing/renderer/I18nTableCellRenderer.java | 2 +- .../swing/renderer/LocaleListCellRenderer.java | 4 +- .../renderer/MultiDecoratorListCellRenderer.java | 2 +- .../renderer/MultiDecoratorTableCelleRenderer.java | 2 +- .../runtime/swing/session/JSplitPaneState.java | 2 +- .../runtime/swing/session/JTabbedPaneState.java | 2 +- .../swing/session/JXTableSwingSessionState.java | 2 +- .../nuiton}/jaxx/runtime/swing/session/State.java | 2 +- .../jaxx/runtime/swing/session/SwingSession.java | 2 +- .../jaxx/runtime/swing/session/WindowState.java | 2 +- .../runtime/swing/wizard/BusyChangeListener.java | 4 +- .../jaxx/runtime/swing/wizard/WizardModel.java | 4 +- .../jaxx/runtime/swing/wizard/WizardStep.java | 2 +- .../jaxx/runtime/swing/wizard/WizardStepUI.java | 2 +- .../jaxx/runtime/swing/wizard/WizardUI.java | 2 +- .../jaxx/runtime/swing/wizard/WizardUILancher.java | 12 +- .../jaxx/runtime/swing/wizard/WizardUtil.java | 2 +- .../runtime/swing/wizard/ext/WizardExtModel.java | 4 +- .../runtime/swing/wizard/ext/WizardExtStep.java | 6 +- .../swing/wizard/ext/WizardExtStepModel.java | 4 +- .../jaxx/runtime/swing/wizard/ext/WizardExtUI.java | 4 +- .../runtime/swing/wizard/ext/WizardExtUtil.java | 8 +- .../jaxx/runtime/swing/wizard/ext/WizardState.java | 2 +- .../jaxx/runtime/swing/wizard/ext/package.html | 0 .../nuiton}/jaxx/runtime/swing/wizard/package.html | 0 .../{ => org/nuiton}/jaxx/runtime/UtilTest.java | 3 +- .../context/DataContextEntryIteratorTest.java | 6 +- .../context/DefaultApplicationContextTest.java | 8 +- .../runtime/context/DefaultJAXXContextTest.java | 4 +- jaxx-runtime/src/test/resources/log4j.properties | 2 +- .../SimpleBeanValidatorMessageTableModel.java | 2 +- .../swing/SwingListValidatorMessageTableModel.java | 2 +- ...wingListValidatorMessageTableMouseListener.java | 2 +- .../swing/SwingListValidatorMessageWidget.java | 6 +- .../swing/SwingValidatorMessageTableModel.java | 2 +- .../swing/SwingValidatorMessageWidget.java | 6 +- .../jaxx/validator/swing/SwingValidatorUtil.java | 4 +- .../unified/UnifiedValidatorMessageTableModel.java | 2 +- .../UnifiedValidatorMessageTableMouseListener.java | 2 +- .../swing/unified/UnifiedValidatorMessageUtil.java | 2 +- .../unified/UnifiedValidatorMessageWidget.java | 6 +- .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 2 +- .../nuiton/jaxx/widgets/DecoratorPopupHandler.java | 2 +- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 2 +- .../widgets/datetime/DateTimeEditorHandler.java | 2 +- .../nuiton/jaxx/widgets/datetime/TimeEditor.jaxx | 2 +- .../jaxx/widgets/datetime/TimeEditorHandler.java | 2 +- .../datetime/session/DateTimeEditorState.java | 2 +- .../widgets/datetime/session/TimeEditorState.java | 2 +- .../AbsoluteDdCoordinateEditorHandler.java | 2 +- .../AbsoluteDmdCoordinateEditorHandler.java | 2 +- .../AbsoluteDmsCoordinateEditorHandler.java | 2 +- .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 +- .../gis/absolute/CoordinatesEditorHandler.java | 4 +- .../signed/SignedDdCoordinateEditorHandler.java | 2 +- .../signed/SignedDmdCoordinateEditorHandler.java | 2 +- .../signed/SignedDmsCoordinateEditorHandler.java | 2 +- .../absolute/AbsoluteDdCoordinateEditorTest.java | 2 +- .../absolute/AbsoluteDmsCoordinateEditorTest.java | 2 +- .../jaxx/widgets/number/NumberEditorHandler.java | 2 +- .../jaxx/widgets/select/FilterableDoubleList.jaxx | 2 +- .../select/FilterableDoubleListHandler.java | 12 +- .../widgets/select/FilterableDoubleListModel.java | 4 +- .../select/session/FilterableDoubleListState.java | 2 +- .../runtime/swing/editor/I18nEditorHandler.java | 246 ------- .../runtime/swing/editor/NumberEditorHandler.java | 623 ----------------- .../swing/editor/bean/BeanComboBoxHandler.java | 556 ---------------- .../swing/editor/bean/BeanDoubleListHandler.java | 565 ---------------- .../swing/editor/bean/BeanDoubleListModel.java | 350 ---------- .../editor/bean/BeanFilterableComboBoxHandler.java | 736 --------------------- .../swing/editor/bean/BeanListHeaderHandler.java | 291 -------- .../nuiton}/jaxx/runtime/swing/AboutPanel.jaxx | 0 .../jaxx/runtime/swing/AboutPanelHandler.java | 6 +- .../jaxx/runtime/swing/BaseActionPanel.java | 2 +- .../nuiton}/jaxx/runtime/swing/ClockWidget.jaxx | 0 .../jaxx/runtime/swing/ComboToListSelector.jaxx | 0 .../nuiton}/jaxx/runtime/swing/CompoundIcon.java | 2 +- .../nuiton}/jaxx/runtime/swing/ErrorDialogUI.jaxx | 0 .../jaxx/runtime/swing/ErrorDialogUIHandler.java | 6 +- .../nuiton}/jaxx/runtime/swing/FontSizor.jaxx | 0 .../jaxx/runtime/swing/FontSizorHandler.java | 4 +- .../nuiton}/jaxx/runtime/swing/HidorButton.jaxx | 0 .../jaxx/runtime/swing/HidorButtonHandler.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXDatePicker.jaxx | 0 .../jaxx/runtime/swing/JAXXRuntimeException.java | 2 +- .../nuiton}/jaxx/runtime/swing/JAXXWidgetUtil.java | 14 +- .../jaxx/runtime/swing/JSearchTextField.java | 4 +- .../nuiton}/jaxx/runtime/swing/ListSelector.jaxx | 4 +- .../jaxx/runtime/swing/ListSelectorModel.java | 6 +- .../jaxx/runtime/swing/ListToListSelector.jaxx | 0 .../jaxx/runtime/swing/MemoryStatusWidget.jaxx | 0 .../runtime/swing/MemoryStatusWidgetHandler.java | 2 +- .../jaxx/runtime/swing/StatusMessagePanel.jaxx | 0 .../runtime/swing/StatusMessagePanelHandler.java | 2 +- .../jaxx/runtime/swing/editor/FileEditor.jaxx | 2 +- .../runtime/swing/editor/FileEditorHandler.java | 3 +- .../jaxx/runtime/swing/editor/I18nEditor.jaxx | 8 +- .../jaxx/runtime/swing/editor/KeyStrokeEditor.java | 2 +- .../jaxx/runtime/swing/editor/NumberEditor.jaxx | 0 .../runtime/swing/editor/NumberEditorPopup.jcss | 0 .../runtime/swing/editor/SimpleTimeEditor.jaxx | 0 .../runtime/swing/editor/SimpleTimeEditor.jcss | 0 .../swing/editor/SimpleTimeEditorHandler.java | 2 +- .../swing/editor/SimpleTimeEditorModel.java | 2 +- .../jaxx/runtime/swing/editor/TimeEditor.jaxx | 0 .../jaxx/runtime/swing/editor/TimeEditor.jcss | 0 .../runtime/swing/editor/TimeEditorHandler.java | 2 +- .../runtime/swing/editor/bean/BeanComboBox.jaxx | 4 +- .../runtime/swing/editor/bean/BeanComboBox.jcss | 0 .../runtime/swing/editor/bean/BeanDoubleList.jaxx | 2 +- .../runtime/swing/editor/bean/BeanDoubleList.jcss | 0 .../swing/editor/bean/BeanFilterableComboBox.jaxx | 4 +- .../swing/editor/bean/BeanFilterableComboBox.jcss | 0 .../runtime/swing/editor/bean/BeanListHeader.jaxx | 2 +- .../runtime/swing/editor/bean/BeanListHeader.jcss | 0 .../jaxx/runtime/swing/editor/bean/BeanUIUtil.java | 8 +- .../jaxx/runtime/swing/editor/bean/package.html | 0 .../runtime/swing/editor/cell/DateCellEditor.java | 4 +- .../runtime/swing/editor/cell/FileCellEditor.java | 4 +- .../swing/editor/cell/KeyStrokeCellEditor.java | 4 +- .../swing/editor/cell/NumberCellEditor.java | 6 +- .../runtime/swing/editor/gis/DmdCoordinate.java | 2 +- .../swing/editor/gis/DmdCoordinateConverter.java | 2 +- .../swing/editor/gis/DmdCoordinateEditor.jaxx | 0 .../swing/editor/gis/DmdCoordinateEditor.jcss | 0 .../editor/gis/DmdCoordinateEditorHandler.java | 4 +- .../swing/editor/gis/DmdCoordinateEditorModel.java | 2 +- .../runtime/swing/editor/gis/DmsCoordinate.java | 2 +- .../swing/editor/gis/DmsCoordinateConverter.java | 2 +- .../swing/editor/gis/DmsCoordinateEditor.jaxx | 0 .../swing/editor/gis/DmsCoordinateEditor.jcss | 0 .../editor/gis/DmsCoordinateEditorHandler.java | 4 +- .../swing/editor/gis/DmsCoordinateEditorModel.java | 2 +- .../editor/gis/MaskFormatterFromConverter.java | 2 +- .../nuiton}/jaxx/runtime/swing/editor/package.html | 0 .../runtime/swing/list/ActionCheckListModel.java | 4 +- .../nuiton}/jaxx/runtime/swing/list/CheckList.java | 2 +- .../jaxx/runtime/swing/list/CheckListAction.java | 48 +- .../jaxx/runtime/swing/list/CheckListEditor.java | 2 +- .../jaxx/runtime/swing/list/CheckListModel.java | 2 +- .../jaxx/runtime/swing/list/CheckListRenderer.java | 2 +- .../runtime/swing/list/DefaultCheckListModel.java | 5 +- .../swing/list/filter/CheckListFilterType.java | 2 +- .../filter/DefaultFilterableCheckListModel.java | 6 +- .../filter/FilterableActionCheckListModel.java | 4 +- .../swing/list/filter/FilterableCheckList.java | 6 +- .../list/filter/FilterableCheckListModel.java | 4 +- .../jaxx/runtime/swing/log/JAXXLog4jAppender.java | 2 +- .../jaxx/runtime/swing/log/JAXXLog4jHandler.java | 6 +- .../jaxx/runtime/swing/log/JAXXLog4jUI.jaxx | 0 .../nuiton}/jaxx/runtime/swing/package.html | 0 .../runtime/swing/renderer/DateCellRenderer.java | 2 +- .../runtime/swing/session/BeanDoubleListState.java | 5 +- .../swing/session/BeanFilterableComboBoxState.java | 4 +- .../swing/table/filter/AbstractTableFilter.java | 2 +- .../swing/table/filter/FilterChangeListener.java | 2 +- .../table/filter/FilterTableHeaderRenderer.java | 6 +- .../runtime/swing/table/filter/JTableFilter.java | 2 +- .../table/filter/TableAwareCheckListRenderer.java | 7 +- .../runtime/swing/table/filter/TableFilter.java | 2 +- .../swing/table/filter/TableFilterColumnPopup.java | 23 +- .../swing/table/filter/TableFilterState.java | 2 +- .../swing/table/filter/TableRowFilterSupport.java | 2 +- .../services/org.nuiton.converter.NuitonConverter | 4 +- .../editor/gis/DmdCoordinateConverterTest.java | 2 +- .../swing/editor/gis/DmdCoordinateEditorTest.java | 2 +- .../swing/editor/gis/DmdCoordinateTest.java | 2 +- .../editor/gis/DmsCoordinateConverterTest.java | 2 +- .../swing/editor/gis/DmsCoordinateEditorTest.java | 2 +- .../swing/editor/gis/DmsCoordinateTest.java | 2 +- jaxx-widgets/src/test/resources/log4j.properties | 3 +- src/site/rst/JAXXContext.rst | 4 +- src/site/rst/NavigationModel.rst | 4 +- src/site/rst/index.rst | 6 +- src/site/rst/old-compiler-doc/JAXXContext.rst | 4 +- .../rst/old-compiler-doc/NavigationTreeModel.rst | 2 +- 410 files changed, 680 insertions(+), 4583 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java index ec0d2ee..f39860d 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java @@ -25,22 +25,22 @@ package org.nuiton.jaxx.application.swing; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.FileEditor; -import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.editor.SimpleTimeEditor; -import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.editor.bean.BeanUIUtil; -import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import jaxx.runtime.swing.editor.gis.DmdCoordinateEditor; -import jaxx.runtime.swing.editor.gis.DmsCoordinateEditor; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.editor.FileEditor; +import org.nuiton.jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.runtime.swing.editor.SimpleTimeEditor; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil; +import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinateEditor; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinateEditor; +import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java index 545e132..2d08b9b 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/ApplicationUI.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing; * #L% */ -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; /** * Contract to place on each ui. diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jaxx b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jaxx index c3548cd..cf7eee1 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jaxx +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUI.jaxx @@ -28,7 +28,7 @@ org.nuiton.jaxx.application.swing.ApplicationUIContext org.nuiton.jaxx.application.swing.util.ApplicationUIUtil - jaxx.runtime.swing.BlockingLayerUI + org.nuiton.jaxx.runtime.swing.BlockingLayerUI javax.swing.border.EmptyBorder </import> diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java index 41febb6..48e4829 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing.action; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java index 81a0168..b1535d8 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing.tab; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java index d31398f..f6d4540 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/table/AbstractApplicationTableModel.java @@ -27,7 +27,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationExceptionHandler.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationExceptionHandler.java index b822a27..45dfdf4 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationExceptionHandler.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationExceptionHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.application.swing.util; * #L% */ -import jaxx.runtime.swing.JAXXRuntimeException; +import org.nuiton.jaxx.runtime.swing.JAXXRuntimeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java index d7793d9..147d320 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.application.swing.util; * #L% */ -import jaxx.runtime.JAXXObject; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.swing.JTables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java index a3e76f9..3d95e23 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompiledObject.java @@ -29,7 +29,7 @@ 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.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; import java.awt.Container; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java index 61faaea..0d16881 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/CompilerConfiguration.java @@ -24,8 +24,8 @@ package org.nuiton.jaxx.compiler; import org.nuiton.jaxx.compiler.finalizers.JAXXCompilerFinalizer; import org.nuiton.jaxx.compiler.spi.Initializer; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.spi.UIHandler; import java.io.File; import java.util.Map; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java index d60cd01..c426dc9 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/DefaultCompilerConfiguration.java @@ -24,9 +24,9 @@ package org.nuiton.jaxx.compiler; 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; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.spi.UIHandler; 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/org/nuiton/jaxx/compiler/I18nHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java index f9a25c6..41253b8 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/I18nHelper.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.compiler; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.lang3.CharUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java index b6ce475..efbdc5b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXCompiler.java @@ -39,12 +39,12 @@ 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; -import jaxx.runtime.css.Rule; -import jaxx.runtime.css.Stylesheet; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.ComponentDescriptor; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; +import org.nuiton.jaxx.runtime.css.Rule; +import org.nuiton.jaxx.runtime.css.Stylesheet; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java index f6fb095..ed141ab 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/JAXXEngine.java @@ -440,7 +440,7 @@ public class JAXXEngine { "jaxx.runtime.*", "jaxx.runtime.swing.*", "static org.nuiton.i18n.I18n.t", - "static jaxx.runtime.SwingUtil.createImageIcon" + "static org.nuiton.jaxx.runtime.SwingUtil.createImageIcon" ) */ JAXXCompiler jaxxCompiler = (JAXXCompiler) cons.newInstance( @@ -456,7 +456,7 @@ public class JAXXEngine { "javax.swing.border.*", // "javax.swing.event.*", // "jaxx.runtime.*", - "jaxx.runtime.swing.*" + "org.nuiton.jaxx.runtime.swing.*" ) ); jaxxFile.setCompiler(jaxxCompiler); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java index 9cb1c99..94750c9 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/DataSource.java @@ -41,7 +41,7 @@ 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.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java index 86a3ccc..dc09bd0 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/AbstractJAXXBindingWriter.java @@ -27,7 +27,7 @@ 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 org.nuiton.jaxx.runtime.JAXXBinding; import java.util.List; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java index 2409a56..ec07435 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/DefaultJAXXBindingWriter.java @@ -29,7 +29,7 @@ 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 org.nuiton.jaxx.runtime.binding.DefaultJAXXBinding; import java.util.List; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java index 38a654c..5d93f45 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/JAXXBindingWriter.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.compiler.binding.writers; import org.nuiton.jaxx.compiler.binding.DataBinding; import org.nuiton.jaxx.compiler.java.JavaFileGenerator; -import jaxx.runtime.JAXXBinding; +import org.nuiton.jaxx.runtime.JAXXBinding; /** * The contract of a writer of {@link JAXXBinding} creation code from a diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java index 5fd1b41..097ccc5 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/binding/writers/SimpleJAXXObjectBindingWriter.java @@ -29,7 +29,7 @@ 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 org.nuiton.jaxx.runtime.binding.SimpleJAXXObjectBinding; import java.lang.reflect.Modifier; import java.util.List; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java index eee6424..5f7a73b 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/css/StylesheetHelper.java @@ -39,10 +39,10 @@ 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; -import jaxx.runtime.css.Stylesheet; +import org.nuiton.jaxx.runtime.css.Pseudoclasses; +import org.nuiton.jaxx.runtime.css.Rule; +import org.nuiton.jaxx.runtime.css.Selector; +import org.nuiton.jaxx.runtime.css.Stylesheet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -362,7 +362,7 @@ public class StylesheetHelper { if (!properties.isEmpty()) { pseudoClassesPrefix = compiler.getImportedType(Pseudoclasses.class); - dataBindingPrefix = compiler.getImportedType(jaxx.runtime.css.DataBinding.class); + dataBindingPrefix = compiler.getImportedType(org.nuiton.jaxx.runtime.css.DataBinding.class); } String outputClassName = diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java index 6353e66..c5e33ea 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java @@ -26,7 +26,7 @@ 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; +import org.nuiton.jaxx.runtime.SwingUtil; /** * A decorator to surround a compiled object (should be a component at least) diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index 04ad8fc..8289a33 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -30,7 +30,7 @@ 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 org.nuiton.jaxx.runtime.swing.help.JAXXHelpUI; import java.awt.Component; import java.lang.reflect.Modifier; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java index 59e36f7..e4a6267 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptor.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.compiler.reflect; -import jaxx.runtime.JAXXObjectDescriptor; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java index 04a912f..98daf67 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/ClassDescriptorHelper.java @@ -30,8 +30,8 @@ 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.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java index d54caed..178e31a 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaClass.java @@ -26,7 +26,7 @@ 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.nuiton.jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java index 8183984..895c08f 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java @@ -34,7 +34,7 @@ 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.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java index 9956e43..653bc23 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJaxxFile.java @@ -31,8 +31,8 @@ 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.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java index b84d161..19bddb8 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/spi/DefaultInitializer.java @@ -65,15 +65,15 @@ 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; -import jaxx.runtime.swing.JAXXList; -import jaxx.runtime.swing.JAXXTab; -import jaxx.runtime.swing.JAXXTree; -import jaxx.runtime.swing.Table; -import jaxx.runtime.swing.editor.EnumEditor; -import jaxx.runtime.swing.editor.LocaleEditor; +import org.nuiton.jaxx.runtime.swing.Application; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.swing.JAXXComboBox; +import org.nuiton.jaxx.runtime.swing.JAXXList; +import org.nuiton.jaxx.runtime.swing.JAXXTab; +import org.nuiton.jaxx.runtime.swing.JAXXTree; +import org.nuiton.jaxx.runtime.swing.Table; +import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; +import org.nuiton.jaxx.runtime.swing.editor.LocaleEditor; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.jdesktop.jxlayer.JXLayer; @@ -117,7 +117,7 @@ public class DefaultInitializer implements Initializer { @Override public void initialize() { - BeanInfoUtil.addJaxxBeanInfoPath("jaxx.runtime.swing"); + BeanInfoUtil.addJaxxBeanInfoPath("org.nuiton.jaxx.runtime.swing"); registerDefaultNamespace("javax.swing.*", JEditorPane.class, @@ -138,7 +138,6 @@ public class DefaultInitializer implements Initializer { //TC-20091005 why the namespace was on awt ? ButtonGroup is from javax.swing registerTag("javax.swing.*", "ButtonGroup", new DefaultObjectHandler(ClassDescriptorHelper.getClassDescriptor(JAXXButtonGroup.class))); -// TagManager.registerTag("java.awt.*", "ButtonGroup", new DefaultObjectHandler(ClassDescriptorHelper.getClassDescriptor(JAXXButtonGroup.class))); registerTag(JAXXCompiler.JAXX_NAMESPACE, TabHandler.TAG_NAME, new TabHandler()); registerTag(JAXXCompiler.JAXX_NAMESPACE, RowHandler.TAG_NAME, new RowHandler()); @@ -210,22 +209,17 @@ public class DefaultInitializer implements Initializer { } - protected void registerBean(Class<?> beanClass, - Class<? extends TagHandler> handlerClass) { - ClassDescriptor classDescriptor = - ClassDescriptorHelper.getClassDescriptor(beanClass); + protected void registerBean(Class<?> beanClass, Class<? extends TagHandler> handlerClass) { + ClassDescriptor classDescriptor = ClassDescriptorHelper.getClassDescriptor(beanClass); TagManager.registerBean(classDescriptor, handlerClass); } - protected void registerTag(String namespace, - String tagName, - TagHandler handler) { + protected void registerTag(String namespace, String tagName, TagHandler handler) { TagManager.registerTag(namespace, tagName, handler); } - protected void registerDefaultNamespace(String namespace, - Class<?>... beanClass) { + protected void registerDefaultNamespace(String namespace, Class<?>... beanClass) { for (Class<?> c : beanClass) { TagManager.registerDefaultNamespace(c.getSimpleName(), namespace); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java index 1c38eaa..31d0d10 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultComponentHandler.java @@ -30,7 +30,7 @@ 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.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Attr; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java index e99671f..ae403ce 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/DefaultObjectHandler.java @@ -40,11 +40,11 @@ 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; -import jaxx.runtime.bean.BeanTypeAware; -import jaxx.runtime.css.Stylesheet; +import org.nuiton.jaxx.runtime.ComponentDescriptor; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; +import org.nuiton.jaxx.runtime.bean.BeanTypeAware; +import org.nuiton.jaxx.runtime.css.Stylesheet; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java index aa50523..7495070 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/StyleHandler.java @@ -26,7 +26,7 @@ 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.nuiton.jaxx.runtime.css.Stylesheet; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java index 96e8a0a..8a5d123 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/TagManager.java @@ -580,7 +580,7 @@ public class TagManager { assert packageName.endsWith("*"); if (packageName.equals(namespace) || namespace.equals("*")) { - // check for an alias (like javax.swing.JComboBox actually being jaxx.runtime.swing.JAXXComboBox) + // check for an alias (like javax.swing.JComboBox actually being org.nuiton.jaxx.runtime.swing.JAXXComboBox) TagHandler handler = registeredTags.get(new QName(namespace, name)); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java index b078c21..c577100 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ApplicationHandler.java @@ -28,7 +28,7 @@ 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.nuiton.jaxx.runtime.swing.Application; import org.w3c.dom.Element; import javax.swing.WindowConstants; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java index f94f7d4..d732767 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/CompiledItemContainer.java @@ -26,7 +26,7 @@ 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 org.nuiton.jaxx.runtime.swing.Item; import java.util.ArrayList; import java.util.List; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java index 7efe827..f59bf38 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/ItemHandler.java @@ -28,7 +28,7 @@ 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.nuiton.jaxx.runtime.swing.Item; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java index 5089c9d..02e8a81 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXComboBoxHandler.java @@ -29,8 +29,8 @@ 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.nuiton.jaxx.runtime.swing.Item; +import org.nuiton.jaxx.runtime.swing.JAXXComboBox; import org.w3c.dom.Element; import java.awt.event.ItemListener; @@ -63,7 +63,7 @@ public class JAXXComboBoxHandler extends DefaultComponentHandler { List<Item> items = list.getItems(); if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; - list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); + list.appendAdditionCode("java.util.List<org.nuiton.jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<org.nuiton.jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorHelper.getClassDescriptor(Item.class), compiler); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java index df0d4a5..fe8adb2 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXListHandler.java @@ -29,8 +29,8 @@ 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.nuiton.jaxx.runtime.swing.Item; +import org.nuiton.jaxx.runtime.swing.JAXXList; import org.w3c.dom.Element; import javax.swing.event.ListSelectionListener; @@ -66,7 +66,7 @@ public class JAXXListHandler extends DefaultComponentHandler { if (items != null && !items.isEmpty()) { String listName = list.getId() + "$items"; //TODO Add the correct generic type - list.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); + list.appendAdditionCode("java.util.List<org.nuiton.jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<org.nuiton.jaxx.runtime.swing.Item>();"); for (Item item : items) { String id = item.getId(); CompiledObject compiledItem = new CompiledObject(id, ClassDescriptorHelper.getClassDescriptor(Item.class), compiler); diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java index 100ba26..4ab3ff9 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JAXXTreeHandler.java @@ -29,8 +29,8 @@ 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.nuiton.jaxx.runtime.swing.Item; +import org.nuiton.jaxx.runtime.swing.JAXXTree; import org.w3c.dom.Element; import javax.swing.event.TreeSelectionListener; @@ -77,7 +77,7 @@ public class JAXXTreeHandler extends DefaultComponentHandler { List<Item> items = tree.getItems(); if (items != null && !items.isEmpty()) { String listName = tree.getId() + "$items"; - tree.appendAdditionCode("java.util.List<jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<jaxx.runtime.swing.Item>();"); + tree.appendAdditionCode("java.util.List<org.nuiton.jaxx.runtime.swing.Item> " + listName + " = new java.util.ArrayList<org.nuiton.jaxx.runtime.swing.Item>();"); createItems(tree, items, listName + ".add", compiler); tree.appendAdditionCode(tree.getId() + ".setItems(" + listName + ");"); } diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java index 851df2f..1e0260d 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JRadioButtonHandler.java @@ -30,7 +30,7 @@ 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 org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java index d461e33..242bd69 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTabbedPaneHandler.java @@ -30,8 +30,8 @@ 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; +import org.nuiton.jaxx.runtime.swing.TabInfo; +import org.nuiton.jaxx.runtime.swing.TabInfoPropertyChangeListener; import javax.swing.Icon; import javax.swing.JTabbedPane; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java index 2de9d21..54f6dba 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/JTextComponentHandler.java @@ -28,7 +28,7 @@ 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.nuiton.jaxx.runtime.SwingUtil; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java index 66214f3..4f22689 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/RowHandler.java @@ -26,7 +26,7 @@ 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.nuiton.jaxx.runtime.swing.Table; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java index 8440043..a6201db 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TabHandler.java @@ -30,7 +30,7 @@ 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.nuiton.jaxx.runtime.swing.TabInfo; import org.apache.commons.lang3.StringUtils; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java index 8f968f7..85a7190 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tags/swing/TableHandler.java @@ -30,7 +30,7 @@ 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 org.nuiton.jaxx.runtime.swing.Table; import java.awt.GridBagConstraints; import java.awt.Insets; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java index 54aed33..db9e88a 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tasks/GenerateConstructorsTask.java @@ -35,8 +35,8 @@ 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.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java index caae67d..1318f0f 100644 --- a/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java +++ b/jaxx-compiler/src/main/java/org/nuiton/jaxx/compiler/tools/jaxxcapture/JAXXCapture.java @@ -78,7 +78,7 @@ public class JAXXCapture { objectHandlers.put(ClassDescriptorHelper.getClassDescriptor(Object.class), new ObjectHandler()); objectHandlers.put(ClassDescriptorHelper.getClassDescriptor(JTabbedPane.class), new JTabbedPaneHandler()); try { - objectHandlers.put(ClassDescriptorHelper.getClassDescriptor("jaxx.runtime.swing.Table"), new TableHandler()); + objectHandlers.put(ClassDescriptorHelper.getClassDescriptor("org.nuiton.jaxx.runtime.swing.Table"), new TableHandler()); } catch (ClassNotFoundException e) { System.err.println(e); } diff --git a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java index 35d6fb8..3307426 100644 --- a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/beans/BeanIntoUtilTest.java @@ -35,7 +35,7 @@ public class BeanIntoUtilTest { BeanInfoUtil.reset(); String[] searchPath0 = Introspector.getBeanInfoSearchPath(); - BeanInfoUtil.addJaxxBeanInfoPath("jaxx.runtime.swing"); + BeanInfoUtil.addJaxxBeanInfoPath("org.nuiton.jaxx.runtime.swing"); String[] searchPath = Introspector.getBeanInfoSearchPath(); Assert.assertEquals(searchPath0.length + 1, searchPath.length); diff --git a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java index 952a539..e7e4abd 100644 --- a/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java +++ b/jaxx-compiler/src/test/java/org/nuiton/jaxx/compiler/tags/TagManagerTest.java @@ -162,7 +162,7 @@ public class TagManagerTest { @Test public void testAliasing() { - Assert.assertEquals("ButtonGroup is not aliased to jaxx.runtime.swing.JAXXButtonGroup", "jaxx.runtime.swing.JAXXButtonGroup", TagManager.resolveClassName("ButtonGroup", compiler)); - Assert.assertEquals("javax.swing.ButtonGroup is not aliased to jaxx.runtime.swing.JAXXButtonGroup", "jaxx.runtime.swing.JAXXButtonGroup", TagManager.resolveClassName("javax.swing.ButtonGroup", compiler)); + Assert.assertEquals("ButtonGroup is not aliased to org.nuiton.jaxx.runtime.swing.JAXXButtonGroup", "org.nuiton.jaxx.runtime.swing.JAXXButtonGroup", TagManager.resolveClassName("ButtonGroup", compiler)); + Assert.assertEquals("javax.swing.ButtonGroup is not aliased to org.nuiton.jaxx.runtime.swing.JAXXButtonGroup", "org.nuiton.jaxx.runtime.swing.JAXXButtonGroup", TagManager.resolveClassName("javax.swing.ButtonGroup", compiler)); } } diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java index db8ebc9..952148a 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCallBackUIHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.config; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.config.model.CallBackEntry; import org.nuiton.jaxx.config.model.CallBackMap; import org.nuiton.jaxx.config.model.OptionModel; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java index 1e8251e..2b2368b 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigCategoryUIHandler.java @@ -22,12 +22,12 @@ package org.nuiton.jaxx.config; * #L% */ -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.config.model.ConfigTableModel; import org.nuiton.jaxx.config.model.OptionModel; -import jaxx.runtime.swing.renderer.ClassTableCellRenderer; -import jaxx.runtime.swing.renderer.ColorCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.ClassTableCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.ColorCellRenderer; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java index 3848b23..d28b723 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigTableEditor.java @@ -23,14 +23,14 @@ package org.nuiton.jaxx.config; */ import com.google.common.io.Files; -import jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; import org.nuiton.jaxx.config.model.ConfigTableModel; import org.nuiton.jaxx.config.model.OptionModel; -import jaxx.runtime.swing.editor.ClassCellEditor; -import jaxx.runtime.swing.editor.ColorCellEditor; -import jaxx.runtime.swing.editor.EnumEditor; -import jaxx.runtime.swing.editor.LocaleEditor; -import jaxx.runtime.swing.editor.cell.FileCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.ClassCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.ColorCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.EnumEditor; +import org.nuiton.jaxx.runtime.swing.editor.LocaleEditor; +import org.nuiton.jaxx.runtime.swing.editor.cell.FileCellEditor; import org.apache.commons.lang3.StringUtils; import javax.swing.DefaultCellEditor; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java index 93123b6..18a2170 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHandler.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.config; * #L% */ -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.config.model.CallBackEntry; import org.nuiton.jaxx.config.model.CallBackMap; import org.nuiton.jaxx.config.model.CategoryModel; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java index 4010e9b..4bfedc4 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/ConfigUIHelper.java @@ -24,8 +24,8 @@ package org.nuiton.jaxx.config; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.config.model.CallBackFinalizer; import org.nuiton.jaxx.config.model.CategoryModel; import org.nuiton.jaxx.config.model.ConfigUIModel; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java index 2decea9..9a2add5 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/CategoryModel.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.config.model; * #L% */ -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; diff --git a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java index 18e5fd6..2f0727e 100644 --- a/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java +++ b/jaxx-config/src/main/java/org/nuiton/jaxx/config/model/ConfigUIModel.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.config.model; import com.google.common.base.Joiner; import com.google.common.base.Supplier; import com.google.common.collect.Lists; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java index 676073d..1b75e72 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyDelegateConfigTest.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.config.model; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.MyDefaultCellEditor; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java index b645606..f67efe3 100644 --- a/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java +++ b/jaxx-config/src/test/java/org/nuiton/jaxx/config/model/MyInheritedConfigTest.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.config.model; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.MyDefaultCellEditor; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java index ac3554c..72ca60c 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoApplicationContext.java @@ -22,12 +22,12 @@ package org.nuiton.jaxx.demo; * #L% */ -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.swing.help.JAXXHelpBroker; -import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.context.DefaultApplicationContext; +import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.swing.help.JAXXHelpBroker; +import org.nuiton.jaxx.runtime.swing.help.JAXXHelpUIHandler; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java index aecde1d..38c659e 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoConfig.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.demo; import com.google.common.base.Supplier; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java index c1d9af9..5987fe1 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoHelpBroker.java @@ -23,14 +23,14 @@ package org.nuiton.jaxx.demo; */ import com.google.common.base.Preconditions; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.awt.visitor.BuildTreeVisitor; -import jaxx.runtime.awt.visitor.ComponentTreeNode; -import jaxx.runtime.awt.visitor.DebugComponentTreeNodeVisitor; -import jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; -import jaxx.runtime.swing.help.JAXXHelpBroker; -import jaxx.runtime.swing.help.JAXXHelpUI; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.awt.visitor.BuildTreeVisitor; +import org.nuiton.jaxx.runtime.awt.visitor.ComponentTreeNode; +import org.nuiton.jaxx.runtime.awt.visitor.DebugComponentTreeNodeVisitor; +import org.nuiton.jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; +import org.nuiton.jaxx.runtime.swing.help.JAXXHelpBroker; +import org.nuiton.jaxx.runtime.swing.help.JAXXHelpUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx index 29e3a4a..409cf36 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSources.jaxx @@ -24,8 +24,8 @@ <import> org.nuiton.jaxx.demo.DemoHelpBroker - jaxx.runtime.SwingUtil - jaxx.runtime.swing.FontSizor + org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.FontSizor java.awt.RenderingHints javax.swing.DefaultComboBoxModel diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java index b5bc06e..d6289e7 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoSourcesHandler.java @@ -22,10 +22,10 @@ package org.nuiton.jaxx.demo; import com.google.common.collect.Lists; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.FontSizor; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.FontSizor; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx index 344f384..2c2f847 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUI.jaxx @@ -27,9 +27,9 @@ org.nuiton.jaxx.demo.tree.DemoTreeHelper org.nuiton.jaxx.demo.tree.DemoCellRenderer - jaxx.runtime.SwingUtil - jaxx.runtime.swing.CardLayout2 - jaxx.runtime.swing.StatusMessagePanel + org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.CardLayout2 + org.nuiton.jaxx.runtime.swing.StatusMessagePanel java.awt.Dimension java.util.Locale diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java index 04558f6..cdfa344 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/DemoUIHandler.java @@ -22,16 +22,16 @@ package org.nuiton.jaxx.demo; * #L% */ -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.log.JAXXLog4jUI; -import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.context.DefaultApplicationContext; +import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; +import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; +import org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java index 7ad817b..135a527 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/RunDemo.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.demo; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.log.JAXXLog4jUI; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; +import org.nuiton.jaxx.runtime.swing.log.JAXXLog4jUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx index 6f7530d..bfba1b9 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx @@ -24,9 +24,9 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.SwingUtil - jaxx.runtime.swing.BlockingLayerUI - jaxx.runtime.swing.BlockingLayerUI2 + org.nuiton.jaxx.runtime.SwingUtil + org.nuiton.jaxx.runtime.swing.BlockingLayerUI + org.nuiton.jaxx.runtime.swing.BlockingLayerUI2 java.awt.Color java.awt.event.ActionEvent diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx index 5179db6..ea98774 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/StatusMessagePanelDemo.jaxx @@ -27,6 +27,5 @@ <JButton text='Fool me twice' onActionPerformed='p.setStatus(((JButton)event.getSource()).getText() + " ? shame on ...")'/> </JPanel> - <jaxx.runtime.swing.StatusMessagePanel id='p' - constraints='BorderLayout.SOUTH'/> + <org.nuiton.jaxx.runtime.swing.StatusMessagePanel id='p' constraints='BorderLayout.SOUTH'/> </org.nuiton.jaxx.demo.DemoPanel> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx index 9bc639c..86a4fbb 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - jaxx.runtime.swing.editor.bean.BeanComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox </import> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java index 2080706..60a822d 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.editor; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx index fe50a7a..22ae48f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - jaxx.runtime.swing.editor.bean.BeanDoubleList + org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList </import> <Table fill='both'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java index 3c4419b..ee6f9b6 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java @@ -27,7 +27,7 @@ package org.nuiton.jaxx.demo.component.jaxx.editor; */ import com.google.common.base.Predicate; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx index e9f13f3..33e4931 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx @@ -23,7 +23,7 @@ <import> org.nuiton.jaxx.demo.entities.People - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java index 2befe1d..ae92ba8 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.editor; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx index c56c537..6e10e52 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/FileEditorDemo.jaxx @@ -21,7 +21,7 @@ --> <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.FileEditor + org.nuiton.jaxx.runtime.swing.editor.FileEditor </import> <String id='title' javaBean='"Open file"'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx index 787392a..ab6e5cc 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx @@ -24,7 +24,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> javax.swing.border.Border - jaxx.runtime.swing.editor.I18nEditor + org.nuiton.jaxx.runtime.swing.editor.I18nEditor org.nuiton.i18n.I18n java.util.Arrays </import> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx index 4d1461c..6527aeb 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/ListSelectorDemo.jaxx @@ -21,16 +21,16 @@ --> <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.ListSelector + org.nuiton.jaxx.runtime.swing.ListSelector com.google.common.collect.Lists java.util.List org.nuiton.jaxx.demo.entities.People org.nuiton.jaxx.demo.entities.Movie org.nuiton.jaxx.demo.entities.DemoDataProvider org.nuiton.jaxx.demo.entities.DemoDecoratorProvider - jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer java.util.Collection - jaxx.runtime.swing.model.GenericListModel + org.nuiton.jaxx.runtime.swing.model.GenericListModel </import> <ListCellRenderer id='listCellRenderer' diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx index 5c2c4cb..4063fef 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx @@ -23,7 +23,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.runtime.swing.editor.NumberEditor static org.nuiton.i18n.I18n.t </import> @@ -83,7 +83,7 @@ void $afterCompleteSetup() { </row> <row> <cell> - <jaxx.runtime.swing.editor.NumberEditor id='editor' + <org.nuiton.jaxx.runtime.swing.editor.NumberEditor id='editor' constructorParams='this' bean='{demoModel}' property='{useFloat.isSelected() ? "floatProperty" : "integerProperty"}' diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx index c44c9b2..d4dbd14 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx @@ -22,7 +22,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.SimpleTimeEditor + org.nuiton.jaxx.runtime.swing.editor.SimpleTimeEditor static org.nuiton.i18n.I18n.t </import> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java index 37894de..6260a88 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.editor; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; /** * Created on 11/22/13. diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java index 96d96e5..a3b0411 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoModel.java @@ -21,7 +21,7 @@ */ package org.nuiton.jaxx.demo.component.jaxx.editor; -import jaxx.runtime.swing.editor.SimpleTimeEditor; +import org.nuiton.jaxx.runtime.swing.editor.SimpleTimeEditor; import org.jdesktop.beans.AbstractSerializableBean; import java.util.Date; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx index ecdfcf0..268ff2a 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx @@ -22,7 +22,7 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.TimeEditor + org.nuiton.jaxx.runtime.swing.editor.TimeEditor static org.nuiton.i18n.I18n.t </import> @@ -60,7 +60,7 @@ void $afterCompleteSetup() { </row> <row> <cell> - <jaxx.runtime.swing.editor.TimeEditor id='editor' constructorParams='this' property='time' + <org.nuiton.jaxx.runtime.swing.editor.TimeEditor id='editor' constructorParams='this' property='time' border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}' bean='{demoModel}' date="{demoModel.getTime()}" diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java index eca3722..39b97d3 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java @@ -21,7 +21,7 @@ */ package org.nuiton.jaxx.demo.component.jaxx.editor; -import jaxx.runtime.swing.editor.TimeEditor; +import org.nuiton.jaxx.runtime.swing.editor.TimeEditor; import org.jdesktop.beans.AbstractSerializableBean; import java.util.Date; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx index 625a093..99ba05d 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx @@ -22,11 +22,11 @@ <org.nuiton.jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.editor.NumberEditor - jaxx.runtime.swing.editor.gis.DmsCoordinate - jaxx.runtime.swing.editor.gis.DmsCoordinateEditor - jaxx.runtime.swing.editor.gis.DmdCoordinate - jaxx.runtime.swing.editor.gis.DmdCoordinateEditor + org.nuiton.jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinate + org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinateEditor + org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinate + org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinateEditor </import> <!-- model --> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java index aa12447..8399ca6 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.demo.component.jaxx.editor.gis; * #L% */ -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.editor.gis.DmdCoordinate; -import jaxx.runtime.swing.editor.gis.DmsCoordinate; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinate; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java index 6baeee6..848337f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java index 2470efa..34080c2 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/datetime/TimeEditorDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.widgets.datetime; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java index f4760f7..a8ad7ed 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.widgets.gis; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.t; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java index 498dc41..4e2d022 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/number/NumberEditorDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.widgets.number; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; /** * Created on 11/23/14. diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java index 7e9040e..b8a9a05 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/jaxx/widgets/select/FilterableDoubleListDemoHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.component.jaxx.widgets.select; * #L% */ -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.DemoDecoratorProvider; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx index c3a6a5d..125573f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/component/swing/HidorButtonDemo.jaxx @@ -24,7 +24,7 @@ <HBox horizontalAlignment='center' verticalAlignment='middle'> - <jaxx.runtime.swing.HidorButton target='{hidor1}' showText="show label1" + <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor1}' showText="show label1" hideText='hide label1' targetVisible='{true}'/> @@ -32,7 +32,7 @@ </HBox> <HBox horizontalAlignment='center' verticalAlignment='middle'> - <jaxx.runtime.swing.HidorButton target='{hidor2}' showText="show label2" + <org.nuiton.jaxx.runtime.swing.HidorButton target='{hidor2}' showText="show label2" hideText='hide label2' targetVisible='{false}'/> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java index fb434f3..3bf5456 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/entities/DemoDataProvider.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.entities; -import jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx index 4e1bcbf..c74b404 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx @@ -25,8 +25,8 @@ layout='{new BorderLayout()}'> <import> - jaxx.runtime.JAXXBinding - jaxx.runtime.FileChooserUtil + org.nuiton.jaxx.runtime.JAXXBinding + org.nuiton.jaxx.runtime.FileChooserUtil java.awt.Color javax.swing.border.TitledBorder javax.swing.DefaultListModel diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java index 5ee50f8..d9c86b5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/NavDemoHandler.java @@ -21,12 +21,12 @@ */ package org.nuiton.jaxx.demo.feature.nav; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.CardLayout2; -import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.nav.NavNode; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.CardLayout2; +import org.nuiton.jaxx.runtime.swing.ErrorDialogUI; +import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx index 04252d2..3d101b5 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx @@ -25,8 +25,8 @@ <import> java.util.List org.nuiton.jaxx.demo.entities.People - jaxx.runtime.swing.editor.bean.BeanListHeader - jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader + org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer static org.nuiton.i18n.I18n.t </import> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx index a568a6a..5bb0f04 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx @@ -25,8 +25,8 @@ <import> java.util.List org.nuiton.jaxx.demo.entities.Movie - jaxx.runtime.swing.editor.bean.BeanListHeader - jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader + org.nuiton.jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer static org.nuiton.i18n.I18n.t </import> diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java index 770988d..78aae84 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.People; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java index 0b144c7..928910a 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavHelper; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavHelper; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.Movie; import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java index 69dd975..b474434 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java index d82a955..9f7530c 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeHelper.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.runtime.swing.nav.tree.NavTreeHelper; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeHelper; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java index 0759a8b..55e123b 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.demo.feature.nav.tree; -import jaxx.runtime.swing.nav.tree.NavTreeNode; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNode; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; /** * @author Sylvain Lletellier diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java index 0f9bf90..d0bae12 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.People; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java index d376236..68c660c 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavHelper; -import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavHelper; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.Movie; import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java index 8d7079d..d4ea20d 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableHelper.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.runtime.swing.nav.treetable.NavTreeTableHelper; -import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableHelper; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableModel; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.feature.nav.NavDemoHandler; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java index 5155e3f..f507018 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java @@ -21,8 +21,8 @@ */ package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.runtime.swing.nav.NavNode; -import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; +import org.nuiton.jaxx.runtime.swing.nav.NavNode; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableModel; import org.nuiton.jaxx.demo.entities.DemoDataProvider; import org.nuiton.jaxx.demo.entities.Movie; import org.nuiton.jaxx.demo.entities.People; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java index 80c9850..c7bf9cd 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java @@ -21,8 +21,8 @@ */ package org.nuiton.jaxx.demo.feature.nav.treetable; -import jaxx.runtime.swing.nav.treetable.NavTreeTableNode; -import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableNode; +import org.nuiton.jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; /** * @author Sylvain Lletellier diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java index a08f4a3..5f5fc5f 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java @@ -21,8 +21,8 @@ package org.nuiton.jaxx.demo.feature.validation.list; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.lang3.tuple.Pair; import org.jdesktop.swingx.JXTable; import org.nuiton.decorator.Decorator; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java index 47aa6eb..423d688 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/feature/validation/list/PeopleTableModel.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.feature.validation.list; */ import com.google.common.collect.Lists; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.jaxx.demo.entities.Identity; import org.nuiton.jaxx.demo.entities.People; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java index dff6af6..a388b2c 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoCellRenderer.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.tree; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java index c425fb0..cf18879 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoDataProvider.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.tree; -import jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.demo.component.jaxx.BoxedDecoratorDemo; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java index f23b059..1f550b6 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNode.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.tree; -import jaxx.runtime.swing.nav.tree.NavTreeNode; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNode; /** * Basic node of the demo. diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java index 4cfde1c..ee3cf3d 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoNodeLoador.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.demo.tree; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavNodeChildLoador; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java index 62a061e..2ed3cc1 100644 --- a/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java +++ b/jaxx-demo/src/main/java/org/nuiton/jaxx/demo/tree/DemoTreeHelper.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.demo.tree; -import jaxx.runtime.swing.nav.tree.NavTreeHelper; +import org.nuiton.jaxx.runtime.swing.nav.tree.NavTreeHelper; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; 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 98fd8c0..731d1af 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 @@ -33,10 +33,10 @@ 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; -import jaxx.runtime.swing.help.JAXXHelpBroker; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.help.JAXXHelpBroker; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -104,7 +104,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat * * Must not be abstract. */ - @Parameter(property = "jaxx.jaxxContextFQN", defaultValue = "jaxx.runtime.context.DefaultJAXXContext", required = true) + @Parameter(property = "jaxx.jaxxContextFQN", defaultValue = "org.nuiton.jaxx.runtime.context.DefaultJAXXContext", required = true) protected String jaxxContextFQN; /** @@ -266,7 +266,7 @@ public class GenerateMojo extends AbstractJaxxMojo implements CompilerConfigurat * * @since 1.3 */ - @Parameter(property = "jaxx.helpBrokerFQN", defaultValue = "jaxx.runtime.swing.help.JAXXHelpBroker") + @Parameter(property = "jaxx.helpBrokerFQN", defaultValue = "org.nuiton.jaxx.runtime.swing.help.JAXXHelpBroker") protected String helpBrokerFQN; /** 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 8bc4b91..4361dc3 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,7 @@ */ package org.nuiton.jaxx.plugin; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java index 58ff931..70b3d9c 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1404Test.java @@ -38,7 +38,7 @@ public class Bug1404Test extends JaxxBaseTest { mojo.execute(); assertNumberJaxxFiles(3); - checkPattern(mojo, "import jaxx.runtime.SwingUtil;", true); - checkPattern(mojo, "import jaxx.runtime.JAXXUtil;", true); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.SwingUtil;", true); + checkPattern(mojo, "import org.nuiton.jaxx.runtime.JAXXUtil;", true); } } 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 d860b8d..c93dec3 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 @@ -22,10 +22,10 @@ package org.nuiton.jaxx.plugin; -import jaxx.runtime.Base64Coder; +import org.nuiton.jaxx.runtime.Base64Coder; import org.nuiton.jaxx.compiler.JAXXCompiler; -import jaxx.runtime.JAXXObjectDescriptor; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXObjectDescriptor; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.junit.Test; import static org.junit.Assert.*; diff --git a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java index 4592867..537d041 100644 --- a/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java +++ b/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.plugin; -import jaxx.runtime.context.DefaultJAXXContext; +import org.nuiton.jaxx.runtime.context.DefaultJAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.MojoExecutionException; 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 5e5ea3e..26a38a0 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 @@ -26,7 +26,7 @@ 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.runtime.context.DefaultJAXXContext; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; diff --git a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/lambdaTest/LambdaHandler.java b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/lambdaTest/LambdaHandler.java index a45686b..49b3d6e 100644 --- a/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/lambdaTest/LambdaHandler.java +++ b/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/lambdaTest/LambdaHandler.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.plugin.lambdaTest; * #L% */ -import jaxx.runtime.JAXXObject; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java b/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java deleted file mode 100644 index d61b2e2..0000000 --- a/jaxx-runtime/src/main/java/jaxx/runtime/FileChooserUtil.java +++ /dev/null @@ -1,359 +0,0 @@ -package jaxx.runtime; - -/* - * #%L - * JAXX :: Runtime - * %% - * 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% - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.runtime.JaxxFileChooser; -import org.nuiton.util.FileUtil; - -import javax.swing.JFileChooser; -import java.awt.Component; -import java.io.File; - -/** - * To help choosing a file / directory. - * - * Was previously in {@code org.nuiton.util.FileUtil} from - * {@code nuiton-utils} project. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 2.5.16 - * @deprecated since 2.15, prefer use {@link JaxxFileChooser}. - */ -public class FileChooserUtil { - - /** Logger. */ - private static final Log log = LogFactory.getLog(FileChooserUtil.class); - - public static final File DEFAULT_CURRENT_DIRECTORY_FILE = new File("."); - - protected static File currentDirectory = DEFAULT_CURRENT_DIRECTORY_FILE; - - public static void setCurrentDirectory(File dir) { - JaxxFileChooser.setCurrentDirectory(currentDirectory ); - } - - public static File getCurrentDirectory() { - return JaxxFileChooser.getCurrentDirectory(); - } - - public static boolean isCurrentDirectoryDefault() { - return JaxxFileChooser.isCurrentDirectoryDefault(); - } - - protected FileChooserUtil() { - // no instance please - } - - - public static class PatternChooserFilter extends javax.swing.filechooser.FileFilter { - protected String pattern; - - protected String description; - - public PatternChooserFilter(String pattern, String description) { - this.pattern = pattern; - this.description = description; - } - - @Override - public boolean accept(File f) { - return f.isDirectory() || f.getAbsolutePath().matches(pattern); - } - - @Override - public String getDescription() { - return description; - } - - } - - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param patternOrDescriptionFilters les filtres a utiliser, les chaines doivent etre données - * par deux, le pattern du filtre + la description du filtre - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - * @see #getFile(javax.swing.filechooser.FileFilter...) - */ - public static File getFile(String... patternOrDescriptionFilters) { - File result; - result = getFile(null, patternOrDescriptionFilters); - return result; - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param filters les filtres a ajouter - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - */ - public static File getFile(javax.swing.filechooser.FileFilter... filters) { - return getFile(null, filters); - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param parent le component parent du dialog - * @param patternOrDescriptionFilters les filtres a utiliser, les chaines doivent etre données - * par deux, le pattern du filtre + la description du filtre - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - * @see #getFile(javax.swing.filechooser.FileFilter...) - */ - public static File getFile(Component parent, - String... patternOrDescriptionFilters) { - File result; - result = getFile("Ok", "Ok", parent, patternOrDescriptionFilters); - return result; - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param title le titre de la boite de dialogue - * @param approvalText le label du boutton d'acceptation - * @param parent le component parent du dialog - * @param patternOrDescriptionFilters les filtres a utiliser, les chaines doivent etre données - * par deux, le pattern du filtre + la description du filtre - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - * @see #getFile(javax.swing.filechooser.FileFilter...) - */ - public static File getFile(String title, - String approvalText, - Component parent, - String... patternOrDescriptionFilters) { - - if (patternOrDescriptionFilters.length % 2 != 0) { - throw new IllegalArgumentException( - "Arguments must be (pattern, description) couple"); - } - javax.swing.filechooser.FileFilter[] filters = - new javax.swing.filechooser.FileFilter[ - patternOrDescriptionFilters.length / 2]; - for (int i = 0; i < filters.length; i++) { - String pattern = patternOrDescriptionFilters[i * 2]; - String description = patternOrDescriptionFilters[i * 2 + 1]; - filters[i] = new PatternChooserFilter(pattern, description); - } - File result; - result = getFile(title, approvalText, parent, filters); - return result; - } - - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param parent le component parent du dialog - * @param filters les filtres a ajouter - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - */ - public static File getFile(Component parent, - javax.swing.filechooser.FileFilter... filters) { - return getFile("Ok", "Ok", parent, filters); - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param title le titre de la boite de dialogue - * @param approvalText le label du boutton d'acceptation - * @param parent le component parent du dialog - * @param filters les filtres a ajouter - * @return le fichier accepté, ou null si rien n'est choisi ou l'utilisateur a annulé - */ - public static File getFile(String title, - String approvalText, - Component parent, - javax.swing.filechooser.FileFilter... filters) { - try { - JFileChooser chooser = new JFileChooser(currentDirectory); - - chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); - if (filters.length > 0) { - if (filters.length == 1) { - chooser.setFileFilter(filters[0]); - } else { - for (javax.swing.filechooser.FileFilter filter : filters) { - chooser.addChoosableFileFilter(filter); - } - } - } - chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); - chooser.setDialogTitle(title); - int returnVal = chooser.showDialog(parent, approvalText); - if (returnVal == JFileChooser.APPROVE_OPTION) { - File theFile = chooser.getSelectedFile(); - if (theFile != null) { - currentDirectory = theFile; - return theFile.getAbsoluteFile(); - } - } - } catch (Exception eee) { - log.warn("Erreur:", eee); - } - return null; - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param title le titre de la boite de dialogue - * @param approvalText le label du boutton d'acceptation - * @param parent le component parent du dialog - * @param patternOrDescriptionFilters les filtres a utiliser, les chaines doivent etre données - * par deux, le pattern du filtre + la description du filtre - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - */ - public static File saveFile(String filename, - String title, - String approvalText, - Component parent, - String... patternOrDescriptionFilters) { - - if (patternOrDescriptionFilters.length % 2 != 0) { - throw new IllegalArgumentException( - "Arguments must be (pattern, description) couple"); - } - javax.swing.filechooser.FileFilter[] filters = - new javax.swing.filechooser.FileFilter[ - patternOrDescriptionFilters.length / 2]; - for (int i = 0; i < filters.length; i++) { - String pattern = patternOrDescriptionFilters[i * 2]; - String description = patternOrDescriptionFilters[i * 2 + 1]; - filters[i] = new FileUtil.PatternChooserFilter(pattern, description); - } - File result; - result = saveFile(filename, title, approvalText, parent, filters); - return result; - } - - /** - * Retourne le nom du fichier entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne null. - * - * @param title le titre de la boite de dialogue - * @param approvalText le label du boutton d'acceptation - * @param parent le component parent du dialog - * @param filters les filtres a ajouter - * @return le fichier accepté, ou null si rien n'est chois ou l'utilisateur a annulé - */ - public static File saveFile(String filename, - String title, - String approvalText, - Component parent, - javax.swing.filechooser.FileFilter... filters) { - File selectedFile = new File(getCurrentDirectory(), filename); - JFileChooser chooser = new JFileChooser(selectedFile); - - chooser.setDialogType(JFileChooser.SAVE_DIALOG); - chooser.setSelectedFile(selectedFile); - if (filters.length > 0) { - if (filters.length == 1) { - chooser.setFileFilter(filters[0]); - } else { - for (javax.swing.filechooser.FileFilter filter : filters) { - chooser.addChoosableFileFilter(filter); - } - } - } - chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); - chooser.setDialogTitle(title); - - File result = null; - - int returnVal = chooser.showDialog(parent, approvalText); - if (returnVal == JFileChooser.APPROVE_OPTION) { - result = chooser.getSelectedFile(); - if (result != null) { - setCurrentDirectory(result); - result = result.getAbsoluteFile(); - } - } - return result; - } - - /** - * @return le nom du repertoire entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne - * null. - */ - public static String getDirectory() { - return getDirectory(null, "Ok", "Ok"); - } - - /** - * @param title le nom de la boite de dialogue - * @param approvalText le texte de l'action d'acceptation du répertoire dans le file chooser - * @return le nom du repertoire entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne - * null. - */ - public static String getDirectory(String title, String approvalText) { - return getDirectory(null, title, approvalText); - } - - /** - * @param parent le component parent du dialog - * @param title le nom de la boite de dialogue - * @param approvalText le texte de l'action d'acceptation du répertoire dans le file chooser - * @return le nom du repertoire entre dans la boite de dialogue. - * Si le bouton annuler est utilisé, ou qu'il y a une erreur retourne - * null. - */ - public static String getDirectory(Component parent, - String title, - String approvalText) { - try { - JFileChooser chooser = new JFileChooser(currentDirectory); - chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setDialogTitle(title); - int returnVal = chooser.showDialog(parent, approvalText); - if (returnVal == JFileChooser.APPROVE_OPTION) { - File theFile = chooser.getSelectedFile(); - if (theFile != null) { - currentDirectory = theFile; - if (theFile.isDirectory()) { - return theFile.getAbsolutePath(); - } - } - } else { - return null; - } - } catch (Exception eee) { - log.warn("Erreur:", eee); - } - return null; - } -} diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java deleted file mode 100644 index 709b576..0000000 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTableState.java +++ /dev/null @@ -1,155 +0,0 @@ -package jaxx.runtime.swing.session; - -/* - * #%L - * JAXX :: Runtime - * %% - * 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% - */ - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.*; -import javax.swing.table.TableColumn; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * State for JTable. - * TODO add support for column order change - * - * @author poussin - * @author Kevin Morin - morin@codelutin.com - * @since 2.5.16 - * - */ -public class JTableState implements State { - - private static final Log log = LogFactory.getLog(JTableState.class); - - protected int[] columnWidths = new int[0]; - - protected Map<Integer, String> sortKeys; - - public JTableState() { - } - - public JTableState(int[] columnWidths, Map<Integer, String> sortKeys) { - this.columnWidths = columnWidths; - this.sortKeys = sortKeys; - } - - public int[] getColumnWidths() { - return columnWidths; - } - - public void setColumnWidths(int[] columnWidths) { - this.columnWidths = columnWidths; - } - - public Map<Integer, String> getSortKeys() { - return sortKeys; - } - - public void setSortKeys(Map<Integer, String> sortKeys) { - this.sortKeys = sortKeys; - } - - protected JTable checkComponent(Object o) { - if (o == null) { - throw new IllegalArgumentException("null component"); - } - if (!(o instanceof JTable)) { - throw new IllegalArgumentException("invalid component"); - } - return (JTable) o; - } - - @Override - public State getState(Object o) { - JTable table = checkComponent(o); - - JTableState result = new JTableState(); - - int[] columnWidths = new int[table.getColumnCount()]; - boolean resizableColumnExists = false; - - for (int i = 0; i < columnWidths.length; i++) { - TableColumn tc = table.getColumnModel().getColumn(i); - columnWidths[i] = (tc.getResizable()) ? tc.getWidth() : -1; - if (tc.getResizable()) { - resizableColumnExists = true; - } - } - - if (resizableColumnExists) { - result.setColumnWidths(columnWidths); - } - - if (table.getRowSorter() != null) { - List<? extends RowSorter.SortKey> sortKeys = table.getRowSorter().getSortKeys(); - Map<Integer, String> sortKeysMap = null; - if (sortKeys != null) { - sortKeysMap = new HashMap<Integer, String>(); - for (RowSorter.SortKey sortKey : sortKeys) { - sortKeysMap.put(sortKey.getColumn(), String.valueOf(sortKey.getSortOrder())); - } - } - result.setSortKeys(sortKeysMap); - } - - return result; - } - - @Override - public void setState(Object o, State state) { - if (!(state instanceof JTableState)) { - throw new IllegalArgumentException("invalid state"); - } - - JTable table = checkComponent(o); - JTableState jTableState = (JTableState) state; - - int[] columnWidths = jTableState.getColumnWidths(); - if (columnWidths != null - && table.getColumnCount() == columnWidths.length) { - for (int i = 0; i < columnWidths.length; i++) { - if (columnWidths[i] != -1) { - TableColumn tc = table.getColumnModel().getColumn(i); - if (tc.getResizable()) { - tc.setPreferredWidth(columnWidths[i]); - } - } - } - } - Map<Integer, String> sortKeysMap = jTableState.getSortKeys(); - if (sortKeysMap != null) { - List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>(); - for (Integer index : sortKeysMap.keySet()) { - SortOrder sortOrder = SortOrder.valueOf(sortKeysMap.get(index)); - RowSorter.SortKey sortKey = new RowSorter.SortKey(index, sortOrder); - sortKeys.add(sortKey); - } - table.getRowSorter().setSortKeys(sortKeys); - } - } -} diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java index 20f9da4..412f92e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/Base64Coder.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java index 9c41116..cf68946 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/ComponentDescriptor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.io.Serializable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java index d0e5066..a558d41 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java index 3f44e6f..2523d87 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/DataBindingUpdateListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXAction.java similarity index 93% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXAction.java index 61dbac2..cfcd6d8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXAction.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; /** * This is the contract to be realized by any class to be used as Action class for an ui. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXBinding.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXBinding.java index aad6f19..33d2cf7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXBinding.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXContext.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXContext.java index 7c397d3..f015fba 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXContext.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; /** - * The {@link jaxx.runtime.JAXXContext} contract defines a generic context. + * The {@link JAXXContext} contract defines a generic context. * * A context contains two king of entries : * diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObject.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObject.java index 0e40984..5a961a1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObject.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import java.awt.Container; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java index bfe1655..f442d6a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXObjectDescriptor.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; -import jaxx.runtime.css.Stylesheet; +import org.nuiton.jaxx.runtime.css.Stylesheet; import java.io.Serializable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java index 926ac37..4feb5b4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/JAXXUtil.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java index 4fd2900..3554caa 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/SwingUtil.java @@ -19,18 +19,18 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import com.google.common.base.Predicate; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -import jaxx.runtime.swing.editor.BooleanCellEditor; -import jaxx.runtime.swing.model.JaxxDefaultComboBoxModel; -import jaxx.runtime.swing.model.JaxxDefaultListModel; -import jaxx.runtime.swing.renderer.BooleanCellRenderer; -import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; -import jaxx.runtime.swing.renderer.EnumTableCellRenderer; -import jaxx.runtime.swing.renderer.I18nTableCellRenderer; +import org.nuiton.jaxx.runtime.swing.Item; +import org.nuiton.jaxx.runtime.swing.JAXXComboBox; +import org.nuiton.jaxx.runtime.swing.editor.BooleanCellEditor; +import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultComboBoxModel; +import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel; +import org.nuiton.jaxx.runtime.swing.renderer.BooleanCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.EnumTableCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.I18nTableCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.JXLayer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/BuildTreeVisitor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/BuildTreeVisitor.java index 163a10e..6fa8c4c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/BuildTreeVisitor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.awt.visitor; +package org.nuiton.jaxx.runtime.awt.visitor; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNode.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNode.java index 0cd4ce1..11c8e56 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNode.java @@ -1,4 +1,4 @@ -package jaxx.runtime.awt.visitor; +package org.nuiton.jaxx.runtime.awt.visitor; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java index b04ad94..ccb69c5 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.awt.visitor; +package org.nuiton.jaxx.runtime.awt.visitor; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java index cde129d..1297c12 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/DebugComponentTreeNodeVisitor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.awt.visitor; +package org.nuiton.jaxx.runtime.awt.visitor; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java index fd0cbdb..7aabd9a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.awt.visitor; +package org.nuiton.jaxx.runtime.awt.visitor; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/awt/visitor/package.html diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/bean/BeanTypeAware.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/bean/BeanTypeAware.java index ef5bf9f..56621d3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/bean/BeanTypeAware.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/bean/BeanTypeAware.java @@ -1,4 +1,4 @@ -package jaxx.runtime.bean; +package org.nuiton.jaxx.runtime.bean; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/DefaultJAXXBinding.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/DefaultJAXXBinding.java index aca4f70..98295f5 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/DefaultJAXXBinding.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.binding; +package org.nuiton.jaxx.runtime.binding; -import jaxx.runtime.JAXXBinding; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXBinding; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/binding/SimpleJAXXObjectBinding.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/SimpleJAXXObjectBinding.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/binding/SimpleJAXXObjectBinding.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/SimpleJAXXObjectBinding.java index ef1abfc..403ae42 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/binding/SimpleJAXXObjectBinding.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/binding/SimpleJAXXObjectBinding.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.binding; +package org.nuiton.jaxx.runtime.binding; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; /** * Created: 5 déc. 2009 diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java index 49c9c49..afe0a33 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DataContext.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java index cb8d4f9..da14046 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContext.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java index 4ec3b53..5b71957 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContext.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXContextEntryDef.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXContextEntryDef.java index ca8fbea..d64dde8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXContextEntryDef.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXContext; import java.io.Serializable; import java.util.List; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXInitialContext.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXInitialContext.java index 9422379..bb2a685 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/context/JAXXInitialContext.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; import java.util.Map.Entry; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/css/DataBinding.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/css/DataBinding.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java index 4409557..89054be 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/css/DataBinding.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/DataBinding.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.css; +package org.nuiton.jaxx.runtime.css; /** * Represents a data binding bound to an attribute at runtime. Used by {@link Pseudoclasses} to keep diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java index 4fc3536..b2ea026 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Pseudoclasses.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.css; +package org.nuiton.jaxx.runtime.css; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; import java.util.ArrayList; import java.util.Collections; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java index 015996f..41b7b9f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Rule.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.css; +package org.nuiton.jaxx.runtime.css; import java.util.Map; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java index dfff9ed..954f339 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Selector.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.css; +package org.nuiton.jaxx.runtime.css; public class Selector implements java.io.Serializable, Comparable<Selector> { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Stylesheet.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Stylesheet.java index ebc182a..bc8568c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/css/Stylesheet.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.css; +package org.nuiton.jaxx.runtime.css; public class Stylesheet implements java.io.Serializable { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/spi/UIHandler.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/spi/UIHandler.java similarity index 92% rename from jaxx-runtime/src/main/java/jaxx/runtime/spi/UIHandler.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/spi/UIHandler.java index 780e5c3..9f00bf9 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/spi/UIHandler.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/spi/UIHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.spi; +package org.nuiton.jaxx.runtime.spi; /* * #%L @@ -22,7 +22,7 @@ package jaxx.runtime.spi; * #L% */ -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; /** * Created on 11/26/13. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Application.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/Application.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java index a1ad913..1352701 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Application.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Application.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JFrame; import javax.swing.SwingUtilities; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java index 11c7e3b..bd32214 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import org.jdesktop.jxlayer.JXLayer; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI2.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI2.java index 54fa1b1..e8de4ef 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/BlockingLayerUI2.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import org.jdesktop.jxlayer.JXLayer; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java index f0fa1a9..7b01b64 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java index af8b87c..a07a7ca 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/CardLayout2Ext.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentMover.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentMover.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java index cfb956d..120052e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentMover.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentMover.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java index 3a7c11e..e2254de 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/ComponentResizer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/GBC.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/GBC.java index 4bc3230..64881bc 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/GBC.java @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import java.awt.GridBagConstraints; import java.awt.Insets; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBox.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBox.java index 5dc3517..cc26da5 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBox.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JPanel; import java.awt.Insets; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxBeanInfo.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxBeanInfo.java index 4302590..a0202b1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxBeanInfo.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JPanel; import javax.swing.SwingConstants; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxLayout.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxLayout.java index fff4baf..7044f95 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/HBoxLayout.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.SwingConstants; import java.awt.Component; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java index c62737b..38875ec 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Item.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.event.SwingPropertyChangeSupport; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java index 125ec3e..9deeba0 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXButtonGroup.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java index dc44c2e..101a062 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXComboBox.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java index eb6b720..d39bd8c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXList.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.AbstractListModel; import javax.swing.DefaultListCellRenderer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTab.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTab.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTab.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTab.java index 8e60bcb..6ff64bf 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTab.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTab.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; /** @author Tony Chemit - chemit@codelutin.com */ public class JAXXTab extends Table { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXToggleButton.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXToggleButton.java index 98f4672..826755d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXToggleButton.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JToggleButton; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java index f127ad3..9dc26e7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXTree.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JTree; import javax.swing.event.TreeModelEvent; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JTables.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JTables.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/JTables.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JTables.java index f5d93c6..21370e1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JTables.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/JTables.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java index e88f0af..a9c40b3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/OneClicListSelectionModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Spacer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Spacer.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/Spacer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Spacer.java index b87dff2..7352cd7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Spacer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Spacer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JComponent; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java index 8bc9821..24893c1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfo.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.Icon; import javax.swing.JComponent; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java index 0229b3e..4289ca7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/TabInfoPropertyChangeListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.Icon; import javax.swing.JTabbedPane; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java index b93d36b..df4a3b7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/Table.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JPanel; import java.awt.GridBagConstraints; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBox.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBox.java index 46841b9..ef42b18 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBox.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JPanel; import java.awt.Insets; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxBeanInfo.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxBeanInfo.java index 95633e5..825b4a4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxBeanInfo.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JPanel; import javax.swing.SwingConstants; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxLayout.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxLayout.java index a063939..f0ca7e4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/VBoxLayout.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.SwingConstants; import java.awt.Component; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java index 8b4b64f..f0951e4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionExecutor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.application; +package org.nuiton.jaxx.runtime.swing.application; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java index 46535cf..196c686 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ActionWorker.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.application; +package org.nuiton.jaxx.runtime.swing.application; import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ApplicationRunner.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ApplicationRunner.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java index 2c7614b..eccf3e4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ApplicationRunner.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/application/ApplicationRunner.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.application; +package org.nuiton.jaxx.runtime.swing.application; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java index 89f6618..08eb6a2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/BooleanCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/BooleanCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import java.awt.Component; import javax.swing.AbstractCellEditor; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ClassCellEditor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ClassCellEditor.java index 5b37baf..7ce09a4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ClassCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import org.apache.commons.beanutils.Converter; import org.nuiton.converter.ConverterUtil; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java index b1a2e18..5b3d9b3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ColorCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/ColorCellEditor.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; /* * #%L * JAXX :: Runtime diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java index 1b99aa4..487ccb4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/EnumEditor.java @@ -38,7 +38,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * ##%* */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import org.nuiton.util.ReflectUtil; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/LocaleEditor.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/LocaleEditor.java index 2238611..747242b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/LocaleEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import org.nuiton.i18n.I18n; import org.nuiton.i18n.I18nStore; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/MyDefaultCellEditor.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/MyDefaultCellEditor.java index fa9f2dc..50d9eff 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/editor/MyDefaultCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import javax.swing.DefaultCellEditor; import javax.swing.Icon; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java index 0e5b28f..c13c9b8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpBroker.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.help; +package org.nuiton.jaxx.runtime.swing.help; import com.google.common.base.Preconditions; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.awt.visitor.BuildTreeVisitor; -import jaxx.runtime.awt.visitor.ComponentTreeNode; -import jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.awt.visitor.BuildTreeVisitor; +import org.nuiton.jaxx.runtime.awt.visitor.ComponentTreeNode; +import org.nuiton.jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUI.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUI.java index 7736f87..f02173f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUI.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.help; +package org.nuiton.jaxx.runtime.swing.help; import java.awt.Component; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUIHandler.java similarity index 91% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUIHandler.java index 4316991..2988a4f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/help/JAXXHelpUIHandler.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.help; +package org.nuiton.jaxx.runtime.swing.help; -import jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXContext; /** @author Tony Chemit - chemit@codelutin.com */ public interface JAXXHelpUIHandler { diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java index d1dd614..30bbcbd 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractGenericListSelectionModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; import com.google.common.collect.Lists; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractSelectionListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractSelectionListModel.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractSelectionListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractSelectionListModel.java index ee9b0be..0e72d2a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/AbstractSelectionListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/AbstractSelectionListModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxModel2.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxModel2.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxModel2.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxModel2.java index 17887a9..895cf4b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxModel2.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxModel2.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java index 35852b2..9eaca5f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/ComboBoxSelectionEvent.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java index 85586f2..c3f08f8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListEvent.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListEvent.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; import java.util.Collection; import java.util.EventObject; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListListener.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListListener.java index d1f469d..80211e0 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListListener.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; import java.util.EventListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListModel.java index b0514b3..231be4f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; import com.google.common.collect.Lists; import java.util.Collection; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java index 2e3e58e..07714f8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/GenericListSelectionModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/GenericListSelectionModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; import javax.swing.DefaultListModel; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java index f56bda5..87aabbc 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java index 51dd52f..6388423 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxDefaultListModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java index fffc405..a58ebba 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java index a81989d..dfd40d4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/JaxxFilterableListModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java index 05c26f0..ad304e3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemListener.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java index 053a119..91eb858 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/model/WillChangeSelectedItemVetoException.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.model; +package org.nuiton.jaxx.runtime.swing.model; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavBridge.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavBridge.java index ca5e679..d21f56e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavBridge.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav; +package org.nuiton.jaxx.runtime.swing.nav; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeNode; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavDataProvider.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavDataProvider.java similarity index 91% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavDataProvider.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavDataProvider.java index 47f192f..055661a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavDataProvider.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavDataProvider.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav; +package org.nuiton.jaxx.runtime.swing.nav; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; /** * Contract of provider of data. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java index 1c9710d..ae091ef 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavHelper.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav; +package org.nuiton.jaxx.runtime.swing.nav; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNode.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNode.java index eb9ef63..523bb0e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNode.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav; +package org.nuiton.jaxx.runtime.swing.nav; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import javax.swing.tree.TreeNode; import java.io.Serializable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java index 6f0c10f..09c56f1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/NavNodeChildLoador.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav; +package org.nuiton.jaxx.runtime.swing.nav; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/package.html diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java index c311361..7b20f49 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.tree; +package org.nuiton.jaxx.runtime.swing.nav.tree; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavNode; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeBridge.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeBridge.java index bfeb4fe..3727d56 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeBridge.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.tree; +package org.nuiton.jaxx.runtime.swing.nav.tree; -import jaxx.runtime.swing.nav.NavBridge; +import org.nuiton.jaxx.runtime.swing.nav.NavBridge; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java index 62a0bb6..cb38c9e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeHelper.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.tree; +package org.nuiton.jaxx.runtime.swing.nav.tree; -import jaxx.runtime.swing.nav.NavHelper; +import org.nuiton.jaxx.runtime.swing.nav.NavHelper; import javax.swing.JTree; import javax.swing.event.TreeSelectionListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNode.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNode.java index 492e355..7f1911f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNode.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.tree; +package org.nuiton.jaxx.runtime.swing.nav.tree; -import jaxx.runtime.swing.nav.NavBridge; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavNode; +import org.nuiton.jaxx.runtime.swing.nav.NavBridge; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java similarity index 91% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java index 30a8da4..8f62fb6 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/NavTreeNodeChildLoador.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.tree; +package org.nuiton.jaxx.runtime.swing.nav.tree; -import jaxx.runtime.swing.nav.NavNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavNodeChildLoador; import javax.swing.tree.DefaultTreeModel; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/tree/package.html diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java index 4d6fff1..c7ba09b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.treetable; +package org.nuiton.jaxx.runtime.swing.nav.treetable; -import jaxx.runtime.swing.nav.NavBridge; +import org.nuiton.jaxx.runtime.swing.nav.NavBridge; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.treetable.TreeTableNode; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java index 56ed735..adb8101 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.treetable; +package org.nuiton.jaxx.runtime.swing.nav.treetable; -import jaxx.runtime.swing.nav.NavHelper; -import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; +import org.nuiton.jaxx.runtime.swing.nav.NavHelper; +import org.nuiton.jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java index 73c7464..8d1276e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.treetable; +package org.nuiton.jaxx.runtime.swing.nav.treetable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java index 949f564..e3ccbe2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.treetable; +package org.nuiton.jaxx.runtime.swing.nav.treetable; -import jaxx.runtime.swing.nav.NavBridge; -import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavNode; +import org.nuiton.jaxx.runtime.swing.nav.NavBridge; +import org.nuiton.jaxx.runtime.swing.nav.NavDataProvider; +import org.nuiton.jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java similarity index 91% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java index 5ec9afb..ab17bea 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/NavTreeTableNodeChildLoador.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.nav.treetable; +package org.nuiton.jaxx.runtime.swing.nav.treetable; -import jaxx.runtime.swing.nav.NavNodeChildLoador; +import org.nuiton.jaxx.runtime.swing.nav.NavNodeChildLoador; /** * Implementation for tree table of {@link NavNodeChildLoador} diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/nav/treetable/package.html diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java index e62383e..f1b992b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/BooleanCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import com.google.common.base.Predicate; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java index f902461..ff024b8 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ClassTableCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; /* * #%L * JAXX :: Runtime diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java index 0a40211..563b359 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/ColorCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/ColorCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; /* * #%L * JAXX :: Runtime diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java index e29b052..48f45b2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java index 38e1c93..b98803d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java index 318a920..66e08d7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorProvider; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java index 9ce0d53..2c4df17 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java index e7e58c9..0fc208c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumEditorRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumEditorRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java index 656447b..6ddc8ee 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumEditorRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumEditorRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java index 9fc1c10..c7ca030 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java index 8770d45..60a10ff 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/FilteredDecoratorListCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import java.awt.Component; import java.util.regex.Matcher; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java index 1a187b4..5ca59ca 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import javax.swing.JComponent; import javax.swing.JTable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java index f0853e0..88cf004 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java index 49a5c0c..a9405de 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java index be63ebc..4235e6c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JSplitPaneState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JSplitPaneState.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JSplitPaneState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JSplitPaneState.java index 4bf7495..93d395f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JSplitPaneState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JSplitPaneState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTabbedPaneState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTabbedPaneState.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTabbedPaneState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTabbedPaneState.java index d9c38a8..5954c15 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JTabbedPaneState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JTabbedPaneState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JXTableSwingSessionState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JXTableSwingSessionState.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JXTableSwingSessionState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JXTableSwingSessionState.java index 7f6d0ff..f2f73f3 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/JXTableSwingSessionState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/JXTableSwingSessionState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/State.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/State.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/State.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/State.java index a91ef0f..e2cfc7d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/State.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/State.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java index 86bb4c3..fb9af50 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/SwingSession.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; import com.google.common.collect.Maps; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/WindowState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/WindowState.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/session/WindowState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/WindowState.java index 7ddd54f..71bee91 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/WindowState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/session/WindowState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/BusyChangeListener.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/BusyChangeListener.java index 258cf2a..ce97a27 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/BusyChangeListener.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/BusyChangeListener.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; -import jaxx.runtime.swing.BlockingLayerUI; +import org.nuiton.jaxx.runtime.swing.BlockingLayerUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java index 113bbb7..9c2c9c2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardModel.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStep.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStep.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStep.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStep.java index e17c770..8125fc1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStep.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStep.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; import java.io.Serializable; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStepUI.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStepUI.java index 578007c..8b7f2c9 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardStepUI.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; /** * Le contrat d'une ui d'étape. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUI.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUI.java index fb50ea6..042037f 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUI.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; import javax.swing.JTabbedPane; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java index 6e3b96a..5e62905 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUILancher.java @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import javax.swing.ImageIcon; import java.awt.Window; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java index ddf6910..a158fe6 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/WizardUtil.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard; +package org.nuiton.jaxx.runtime.swing.wizard; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java index e82dead..433eb01 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtModel.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; -import jaxx.runtime.swing.wizard.WizardModel; +import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStep.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStep.java similarity index 93% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStep.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStep.java index f2981a1..5c9f963 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStep.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStep.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; -import jaxx.runtime.swing.wizard.WizardStep; -import jaxx.runtime.swing.wizard.WizardStepUI; +import org.nuiton.jaxx.runtime.swing.wizard.WizardStep; +import org.nuiton.jaxx.runtime.swing.wizard.WizardStepUI; /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java index 1ca65c7..d33e23c 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtStepModel.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUI.java similarity index 94% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUI.java index cbc53fa..5ea8ef0 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUI.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; -import jaxx.runtime.swing.wizard.WizardUI; +import org.nuiton.jaxx.runtime.swing.wizard.WizardUI; /** * Contrat a respecter pour une ui de wizard. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java index cd5d185..2a13d49 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; -import jaxx.runtime.swing.wizard.WizardModel; -import jaxx.runtime.swing.wizard.WizardUI; -import jaxx.runtime.swing.wizard.WizardUtil; +import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; +import org.nuiton.jaxx.runtime.swing.wizard.WizardUI; +import org.nuiton.jaxx.runtime.swing.wizard.WizardUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardState.java b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardState.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardState.java rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardState.java index 12e9fb4..06f4336 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardState.java +++ b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/WizardState.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.wizard.ext; +package org.nuiton.jaxx.runtime.swing.wizard.ext; /** * Pour caractériser l'état d'une opération. diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/ext/package.html diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html b/jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/package.html similarity index 100% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/package.html rename to jaxx-runtime/src/main/java/org/nuiton/jaxx/runtime/swing/wizard/package.html diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/UtilTest.java b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/UtilTest.java similarity index 95% rename from jaxx-runtime/src/test/java/jaxx/runtime/UtilTest.java rename to jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/UtilTest.java index dd207cc..c062bef 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/UtilTest.java +++ b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/UtilTest.java @@ -19,10 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime; +package org.nuiton.jaxx.runtime; import org.junit.Assert; import org.junit.Test; +import org.nuiton.jaxx.runtime.JAXXUtil; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/context/DataContextEntryIteratorTest.java b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DataContextEntryIteratorTest.java similarity index 97% rename from jaxx-runtime/src/test/java/jaxx/runtime/context/DataContextEntryIteratorTest.java rename to jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DataContextEntryIteratorTest.java index 81ab569..ae28906 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/context/DataContextEntryIteratorTest.java +++ b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DataContextEntryIteratorTest.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.context.DataContext.DataContextEntry; -import jaxx.runtime.context.DataContext.DataContextEntryIterator; +import org.nuiton.jaxx.runtime.context.DataContext.DataContextEntry; +import org.nuiton.jaxx.runtime.context.DataContext.DataContextEntryIterator; import org.junit.BeforeClass; import org.junit.Test; diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java similarity index 96% rename from jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java rename to jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java index 378447e..76736eb 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java +++ b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultApplicationContextTest.java @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; -import jaxx.runtime.context.DefaultApplicationContext.MethodAccess; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.context.DefaultApplicationContext.AutoLoad; +import org.nuiton.jaxx.runtime.context.DefaultApplicationContext.MethodAccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContextTest.java similarity index 99% rename from jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java rename to jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContextTest.java index 006abdf..ffbe55d 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java +++ b/jaxx-runtime/src/test/java/org/nuiton/jaxx/runtime/context/DefaultJAXXContextTest.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.context; +package org.nuiton.jaxx.runtime.context; -import jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.JAXXContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/jaxx-runtime/src/test/resources/log4j.properties b/jaxx-runtime/src/test/resources/log4j.properties index 6c08bb0..1149532 100644 --- a/jaxx-runtime/src/test/resources/log4j.properties +++ b/jaxx-runtime/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-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java index 10bcae3..30bc2fa 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SimpleBeanValidatorMessageTableModel.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.validator.swing; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java index 9e7723b..136e1e2 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableModel.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.validator.swing; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java index d5c0304..7fc6fe9 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageTableMouseListener.java @@ -21,7 +21,7 @@ package org.nuiton.jaxx.validator.swing; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java index 8aa66cd..8b13b84 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingListValidatorMessageWidget.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.validator.swing; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.ComponentMover; -import jaxx.runtime.swing.ComponentResizer; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.ComponentMover; +import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java index acbcaf9..8341a84 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageTableModel.java @@ -21,7 +21,7 @@ */ package org.nuiton.jaxx.validator.swing; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java index c2b2017..3344961 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorMessageWidget.java @@ -23,9 +23,9 @@ package org.nuiton.jaxx.validator.swing; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.ComponentMover; -import jaxx.runtime.swing.ComponentResizer; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.ComponentMover; +import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java index cde6092..197042e 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/SwingValidatorUtil.java @@ -23,9 +23,9 @@ package org.nuiton.jaxx.validator.swing; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.validator.JAXXValidator; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.validator.swing.meta.Validator; import org.nuiton.jaxx.validator.swing.meta.ValidatorField; import org.nuiton.jaxx.validator.swing.unified.UnifiedValidatorMessage; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java index b10cb9a..b00c7a3 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableModel.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.validator.swing.unified; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidator; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java index 3be434d..84a304f 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageTableMouseListener.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.validator.swing.unified; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java index f44ce11..19cdd58 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageUtil.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.validator.swing.unified; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.nuiton.jaxx.validator.swing.SwingListValidatorTableEditorModelListener; import org.nuiton.jaxx.validator.swing.SwingValidator; diff --git a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java index 8a937fa..5ab7db4 100644 --- a/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java +++ b/jaxx-validator/src/main/java/org/nuiton/jaxx/validator/swing/unified/UnifiedValidatorMessageWidget.java @@ -22,9 +22,9 @@ package org.nuiton.jaxx.validator.swing.unified; * #L% */ -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.ComponentMover; -import jaxx.runtime.swing.ComponentResizer; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.ComponentMover; +import org.nuiton.jaxx.runtime.swing.ComponentResizer; import org.nuiton.jaxx.validator.swing.SwingListValidatorDataLocator; import org.nuiton.jaxx.validator.swing.SwingListValidatorMessageTableRenderer; import org.nuiton.jaxx.validator.swing.SwingValidator; diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java index ed7de5e..fc4db51 100644 --- a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.widgets.about; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.io.Resources; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.util.Resource; import javax.swing.AbstractAction; diff --git a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java index 3a07fc5..de2ba38 100644 --- a/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java +++ b/jaxx-widgets-common/src/main/java/org/nuiton/jaxx/widgets/DecoratorPopupHandler.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets; * #L% */ -import jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.MultiJXPathDecorator; diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx index 7584599..44c1507 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.runtime.swing.HidorButton javax.swing.DefaultBoundedRangeModel org.jdesktop.swingx.JXDatePicker diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java index 97a2f29..2ab50b8 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.widgets.datetime; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.MutateOnConditionalPropertyChangeListener; diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx index 70cd67d..ef3f99e 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditor.jaxx @@ -28,7 +28,7 @@ java.io.Serializable java.awt.BorderLayout - jaxx.runtime.swing.HidorButton + org.nuiton.jaxx.runtime.swing.HidorButton javax.swing.DefaultBoundedRangeModel </import> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java index f215103..1fab880 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/TimeEditorHandler.java @@ -24,7 +24,7 @@ package org.nuiton.jaxx.widgets.datetime; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.MutateOnConditionalPropertyChangeListener; diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java index 104e8dd..f8848b5 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/DateTimeEditorState.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.datetime.session; * #L% */ -import jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; /** diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/TimeEditorState.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/TimeEditorState.java index 25a87a7..c32f9fc 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/TimeEditorState.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/session/TimeEditorState.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.datetime.session; * #L% */ -import jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.widgets.datetime.TimeEditor; /** diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java index 1cd53a1..17dbeaf 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DdCoordinate; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java index 3a5710b..0eeb66e 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DmdCoordinate; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java index 433277f..89799eb 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DmsCoordinate; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index e690d53..73198d1 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -22,7 +22,7 @@ <Table id="coordinateEditorTopPanel" insets="0"> <import> - jaxx.runtime.swing.CardLayout2Ext + org.nuiton.jaxx.runtime.swing.CardLayout2Ext org.nuiton.jaxx.widgets.gis.CoordinateFormat java.io.Serializable </import> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java index a29bde4..26755f3 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java @@ -23,8 +23,8 @@ package org.nuiton.jaxx.widgets.gis.absolute; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; import org.nuiton.jaxx.widgets.gis.CoordinateFormat; import org.nuiton.util.beans.BeanUtil; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java index 6673dc5..8a14477 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.signed; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DdCoordinate; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java index 8c668c0..e3c3d23 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.signed; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DmdCoordinate; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java index 4bc13b9..3eed7bd 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java @@ -23,7 +23,7 @@ package org.nuiton.jaxx.widgets.gis.signed; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.gis.DmsCoordinate; diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java index fad29de..b629122 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorTest.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.widgets.gis.DdCoordinate; import javax.swing.JButton; diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java index 8b38754..5e87dea 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorTest.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.gis.absolute; * #L% */ -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.nuiton.jaxx.widgets.gis.DmsCoordinate; import javax.swing.JButton; diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java index 8da7d17..289ff96 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorHandler.java @@ -25,7 +25,7 @@ package org.nuiton.jaxx.widgets.number; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx index 8a3f7a5..b9c670e 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleList.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<Table genericType='O extends Serializable' implements='jaxx.runtime.bean.BeanTypeAware<O>'> +<Table genericType='O extends Serializable' implements='org.nuiton.jaxx.runtime.bean.BeanTypeAware<O>'> <import> org.nuiton.decorator.JXPathDecorator diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java index c7880dc..7472463 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListHandler.java @@ -26,12 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.model.JaxxFilterableListModel; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.swing.model.JaxxFilterableListModel; +import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import org.nuiton.jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorUtil; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java index e434c3d..1aa2465 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/FilterableDoubleListModel.java @@ -22,8 +22,8 @@ package org.nuiton.jaxx.widgets.select; * #L% */ -import jaxx.runtime.swing.model.JaxxDefaultListModel; -import jaxx.runtime.swing.model.JaxxFilterableListModel; +import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel; +import org.nuiton.jaxx.runtime.swing.model.JaxxFilterableListModel; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.jaxx.widgets.ModelToBean; diff --git a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java index 12d5ac7..0c3ebbf 100644 --- a/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java +++ b/jaxx-widgets-select/src/main/java/org/nuiton/jaxx/widgets/select/session/FilterableDoubleListState.java @@ -22,7 +22,7 @@ package org.nuiton.jaxx.widgets.select.session; * #L% */ -import jaxx.runtime.swing.session.State; +import org.nuiton.jaxx.runtime.swing.session.State; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java deleted file mode 100644 index d873aed..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * 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.runtime.swing.editor; - -import jaxx.runtime.swing.JAXXButtonGroup; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; - -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.JToggleButton; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.Arrays; -import java.util.Collection; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; - -/** - * Handler of ui {@link I18nEditor}. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 2.0 - */ -public class I18nEditorHandler implements PropertyChangeListener, ActionListener { - - private static final Log log = LogFactory.getLog(I18nEditorHandler.class); - - protected final I18nEditor ui; - - public I18nEditorHandler(I18nEditor ui) { - this.ui = ui; - } - - public static final String DEFAULT_SELECTED_TOOLTIP = n("i18neditor.selected"); - - public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("i18neditor.unselected"); - - public static final String LOCALES_PROPERTY = "locales"; - - public static final String SELECTED_LOCALE_PROPERTY = "selectedLocale"; - - public static final String SHOW_ICON_PROPERTY = "showIcon"; - - public static final String SHOW_TEXT_PROPERTY = "showText"; - - public static final String SHOW_POPUP_ICON_PROPERTY = "showPopupIcon"; - - public static final String SHOW_POPUP_TEXT_PROPERTY = "showPopupText"; - - public static final String POPUP_BORDER_PROPERTY = "popupBorder"; - - public static final String POPUP_VISIBLE_PROPERTY = "popupVisible"; - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String name = evt.getPropertyName(); - if (log.isDebugEnabled()) { - log.debug(name + " <old:" + evt.getOldValue() + " - new:" + evt.getNewValue() + ">"); - } - log.info(name + " <old:" + evt.getOldValue() + " - new:" + evt.getNewValue() + ">"); - if (LOCALES_PROPERTY.equals(name)) { - Collection<?> newLocales = (Collection<?>) evt.getNewValue(); - // mise a jour de la popup - boolean oldShowText = ui.renderer.isShowText(); - try { - ui.renderer.setShowText(true); - ui.popup.removeAll(); - for (Object o : newLocales) { - Locale l = (Locale) o; - boolean selected = l.equals(ui.selectedLocale); - String text = ui.isShowPopupText() ? ui.renderer.getText(l) : null; - Icon icon = ui.isShowPopupIcon() ? ui.renderer.getIcon(l) : null; - JRadioButtonMenuItem b = new JRadioButtonMenuItem(text, icon, selected); - ui.popup.add(b); - b.addActionListener(ui); - b.putClientProperty("locale", l); - b.setToolTipText(getTip(l)); - b.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, ui.getIndexes()); - b.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, l); - } - } finally { - ui.renderer.setShowText(oldShowText); - ui.popup.invalidate(); - } - return; - } - if (SHOW_ICON_PROPERTY.equals(name)) { - ui.renderer.setShowIcon((Boolean) evt.getNewValue()); - ui.processDataBinding("button.icon"); - return; - } - if (SHOW_TEXT_PROPERTY.equals(name)) { - ui.renderer.setShowText((Boolean) evt.getNewValue()); - ui.processDataBinding("button.text"); - return; - } - if (SHOW_POPUP_ICON_PROPERTY.equals(name)) { - rebuildPopup(); - return; - } - if (SHOW_POPUP_TEXT_PROPERTY.equals(name)) { - rebuildPopup(); - return; - } - if (POPUP_BORDER_PROPERTY.equals(name)) { - ui.popup.setBorder((Border) evt.getNewValue()); - return; - } - if (POPUP_VISIBLE_PROPERTY.equals(name)) { - Boolean newValue = (Boolean) evt.getNewValue(); - if (newValue == null || !newValue) { - if (ui.getPopup() != null && ui.getPopup().isVisible()) { - ui.getPopup().setVisible(false); - } - return; - } - if (!ui.getPopup().isVisible()) { - SwingUtilities.invokeLater(showPopupRunnable); - } - return; - } - if (SELECTED_LOCALE_PROPERTY.equals(name)) { - Locale newLocale = (Locale) evt.getNewValue(); - // mise a jour de la popup - try { - for (Component c : ui.popup.getComponents()) { - if (c instanceof JRadioButtonMenuItem) { - JRadioButtonMenuItem b = (JRadioButtonMenuItem) c; - Locale l = (Locale) b.getClientProperty("locale"); - b.setSelected(newLocale.equals(l)); - } - } - } finally { - ui.popup.invalidate(); - } - } - } - - @Override - public void actionPerformed(ActionEvent event) { - Locale value = (Locale) - ((JComponent) event.getSource()).getClientProperty("locale"); - if (log.isDebugEnabled()) { - log.debug("new locale : " + value); - } - ui.setSelectedLocale(value); - } - - public void loadI18nBundles() { - Locale[] locales = I18n.getStore().getLocales(); - ui.setLocales(Arrays.asList(locales)); - } - - protected void rebuildPopup() { - log.debug("start rebuild"); - try { - for (Component c : ui.popup.getComponents()) { - if (c instanceof JRadioButtonMenuItem) { - JRadioButtonMenuItem b = (JRadioButtonMenuItem) c; - Locale l = (Locale) b.getClientProperty("locale"); - String text = ui.isShowPopupText() ? ui.renderer.getSafeText(l) : null; - Icon icon = ui.isShowPopupIcon() ? ui.renderer.getSafeIcon(l) : null; - b.setIcon(icon); - b.setText(text); - log.debug("text=" + text); - log.debug("icon=" + icon); - } - } - } finally { - ui.popup.invalidate(); - } - } - - protected String getTip(Locale l) { - boolean selected = l.equals(ui.selectedLocale); - return selected ? getSelectedTip(l) : getNotSelectedTip(l); - } - - protected String getSelectedTip(Locale l) { - String selectedTip = ui.getSelectedToolTipText(); - if (selectedTip == null) { - // use default selected tip text - selectedTip = DEFAULT_SELECTED_TOOLTIP; - } - String tip = ui.renderer.getToolTipText(l); - tip = t(selectedTip, tip); - return tip; - } - - protected String getNotSelectedTip(Locale l) { - String selectedTip = ui.getNotSelectedToolTipText(); - if (selectedTip == null) { - // use default not selected tip text - selectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; - } - String tip = ui.renderer.getToolTipText(l); - tip = t(selectedTip, tip); - return tip; - } - - protected Runnable showPopupRunnable = new Runnable() { - @Override - public void run() { - ui.getPopup().pack(); - JToggleButton invoker = ui.getButton(); - Dimension dim = ui.getPopup().getPreferredSize(); - Dimension invokerDim = invoker.getSize(); - ui.getPopup().show(invoker, (int) (invokerDim.getWidth() - dim.getWidth()), invoker.getHeight()); -// getPopup().setVisible(true); - } - }; - - void $afterCompleteSetup() { - ui.addPropertyChangeListener(this); - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java deleted file mode 100644 index adeab17..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java +++ /dev/null @@ -1,623 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * 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.runtime.swing.editor; - -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BeanUtil; - -import javax.swing.JComponent; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; -import javax.swing.text.BadLocationException; -import java.awt.Dimension; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_MODEL; -import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_POPUP_VISIBLE; - -/** - * Le handler de l'éditeur graphique de nombres. - * - * Note: Ce handler n'est pas staless, et chaque ui possède le sien. - * - * @author Tony Chemit - chemit@codelutin.com - * @see NumberEditor - */ -public class NumberEditorHandler { - /** Logger */ - public static final Log log = LogFactory.getLog(NumberEditorHandler.class); - - public static final String VALIDATE_PROPERTY = "validate"; - - /** editor ui */ - protected NumberEditor editor; - - /** the mutator method on the property of boxed bean in the editor */ - protected Method mutator; - - /** the getter method on the property */ - protected Method getter; - - /** a flag to known if mutator accept null value */ - protected Boolean acceptNull; - - protected Class<?> modelType; - - protected Pattern numberPattern; - - public NumberEditorHandler(NumberEditor ui) { - editor = ui; - } - - /** initialise l'ui et les listeners d'évènements. */ - public void init() { - try { -// if (editor.getBean() == null) { -// throw new NullPointerException("can not have a null bean in ui " + editor); -// } - - editor.addPropertyChangeListener(NumberEditor.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String newPattern = (String) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("set new numberPattern" + newPattern); - } - if (StringUtils.isEmpty(newPattern)) { - numberPattern = null; - } else { - numberPattern = Pattern.compile(newPattern); - } - } - }); - - editor.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set showPopupButton" + evt.getNewValue() + " for " + editor.getProperty()); - } - if (editor.getPopup().isVisible()) { - setPopupVisible(false); - } - } - }); - - editor.addPropertyChangeListener(NumberEditor.PROPERTY_AUTO_POPUP, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set auto popup " + evt.getNewValue() + " for " + editor.getProperty()); - } - if (editor.getPopup().isVisible()) { - setPopupVisible(false); - } - } - }); - - editor.addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set new model " + evt.getNewValue() + " for " + editor.getProperty()); - } - setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); - } - }); - editor.addPropertyChangeListener(PROPERTY_POPUP_VISIBLE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - setPopupVisible((Boolean) evt.getNewValue()); - } - }); - editor.getTextField().addMouseListener(new PopupListener()); - - // Initialise le number pattern - if (StringUtils.isNotEmpty(editor.getNumberPattern())) { - numberPattern = Pattern.compile(editor.getNumberPattern()); - } - - // Determine si c'est un float - Class<?> type = editor.getModelType(); - if (editor.getModelType() == null) { - if (editor.getBean() != null) { - type = getGetter().getReturnType(); - } - } - modelType = type; - if (log.isDebugEnabled()) { - log.debug("model type to use = " + modelType); - } - //FIXME le test n'est pas assez fort (on peut avoir un long, short,...) - editor.setUseFloat(!type.equals(Integer.class) && !type.equals(int.class)); - - // Initialise le model - if (editor.getModel() == null) { - if (editor.getBean() != null) { - Number num = (Number) getGetter().invoke(editor.getBean()); - editor.setModel(num); - } - } - - /*if (editor.getResetButton().getIcon() == null) { - editor.getResetButton().setIcon(SwingUtil.createActionIcon("numbereditor-reset")); - } - if (editor.getButton().getIcon() == null) { - editor.getButton().setIcon(SwingUtil.createActionIcon("numbereditor-calculator")); - }*/ - } catch (IllegalAccessException ex) { - log.error(ex); - } catch (IllegalArgumentException ex) { - log.error(ex); - } catch (InvocationTargetException ex) { - log.error(ex); - } - } - - /** - * Affiche ou cache la popup. - * - * @param newValue la nouvelle valeur de visibilité de la popup. - */ - public void setPopupVisible(Boolean newValue) { - - if (log.isTraceEnabled()) { - log.trace(newValue); - } - - if (newValue == null || !newValue) { - editor.getPopup().setVisible(false); - return; - } - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - JComponent invoker = - editor.isShowPopupButton() ? - editor.getShowPopUpButton() : - editor; - Dimension dim = editor.getPopup().getPreferredSize(); - int x = (int) (invoker.getPreferredSize().getWidth() - dim.getWidth()); - editor.getPopup().show(invoker, - x, invoker.getHeight()); - editor.getTextField().requestFocus(); - } - }); - } - - protected String lastValidText; - - /** - * Modifie le modèle de la donnée à éditer à partir d'un evenement clavier - * - * TODO utiliser une filtre sur les donnes en entrees pour ne pas a avoir - * faire les tests ici. - * - * @param s la nouvelle valeur du modèle - */ - public void setModel(String s) { - - String text = editor.getModelText(); - if (text.equals(s)) { - // le modeèle n'a pas changé, rien a faire sur le modèle - if (log.isDebugEnabled()) { - log.debug("modelText is the same, skip !"); - } - return; - } - - if (StringUtils.isNotEmpty(s) && numberPattern != null) { - - // use given number pattern - Matcher matcher = numberPattern.matcher(s); - if (!matcher.matches()) { - - // the current text is not accepted... - if (log.isInfoEnabled()) { - log.info("Does not accept the new number " + s + - ", will reapply lastValidText : " + lastValidText); - } - - String oldText; - if (lastValidText != null) { - - // push back last valid text - oldText = lastValidText; - } else { - oldText = ""; - } - editor.getTextField().setText(oldText); - return; - } - } - - boolean canApply = false; - - boolean endWithDot = false; - - boolean isLess = false; - - Number newValue = null; - - // allow using ',' char - s = s.replaceAll(",", "."); - - if (s.trim().isEmpty()) { - // le champ est vide donc c'est la valeur null a reaffecter - s = null; - canApply = true; - } else if (s.endsWith(".")) { - s += "0"; - endWithDot = true; - } else if (editor.isUseSign() && s.length() == 1 && s.startsWith("-")) { - s = "0"; - isLess = true; - } - - //FIXME tchemit-2014-03-25 Need to bring that bug to commons-lang team - if (s != null && (s.startsWith("0.") && NumberUtils.isNumber(s.substring(1)) || NumberUtils.isNumber(s))) { - - // on a un nombre valide - - try { - Double f = Double.parseDouble(s); - if (!editor.isUseSign() && s.startsWith("-")) { - if (log.isDebugEnabled()) { - log.debug("will skip since can not allow sign on this editor but was " + f); - } - } else { - - if (!editor.isUseFloat() && s.contains(".")) { - if (log.isDebugEnabled()) { - log.debug("will skip since can not allow float on this editor but was " + f); - } - } else { - // ok on peut utilise ce modele - newValue = getRealValue(f); -// if (editor.isUseFloat()) { -// if (getMutator().getParameterTypes()[0] == BigDecimal.class) { -// newValue = BigDecimal.valueOf(f); -// } else { -// newValue = f; -// } -// } else { -// newValue = f.intValue(); -// } - canApply = true; - } - } - - } catch (NumberFormatException e) { - // rien a faire - log.debug(e); - } - } - JTextField field = editor.getTextField(); - - int oldPosition = field.getCaretPosition(); - - if (canApply) { - - if (log.isDebugEnabled()) { - log.debug("can apply new model value : " + newValue); - } - if (isLess) { - editor.setModelText("-"); - return; - } - // on peut mettre a jour le model - editor.setModel(newValue); - if (endWithDot) { - editor.setModelText(s.substring(0, s.length() - 1)); - field.setCaretPosition(oldPosition); - } - - lastValidText = editor.getModelText(); - return; - } - - // on ne peut pas appliquer, on repositionne l'ancien texte - // dans l'éditeur - - if (log.isDebugEnabled()) { - log.debug("invalid text " + s + " reput old text " + text); - } - - field.setText(text); - - lastValidText = text; - if (editor.isSelectAllTextOnError()) { - field.selectAll(); - } else { - if (oldPosition > 0) { - oldPosition--; - } - try { - field.setCaretPosition(oldPosition); - } catch (IllegalArgumentException ex) { - log.debug("CaretPosition is invalid for position : " + oldPosition, ex); - } - } - } - - private Number getRealValue(Double f) { - if (modelType == Integer.class) { - return f.intValue(); - } - if (modelType == Double.class) { - return f; - } - if (modelType == Long.class) { - return f.longValue(); - } - if (modelType == BigInteger.class) { - return new BigInteger(f.longValue() + ""); - } - if (modelType == BigDecimal.class) { - return new BigDecimal(f + ""); - } - if (modelType == Float.class || editor.isUseFloat()) { - return f.floatValue(); - } - return f.intValue(); - } - - /** - * Ajoute le caractère donné à l'endroit où est le curseur dans la zone de - * saisie et met à jour le modèle. - * - * @param s le caractère à ajouter. - */ - public void addChar(String s) { - char c = s.charAt(0); - try { - editor.getTextField().getDocument().insertString(editor.getTextField().getCaretPosition(), c + "", null); - setModel(editor.getTextField().getText()); - //setModel(editor.getModelText() + c); - - } catch (BadLocationException e) { - log.warn(e); - } - } - - /** - * Supprime le caractère juste avant le curseur du modèle (textuel) et - * met à jour la zone de saisie. - */ - public void removeChar() { - String s = editor.getModelText(); - int position = editor.getTextField().getCaretPosition(); - if (position < 1 || s.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("cannot remove when caret on first position or text empty"); - } - // on est au debut du doc, donc rien a faire - return; - } - try { - editor.getTextField().getDocument().remove(position - 1, 1); - } catch (BadLocationException ex) { - // ne devrait jamais arrive vu qu'on a fait le controle... - log.debug(ex); - return; - } - String newText = editor.getTextField().getText(); - if (log.isDebugEnabled()) { - log.debug("text updated : " + newText); - } - position--; - editor.getTextField().setCaretPosition(position); - setModel(newText); - } - - /** - * Permute le signe dans la zone de saisie et - * dans le modèle. - */ - public void toggleSign() { - String newValue = editor.getModelText(); - - if (newValue.startsWith("-")) { - setModel(newValue.substring(1)); - } else { - setModel("-" + newValue); - } - } - - /** @return l'éditeur au quel est rattaché le handler. */ - public NumberEditor getEditor() { - return editor; - } - - protected void setModel(Number oldValue, Number newValue) { - - if (log.isDebugEnabled()) { - log.debug(editor.getProperty() + " on " + editor.getBean().getClass() + " :: " + oldValue + " to " + newValue); - } - - String strValue; - if (newValue == null) { - strValue = ""; - } else { - strValue = newValue + ""; - if (editor.isUseFloat()) { - Float n = Float.parseFloat(strValue); - if ((float) n.intValue() == n) { - strValue = n.intValue() + ""; - } - } - } - - lastValidText = strValue; - editor.setModelText(strValue); - - if (editor.getBean() == null) { - return; - } - - try { - Method mutator = getMutator(); - if (newValue == null && !getAcceptNull()) { - // valeur nulle sur une propriete primitive - // on ne peut pas utiliser la valeur null, mais 0 à la place - newValue = getRealValue(0.0d); -// if (editor.isUseFloat()) { -// if (log.isInfoEnabled()) { -// log.info("use float, check mutator default type = " + mutator.getParameterTypes()[0]); -// } -// if (mutator.getParameterTypes()[0] == BigDecimal.class) { -// newValue = BigDecimal.valueOf(0); -// } else { -// newValue = 0.0f; -//// mutator.invoke(editor.getBean(), 0.0f); -// } -// } else { -// newValue = 0; -//// mutator.invoke(editor.getBean(), 0); -// } - - } //else { -// mutator.invoke(editor.getBean(), newValue); -// } - mutator.invoke(editor.getBean(), newValue); - - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - protected void validate() { - - setPopupVisible(false); - // fire validate property (to be able to notify listeners) - editor.firePropertyChange(VALIDATE_PROPERTY, null, true); - } - - protected class PopupListener extends MouseAdapter { - - @Override - public void mousePressed(MouseEvent e) { - maybeShowPopup(e); - } - - @Override - public void mouseReleased(MouseEvent e) { - maybeShowPopup(e); - } - - protected void maybeShowPopup(MouseEvent e) { - if (!e.isPopupTrigger()) { - return; - } - if (editor.isAutoPopup()) { - if (editor.isPopupVisible()) { - if (!editor.getPopup().isVisible()) { - setPopupVisible(true); - } - // popup already visible - - } else { - // set popup auto - editor.setPopupVisible(true); - - } - } else { - if (editor.isPopupVisible()) { - setPopupVisible(true); - } - } - } - } - - protected Method getMutator() { - if (mutator == null) { - mutator = BeanUtil.getMutator(editor.getBean(), editor.getProperty()); - } - return mutator; - } - - protected Method getGetter() { - if (getter == null) { - Object bean = editor.getBean(); - if (bean == null) { - throw new NullPointerException("could not find bean in " + editor); - } - String property = editor.getProperty(); - if (property == null) { - throw new NullPointerException("could not find property in " + editor); - } - if (log.isDebugEnabled()) { - log.debug("searching accessor for property " + property + " on bean of type " + bean.getClass()); - } - if (log.isTraceEnabled()) { - PropertyDescriptor[] descriptors = PropertyUtils.getPropertyDescriptors(bean); - for (PropertyDescriptor p : descriptors) { - log.trace("property discover " + p.getName() + " reader = " + p.getWriteMethod()); - } - } - try { - PropertyDescriptor descriptor = PropertyUtils.getPropertyDescriptor(bean, property); - getter = descriptor.getReadMethod(); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - return getter; - } - - public Boolean getAcceptNull() { - if (acceptNull == null) { - Method m = getMutator(); - if (m == null) { - // should never happens - throw new IllegalStateException("could not find the mutator"); - } - Class<?> returnType = m.getParameterTypes()[0]; - acceptNull = !returnType.isPrimitive(); - if (log.isDebugEnabled()) { - log.debug(acceptNull + " for mutator " + m.getName() + " type : " + returnType); - } - } - return acceptNull; - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java deleted file mode 100644 index efa1aa2..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java +++ /dev/null @@ -1,556 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * 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.runtime.swing.editor.bean; - -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.util.beans.BeanUtil; - -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JPopupMenu; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; -import javax.swing.text.Document; -import javax.swing.text.JTextComponent; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; - -/** - * Le handler d'un {@link BeanComboBox}. - * - * Note: ce handler n'est pas stateless et n'est donc pas partageable entre plusieurs ui. - * - * @param <O> le type des objet contenus dans le modèle du composant. - * @author Tony Chemit - chemit@codelutin.com - * @see BeanComboBox - */ -public class BeanComboBoxHandler<O> implements PropertyChangeListener { - - public static final Log log = LogFactory.getLog(BeanComboBoxHandler.class); - - /** ui if the handler */ - protected BeanComboBox<O> ui; - - /** the mutator method on the property of boxed bean in the ui */ - protected Method mutator; - - /** the original document of the combbo box editor (keep it to make possible undecorate) */ - protected Document originalDocument; - - /** the convertor used to auto-complete */ - protected ObjectToStringConverter convertor; - - /** the decorator of data */ - protected MultiJXPathDecorator<O> decorator; - - protected boolean init; - - public BeanComboBoxHandler(BeanComboBox<O> ui) { - this.ui = ui; - } - - protected final FocusListener EDITOR_TEXT_COMP0NENT_FOCUSLISTENER = new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - if (log.isDebugEnabled()) { - log.debug("close popup from " + e); - } - ui.getPopup().setVisible(false); - } - - @Override - public void focusLost(FocusEvent e) { - } - }; - - private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { - - @Override - public JPopupMenu getPopup() { - return ui.getPopup(); - } - - @Override - public JComponent getInvoker() { - return ui.getChangeDecorator(); - } - }; - - /** - * Initialise le handler de l'ui - * - * @param decorator le decorateur a utiliser - * @param data la liste des données a gérer - */ - public void init(JXPathDecorator<O> decorator, List<O> data) { - - if (init) { - throw new IllegalStateException("can not init the handler twice"); - } - init = true; - - if (decorator == null) { - throw new NullPointerException("decorator can not be null (for type " + ui.getBeanType() + ")"); - } - - JAXXButtonGroup indexes = ui.getIndexes(); - - this.decorator = BeanUIUtil.createDecorator(decorator); - - final JComboBox combobox = ui.getCombobox(); - - // init combobox renderer base on given decorator - combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); - combobox.addPopupMenuListener(new PopupMenuListener() { - - private O selectedItem; - - boolean canceled = false; - - public void popupMenuWillBecomeVisible(PopupMenuEvent e) { - selectedItem = (O) combobox.getSelectedItem(); - } - - public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { - O newSelectedItem = (O) combobox.getSelectedItem(); - if (canceled) { - ui.setSelectedItem(null); - - } else if ((newSelectedItem == null ^ selectedItem == null) - || (newSelectedItem != null - && !selectedItem.equals(newSelectedItem))) { - ui.setSelectedItem(newSelectedItem); - } - selectedItem = null; - canceled = false; - } - - public void popupMenuCanceled(PopupMenuEvent e) { - canceled = true; - } - }); - - convertor = BeanUIUtil.newDecoratedObjectToStringConverter(this.decorator); - - // keep a trace of original document (to make possible reverse autom-complete) - JTextComponent editorComponent = (JTextComponent) combobox.getEditor().getEditorComponent(); - originalDocument = editorComponent.getDocument(); - - // build popup - popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); - - ui.autoComplete = true; - - ui.addPropertyChangeListener(this); - - // set datas - ui.setData(data); - - // select sort button - indexes.setSelectedButton(ui.getIndex()); - } - - /** Toggle the popup visible state. */ - public void togglePopup() { - popupHandler.togglePopup(); - } - - /** - * @return {@code true} if there is no data in comboBox, - * {@code false} otherwise. - * @since 2.5.9 - */ - public boolean isEmpty() { - return CollectionUtils.isEmpty(ui.getData()); - } - - /** - * Add the given items into the comboBox. - * - * <strong>Note:</strong> The item will be inserted at his correct following - * the selected ordering. - * - * @param items items to add in comboBox. - * @since 2.5.28 - */ - public void addItems(Iterable<O> items) { - - List<O> data = ui.getData(); - - boolean wasEmpty = CollectionUtils.isEmpty(data); - - for (O item : items) { - data.add(item); - } - - updateUI(ui.getIndex(), ui.isReverseSort()); - - fireEmpty(wasEmpty); - } - - /** - * Remove the given items from the comboBox model. - * - * <strong>Note:</strong> If this item was selected, then selection will be - * cleared. - * - * @param items items to remove from the comboBox model - * @since 2.5.28 - */ - public void removeItems(Iterable<O> items) { - - List<O> data = ui.getData(); - - boolean needUpdate = false; - for (O item : items) { - boolean remove = data.remove(item); - - if (remove) { - - // item was found in data - - Object selectedItem = ui.getSelectedItem(); - if (item == selectedItem) { - - // item was selected item, reset selected item then - ui.setSelectedItem(null); - } - - needUpdate = true; - - } - } - - if (needUpdate) { - - updateUI(ui.getIndex(), ui.isReverseSort()); - fireEmpty(false); - } - - } - - /** - * Add the given item into the comboBox. - * - * <strong>Note:</strong> The item will be inserted at his correct following - * the selected ordering. - * - * @param item item to add in comboBox. - * @since 2.5.9 - */ - public void addItem(O item) { - - addItems(Collections.singleton(item)); - } - - /** - * Remove the given item from the comboBox model. - * - * <strong>Note:</strong> If this item was selected, then selection will be - * cleared. - * - * @param item the item to remove from the comboBox model - * @since 2.5.9 - */ - public void removeItem(O item) { - - removeItems(Collections.singleton(item)); - } - - /** - * Sort data of the model. - * - * @since 2.5.10 - */ - public void sortData() { - - // just update UI should do the math of this - updateUI(ui.getIndex(), ui.isReverseSort()); - } - - /** - * Focus combo only if autoFocus ui property is on. - * - * @since 2.8.5 - */ - public void focusCombo() { - if (ui.isAutoFocus()) { - ui.combobox.requestFocusInWindow(); - } - } - - /** - * Modifie l'état autoComplete de l'ui. - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setAutoComplete(Boolean oldValue, Boolean newValue) { - oldValue = oldValue != null && oldValue; - newValue = newValue != null && newValue; - if (oldValue.equals(newValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("autocomplete state : <" + oldValue + " to " + newValue + ">"); - } - if (!newValue) { - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.removeFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); - BeanUIUtil.undecorate(ui.getCombobox(), originalDocument); - } else { - BeanUIUtil.decorate(ui.getCombobox(), convertor); - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.addFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); - } - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setIndex(Integer oldValue, Integer newValue) { - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - updateUI(newValue, ui.isReverseSort()); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - - protected void setSortOrder(Boolean oldValue, Boolean newValue) { - - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - - updateUI(ui.getIndex(), newValue); - } - - protected void updateUI(int index, boolean reversesort) { - - // change decorator context - decorator.setContextIndex(index); - - // keep selected item - Object previousSelectedItem = ui.getSelectedItem(); - Boolean wasAutoComplete = ui.isAutoComplete(); - - if (wasAutoComplete) { - ui.setAutoComplete(false); - } - - // remove autocomplete - if (previousSelectedItem != null) { - ui.getCombobox().setSelectedItem(null); - ui.selectedItem = null; - } - - List<O> data = ui.getData(); - if (ui.isSortable()) { - try { - // Sort data with the decorator jxpath tokens. - DecoratorUtil.sort(decorator, - data, - index, - reversesort); - - } catch (Exception eee) { - log.warn(eee.getMessage(), eee); - } - } - - // reload the model - SwingUtil.fillComboBox(ui.getCombobox(), data, null); - - if (wasAutoComplete) { - ui.setAutoComplete(true); - } - - if (previousSelectedItem != null) { - ui.setSelectedItem(previousSelectedItem); - } - - ui.getCombobox().requestFocus(); - } - - /** - * Modifie la valeur sélectionnée dans la liste déroulante. - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setSelectedItem(O oldValue, O newValue) { - if (ui.getBean() == null) { - return; - } - - if (newValue == null) { - if (ui.getCombobox().getSelectedItem() == null) { - return; - } - ui.getCombobox().setSelectedItem(null); - - if (ui.isAutoComplete()) { - ui.setAutoComplete(false); - ui.setAutoComplete(true); - } - - if (oldValue == null) { - return; - } - } - if (log.isDebugEnabled()) { - log.debug(ui.getProperty() + " on " + getBeanType() + " :: " + oldValue + " to " + newValue); - } - - BeanUIUtil.invokeMethod(getMutator(), ui.getBean(), (O) newValue); - } - - /** @return le document de l'éditeur avant complétion. */ - public Document getOriginalDocument() { - return originalDocument; - } - - public MultiJXPathDecorator<O> getDecorator() { - return decorator; - } - - /** - * @return get the type of objects contained in the comboBox model. - * @since 2.5.9 - */ - public Class<O> getBeanType() { - Class<O> result = ui.getBeanType(); - if (result == null) { - result = decorator == null ? null : decorator.getType(); - } - return result; - } - - /** - * Obtain the type of objects contained in the comboBox using the model mutator. - * - * @return get the type of objects contained in the comboBox model. - * @deprecated since 2.5.9 (use now method {@link #getBeanType()}) - */ - @Deprecated - public Class<?> getTargetClass() { - Method m = getMutator(); - return m == null ? null : m.getParameterTypes()[0]; - } - - /** @return le mutateur a utiliser pour modifier le bean associé. */ - protected Method getMutator() { - if (mutator == null && ui.getBean() != null && ui.getProperty() != null) { - mutator = BeanUtil.getMutator(ui.getBean(), ui.getProperty()); - } - return mutator; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - - if (BeanComboBox.PROPERTY_SELECTED_ITEM.equals(propertyName)) { - setSelectedItem((O) evt.getOldValue(), (O) evt.getNewValue()); - return; - } - - if (BeanComboBox.PROPERTY_AUTO_COMPLETE.equals(propertyName)) { - - setAutoComplete((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - return; - } - - if (BeanListHeader.PROPERTY_INDEX.equals(propertyName)) { - - // decorator index has changed, force reload of data in ui - setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); - return; - } - - if (BeanListHeader.PROPERTY_REVERSE_SORT.equals(propertyName)) { - - // sort order has changed, force reload of data in ui - setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - return; - } - - if (BeanListHeader.PROPERTY_DATA.equals(propertyName)) { - - // list has changed, force reload of index - setIndex(-1, ui.getIndex()); - - // list has changed, fire empty property - List list = (List) evt.getOldValue(); - fireEmpty(CollectionUtils.isEmpty(list)); - } - } - - protected void fireEmpty(boolean wasEmpty) { - ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, - isEmpty()); - } - -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java deleted file mode 100644 index b0f9516..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java +++ /dev/null @@ -1,565 +0,0 @@ -package jaxx.runtime.swing.editor.bean; - -/* - * #%L - * JAXX :: Widgets - * %% - * 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% - */ - -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.model.JaxxDefaultListModel; -import jaxx.runtime.swing.model.JaxxFilterableListModel; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import jaxx.runtime.swing.renderer.FilteredDecoratorListCellRenderer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.util.beans.BeanUtil; - -import javax.swing.AbstractButton; -import javax.swing.JComponent; -import javax.swing.JList; -import javax.swing.JPopupMenu; -import javax.swing.ListSelectionModel; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import java.awt.event.FocusEvent; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.List; - -/** - * The handler of a {@link BeanDoubleList}. - * - * - * @param <O> the type of the objects contained in the list. - * @author Kevin Morin - kmorin@codelutin.com - * @see BeanDoubleList - * @since 2.5.8 - */ -public class BeanDoubleListHandler<O> implements PropertyChangeListener { - - private static final Log log = LogFactory.getLog(BeanDoubleListHandler.class); - - /** the mutator method on the property of boxed bean in the ui */ - protected Method mutator; - - /** ui of the handler */ - protected BeanDoubleList<O> ui; - - /** the decorator of data */ - protected MultiJXPathDecorator<O> decorator; - - public BeanDoubleListHandler(BeanDoubleList<O> ui) { - this.ui = ui; - } - - private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { - - @Override - public JPopupMenu getPopup() { - return ui.getPopup(); - } - - @Override - public JComponent getInvoker() { - return ui.getChangeDecorator(); - } - }; - - public JPopupMenu getSelectedListPopup(boolean showIt) { - JPopupMenu result; - if (showIt) { - result = ui.getSelectedListPopup(); - } else { - result = null; - } - return result; - } - - /** - * Initializes the handler of the UI - * - * @param decorator the decorator to use to display the data nicely - * @param universe the list of all the available items - * @param selected the list of selected items - */ - public void init(JXPathDecorator<O> decorator, List<O> universe, List<O> selected) { - init(decorator, decorator, universe, selected); - } - /** - * Initializes the handler of the UI - * - * @param decorator the decorator to use to display the data nicely - * @param decorator2 the selected decorator to use to display the selected data nicely (if none, then reuse the first one) - * @param universe the list of all the available items - * @param selected the list of selected items - */ - public void init(JXPathDecorator<O> decorator,JXPathDecorator<O> decorator2, List<O> universe, List<O> selected) { - - if (decorator == null) { - throw new NullPointerException("decorator can not be null (for type " + ui.getBeanType() + ")"); - } - - this.decorator = BeanUIUtil.createDecorator(decorator); - - final BeanDoubleListModel<O> uiModel = ui.getModel(); - - // make sure useMultiSelect is set before filling universe and select lists - uiModel.setUseMultiSelect(ui.getUseMultiSelect()); - - uiModel.setUniverse(universe); - uiModel.setSelected(selected); - - JList universeList = ui.getUniverseList(); - final JList selectedList = ui.getSelectedList(); - - uiModel.addCanRemoveItemsPredicate(new Predicate<List<O>>() { - - @Override - public boolean apply(List<O> o) { - return !o.isEmpty(); - } - }); - - final FilteredDecoratorListCellRenderer universeListCellRenderer - = new FilteredDecoratorListCellRenderer(this.decorator); - universeList.setCellRenderer(universeListCellRenderer); - - if (decorator2 != null) { - decorator2 = BeanUIUtil.createDecorator(decorator2); - } else { - decorator2 = this.decorator; - } - selectedList.setCellRenderer(new DecoratorListCellRenderer(decorator2)); - - // When universe list selection model changed, update the add button enabled property - universeList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - ListSelectionModel source = (ListSelectionModel) e.getSource(); - uiModel.setAddEnabled(!source.isSelectionEmpty()); - } - }); - - // When selected list selection model changed, update the add button enabled property - selectedList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { - @Override - public void valueChanged(ListSelectionEvent e) { - if (!e.getValueIsAdjusting()) { - recomputeButtonStates(); - } - } - }); - - // When selected list model changed, push back selected list to bean - selectedList.getModel().addListDataListener(new ListDataListener() { - - @Override - public void intervalAdded(ListDataEvent e) { - fireSelectionUpdate(); - } - - @Override - public void intervalRemoved(ListDataEvent e) { - fireSelectionUpdate(); - } - - @Override - public void contentsChanged(ListDataEvent e) { - fireSelectionUpdate(); - } - }); - - JAXXButtonGroup indexes = ui.getIndexes(); - - // build popup - popupHandler.preparePopup(null, - null, - ui.getI18nPrefix(), - null, - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); - - ui.addPropertyChangeListener(this); - - final JaxxFilterableListModel<O> filterModel = (JaxxFilterableListModel) uiModel.getUniverseModel(); - - filterModel.setDecorator(this.decorator); - - ui.getFilterField().getDocument().addDocumentListener(new DocumentListener() { - - @Override - public void insertUpdate(DocumentEvent e) { - String text = ui.getFilterField().getText(); - universeListCellRenderer.setFilterText(text); - filterModel.setFilterText(text); - } - - @Override - public void removeUpdate(DocumentEvent e) { - String text = ui.getFilterField().getText(); - universeListCellRenderer.setFilterText(text); - filterModel.setFilterText(text); - } - - @Override - public void changedUpdate(DocumentEvent e) { - String text = ui.getFilterField().getText(); - universeListCellRenderer.setFilterText(text); - filterModel.setFilterText(text); - } - }); - - // select sort button - indexes.setSelectedButton(ui.getIndex()); - - sortData(); - - // force to reload the showSelectPopup binding - ui.processDataBinding(BeanDoubleList.BINDING_SELECTED_LIST_COMPONENT_POPUP_MENU); - } - - public void recomputeButtonStates() { - JList selectedList = ui.getSelectedList(); - BeanDoubleListModel<O> uiModel = ui.getModel(); - - List<O> selectedItems = (List<O>) Lists.newArrayList(selectedList.getSelectedValues()); - boolean removeEnabled = uiModel.computeRemoveEnabled(selectedItems); - - ListSelectionModel selectionModel = selectedList.getSelectionModel(); - int minSelectionIndex = selectionModel.getMinSelectionIndex(); - int maxSelectionIndex = selectionModel.getMaxSelectionIndex(); - - boolean oneSelection = minSelectionIndex == maxSelectionIndex; - - boolean upEnabled = removeEnabled && - oneSelection && - minSelectionIndex > 0; - uiModel.setSelectedUpEnabled(upEnabled); - - boolean downEnabled = removeEnabled && - oneSelection && - minSelectionIndex + 1 < uiModel.getSelectedListSize(); - uiModel.setSelectedDownEnabled(downEnabled); - } - - public void setUniverse(List<O> selection) { - ui.getModel().setUniverse(selection); - sortData(); - } - - public void setSelected(List<O> selection) { - ui.getModel().setSelected(selection); - sortData(); - } - - /** Toggle the popup visible state. */ - public void togglePopup() { - popupHandler.togglePopup(); - } - - /** - * Sort data of the model. - * - * @since 2.5.10 - */ - public void sortData() { - - // just update UI should do the math of this - updateUI(ui.getIndex(), ui.isReverseSort()); - } - - /** - * Move up a selected item. - * - * @param item the selected item - * @since 2.5.26 - */ - public void moveUpSelected(O item) { - ui.getModel().moveUpSelected(item); - ui.getSelectedList().setSelectedValue(item, true); - } - - /** - * Move down a selected item. - * - * @param item the selected item - * @since 2.5.26 - */ - public void moveDownSelected(O item) { - ui.getModel().moveDownSelected(item); - ui.getSelectedList().setSelectedValue(item, true); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setIndex(Integer oldValue, Integer newValue) { - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - AbstractButton button = ui.getIndexes().getButton(newValue); - if (button != null) { - button.setSelected(true); - } - updateUI(newValue, ui.isReverseSort()); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - - protected void setSortOrder(Boolean oldValue, Boolean newValue) { - - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - - updateUI(ui.getIndex(), newValue); - } - - protected void setHighlightFilterText(Boolean newValue) { - FilteredDecoratorListCellRenderer universeListCellRenderer = - (FilteredDecoratorListCellRenderer) ui.getUniverseList().getCellRenderer(); - universeListCellRenderer.setHighlightFilterText(newValue); - ui.getUniverseList().repaint(); - } - - protected void updateUI(int index, boolean reversesort) { - - // change decorator context - decorator.setContextIndex(index); - - List<O> data = (List<O>) Arrays.asList(((JaxxDefaultListModel<O>) ui.getModel().getUniverseModel()).toArray()); - try { - // Sort data with the decorator jxpath tokens. - DecoratorUtil.sort(decorator, - data, - index, - reversesort - ); - - } catch (Exception eee) { - log.warn(eee.getMessage(), eee); - } - - // reload the model - SwingUtil.fillList(ui.getUniverseList(), data, null); - - ui.getUniverseList().requestFocus(); - } - - /** - * When universe list was double clicked, move selected items to selected list. - * - * @param event mouse event - */ - public void onUniverseListClicked(MouseEvent event) { - JList universeList = ui.getUniverseList(); - if (event.getClickCount() == 2) { - int index = universeList.locationToIndex(event.getPoint()); - if (index < 0) { - return; - } - if (!ui.getModel().isAddEnabled()) { - return; - } - O item = (O) universeList.getModel().getElementAt(index); - ui.getModel().addToSelected(item); - - sortData(); - } - } - - /** - * When selected list was double clicked, move selected items to universe list. - * - * @param event mouse event - */ - public void onSelectedListClicked(MouseEvent event) { - - JList selectedList = ui.getSelectedList(); - - if (event.getClickCount() == 2) { - int index = selectedList.locationToIndex(event.getPoint()); - if (index < 0) { - return; - } - if (!ui.getModel().isRemoveEnabled()) { - return; - } - O item = (O) selectedList.getModel().getElementAt(index); - ui.getModel().removeFromSelected(item); - - sortData(); - } - } - - /** When add button was hit, move selected items (from universe list) to selected list. */ - public void select() { - List<O> selection = (List<O>) Arrays.asList(ui.getUniverseList().getSelectedValues()); - ui.getModel().addToSelected(selection); - ui.getUniverseList().clearSelection(); - - sortData(); - } - - /** When remove button was hit, move selected items (from selected list) to universe list. */ - public void unselect() { - List<O> selection = (List<O>) Arrays.asList(ui.getSelectedList().getSelectedValues()); - ui.getModel().removeFromSelected(selection); - ui.getSelectedList().clearSelection(); - - sortData(); - } - - protected void fireSelectionUpdate() { - if (ui.getBean() != null) { - BeanUIUtil.invokeMethod(getMutator(), - ui.getBean(), - ui.getModel().getSelected()); - } - } - - public Method getMutator() { - if (mutator == null && ui.getBackground() != null && ui.getProperty() != null) { - mutator = BeanUtil.getMutator(ui.getBean(), ui.getProperty()); - } - return mutator; - } - - public MultiJXPathDecorator<O> getDecorator() { - return decorator; - } - - /** - * @return get the type of objects contained in the comboBox model. - * @since 2.5.9 - */ - public Class<O> getBeanType() { - Class<O> result = ui.getBeanType(); - if (result == null) { - result = decorator == null ? null : decorator.getType(); - } - return result; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - - if (BeanListHeader.PROPERTY_INDEX.equals(propertyName)) { - - // decorator index has changed, force reload of data in ui - setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); - - } else if (BeanDoubleList.PROPERTY_REVERSE_SORT.equals(propertyName)) { - - // sort order has changed, force reload of data in ui - setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - - } else if (BeanDoubleList.PROPERTY_HIGHLIGHT_FILTER_TEXT.equals(propertyName)) { - - setHighlightFilterText((Boolean) evt.getNewValue()); - } else if (BeanDoubleList.PROPERTY_USE_MULTI_SELECT.equals(propertyName)) { - - ui.getModel().setUseMultiSelect((Boolean) evt.getNewValue()); - } - } - - public void addFilter(Predicate<O> filter) { - ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).addFilter(filter); - } - - public void removeFilter(Predicate<O> filter) { - ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).removeFilter(filter); - } - - public void clearFilters() { - ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).clearFilters(); - } - - public void refreshFilteredElements() { - ((JaxxFilterableListModel) ui.getModel().getUniverseModel()).refreshFilteredElements(); - } - - public void onKeyPressedOnUniverseList(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_ENTER) { - int lastIndice = ui.getUniverseList().getSelectionModel().getLeadSelectionIndex(); - select(); - JList source = (JList) e.getSource(); - if (source.getModel().getSize() > 0) { - source.setSelectedIndex(Math.min(lastIndice, source.getModel().getSize() - 1)); - } else { - ui.getSelectedList().requestFocus(); - } - } - } - - public void onKeyPressedOnSelectedList(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_DELETE) { - int lastIndice = ui.getSelectedList().getSelectionModel().getLeadSelectionIndex(); - unselect(); - JList source = (JList) e.getSource(); - if (source.getModel().getSize() > 0) { - source.setSelectedIndex(Math.min(lastIndice, source.getModel().getSize() - 1)); - ui.getSelectedList().requestFocus(); - } - } - } - - public void selectFirstRowIfNoSelection(FocusEvent event) { - JList list = (JList) event.getSource(); - if (list.isSelectionEmpty()) { - list.setSelectedIndex(0); - } - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java deleted file mode 100644 index 0546060..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java +++ /dev/null @@ -1,350 +0,0 @@ -package jaxx.runtime.swing.editor.bean; - -/* - * #%L - * JAXX :: Widgets - * %% - * 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% - */ - -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; -import jaxx.runtime.swing.model.JaxxDefaultListModel; -import jaxx.runtime.swing.model.JaxxFilterableListModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.beans.AbstractSerializableBean; - -import javax.swing.ListModel; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -/** - * The model of the {@link BeanDoubleList} widget - * - * @param <O> the type of the object in the list - * @author Kevin Morin - kmorin@codelutin.com - * @see BeanDoubleList - * @since 2.5.8 - */ -public class BeanDoubleListModel<O> extends AbstractSerializableBean { - - private static final Log log = LogFactory.getLog(BeanDoubleListModel.class); - - public static final String PROPERTY_ADD_ENABLED = "addEnabled"; - - public static final String PROPERTY_REMOVE_ENABLED = "removeEnabled"; - - public static final String PROPERTY_SELECTED_UP_ENABLED = "selectedUpEnabled"; - - public static final String PROPERTY_SELECTED_DOWN_ENABLED = "selectedDownEnabled"; - - public static final String PROPERTY_USE_MULTI_SELECT = "useMultiSelect"; - - private static final long serialVersionUID = 1L; - - /** List of all the available items */ - protected List<O> universe = new ArrayList<O>(); - - /** Model containing the remaining available items */ - protected JaxxFilterableListModel<O> universeModel = new JaxxFilterableListModel<O>(); - - /** List of the selected items */ - protected List<O> selected = new ArrayList<O>(); - - /** Model containing the selected items */ - protected JaxxDefaultListModel<O> selectedModel = new JaxxDefaultListModel<O>(); - - protected boolean addEnabled; - - protected boolean removeEnabled; - - protected boolean selectedUpEnabled; - - protected boolean selectedDownEnabled; - - protected boolean useMultiSelect; - - protected Collection<Predicate<List<O>>> canRemoveItemsPredicates = new ArrayList<Predicate<List<O>>>(); - - /** - * To get the selected items. - * - * @return a list of O - */ - public List<O> getSelected() { - return selected; - } - - /** - * Sets the list of selected items. - * It fills the model of the list of the selected items with these items - * and removes them from the model of list of the universe. - * - * @param selected a list of O - */ - public void setSelected(List<O> selected) { - //reset all the universe in the universe list - resetUniverse(); - - if (selected == null) { - selected = Lists.newArrayList(); - } - this.selected.clear(); - selectedModel.clear(); - addToSelected(selected); - } - - /** - * To get all the available items. - * - * @return a list of O - */ - public List<O> getUniverse() { - return universe; - } - - /** - * Sets the list of the available items. - * It fills the model of the universe list with these items. - * - * @param universe a list of O - */ - public void setUniverse(List<O> universe) { - if (universe == null) { - this.universe = Lists.newArrayList(); - } else { - this.universe = Lists.newArrayList(universe); - } - resetUniverse(); - } - - protected void resetUniverse() { - universeModel.setAllElements(universe); - } - - public ListModel getSelectedModel() { - return selectedModel; - } - - public ListModel getUniverseModel() { - return universeModel; - } - - /** - * Adds an item to the selected items. - * - * @param item the item to select - */ - public void addToSelected(O item) { - selected.add(item); - selectedModel.addElement(item); - if (!useMultiSelect) { - universeModel.removeElement(item); - } - } - - /** - * Adds a list of items to the selected items. - * - * @param items the list of the items to select - */ - public void addToSelected(List<O> items) { - selected.addAll(items); - for (O item : items) { - - selectedModel.setValueIsAdjusting(true); - universeModel.setValueIsAdjusting(true); - - try { - selectedModel.addElement(item); - if (!useMultiSelect) { - universeModel.removeElement(item); - } - } finally { - selectedModel.setValueIsAdjusting(false); - universeModel.setValueIsAdjusting(false); - } - } - - selectedModel.refresh(); - universeModel.refresh(); - - } - - /** - * Removes an item from the selected items. - * - * @param item the item to unselect - */ - public void removeFromSelected(O item) { - selected.remove(item); - selectedModel.removeElement(item); - if (!useMultiSelect) { - addToUniverseList(item); - } - } - - /** - * Removes a list of items from the list of selected items. - * - * @param items the list of the items to unselect - */ - public void removeFromSelected(List<O> items) { - selected.removeAll(items); - for (O item : items) { - selectedModel.removeElement(item); - if (!useMultiSelect) { - addToUniverseList(item); - } - } - } - - /** - * Move up a selected item. - * - * @param item the selected item - * @since 2.5.26 - */ - public void moveUpSelected(O item) { - int i = selected.indexOf(item); - selected.remove(item); - selectedModel.removeElement(item); - selected.add(i - 1, item); - selectedModel.insertElementAt(item, i - 1); - } - - /** - * Move down a selected item. - * - * @param item the selected item - * @since 2.5.26 - */ - public void moveDownSelected(O item) { - int i = selected.indexOf(item); - selected.remove(item); - selectedModel.removeElement(item); - selected.add(i + 1, item); - selectedModel.insertElementAt(item, i + 1); - } - - public boolean isAddEnabled() { - return addEnabled; - } - - public void setAddEnabled(boolean addEnabled) { - boolean oldValue = isAddEnabled(); - this.addEnabled = addEnabled; - firePropertyChange(PROPERTY_ADD_ENABLED, oldValue, addEnabled); - } - - public boolean isRemoveEnabled() { - return removeEnabled; - } - - public void setRemoveEnabled(boolean removeEnabled) { - boolean oldValue = isRemoveEnabled(); - this.removeEnabled = removeEnabled; - firePropertyChange(PROPERTY_REMOVE_ENABLED, oldValue, removeEnabled); - } - - public boolean isSelectedUpEnabled() { - return selectedUpEnabled; - } - - public void setSelectedUpEnabled(boolean selectedUpEnabled) { - boolean oldValue = isSelectedUpEnabled(); - this.selectedUpEnabled = selectedUpEnabled; - firePropertyChange(PROPERTY_SELECTED_UP_ENABLED, oldValue, selectedUpEnabled); - } - - public boolean isSelectedDownEnabled() { - return selectedDownEnabled; - } - - public void setSelectedDownEnabled(boolean selectedDownEnabled) { - boolean oldValue = isSelectedDownEnabled(); - this.selectedDownEnabled = selectedDownEnabled; - firePropertyChange(PROPERTY_SELECTED_DOWN_ENABLED, oldValue, selectedDownEnabled); - } - - - public boolean isUseMultiSelect() { - return useMultiSelect; - } - - public void setUseMultiSelect(boolean useMultiSelect) { - boolean oldValue = isUseMultiSelect(); - this.useMultiSelect = useMultiSelect; - firePropertyChange(PROPERTY_USE_MULTI_SELECT, oldValue, useMultiSelect); - } - - /** - * Adds an item to the available items list at the right index - * to keep always the same order. - * - * @param item the item to add to the universe list - */ - protected void addToUniverseList(O item) { - // the maximum index where we should insert the item is its index - // in the list of all the available items - int index = universe.indexOf(item); - if (index!=-1) { - // if the index is upper than the size of the list of the remaining available items, - // get the size of this list - int insertionIndex = Math.min(index, universeModel.getSize()); - - // we decrease the index to insert until we meet an item whose index - // in the list of all the available index is lower than the one of the item - // we want to insert - while (insertionIndex > 0) { - O o = universeModel.get(--insertionIndex); - int oIndex = universe.indexOf(o); - if (oIndex < index) { - insertionIndex++; - break; - } - } - universeModel.add(insertionIndex, item); - } - } - - public int getSelectedListSize() { - return selected.size(); - } - - public void addCanRemoveItemsPredicate(Predicate<List<O>> canRemoveItemsPredicate) { - canRemoveItemsPredicates.add(canRemoveItemsPredicate); - } - - public void removeCanRemoveItemsPredicate(Predicate<List<O>> canRemoveItemsPredicate) { - canRemoveItemsPredicates.remove(canRemoveItemsPredicate); - } - - public boolean computeRemoveEnabled(List<O> toRemoveItems) { - boolean result = true; - Iterator<Predicate<List<O>>> iterator = canRemoveItemsPredicates.iterator(); - while (result && iterator.hasNext()) { - result = iterator.next().apply(toRemoveItems); - } - setRemoveEnabled(result); - return result; - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java deleted file mode 100644 index 7a3cbe9..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java +++ /dev/null @@ -1,736 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * 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.runtime.swing.editor.bean; - -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.decorator.MultiJXPathDecorator; -import org.nuiton.util.beans.BeanUtil; - -import javax.swing.AbstractButton; -import javax.swing.ComboBoxEditor; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JPopupMenu; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.text.JTextComponent; -import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; - -/** - * Le handler d'un {@link BeanFilterableComboBox}. - * - * Note: ce handler n'est pas stateless et n'est donc pas partageable entre - * plusieurs ui. - * - * @param <O> le type des objet contenus dans le modèle du composant. - * @author Kevin Morin - morin@codelutin.com - * @see BeanFilterableComboBox - * @since 2.5.12 - */ -public class BeanFilterableComboBoxHandler<O> implements PropertyChangeListener { - - public static final Log log = LogFactory.getLog(BeanFilterableComboBoxHandler.class); - - /** ui if the handler */ - protected BeanFilterableComboBox<O> ui; - - /** the mutator method on the property of boxed bean in the ui */ - protected Method mutator; - - /** the decorator of data */ - protected MultiJXPathDecorator<O> decorator; - - protected boolean init; - - public BeanFilterableComboBoxHandler(BeanFilterableComboBox<O> ui) { - this.ui = ui; - } - - protected final FocusListener EDITOR_TEXT_COMP0NENT_FOCUSLISTENER = new FocusListener() { - @Override - public void focusGained(FocusEvent e) { - if (log.isDebugEnabled()) { - log.debug("close popup from " + e); - } - ui.getPopup().setVisible(false); - } - - @Override - public void focusLost(FocusEvent e) { - } - }; - - protected final DocumentListener EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER = new DocumentListener() { - public void insertUpdate(DocumentEvent e) { - updateFilter(); - } - - public void removeUpdate(DocumentEvent e) { - updateFilter(); - } - - public void changedUpdate(DocumentEvent e) { - updateFilter(); - } - - protected void updateFilter() { - JComboBox comboBox = ui.getCombobox(); - JaxxFilterableComboBoxModel model = (JaxxFilterableComboBoxModel) comboBox.getModel(); - JTextComponent editorComponent = (JTextComponent) comboBox.getEditor().getEditorComponent(); - // hide the popup before setting the filter, otherwise the popup height does not fit - boolean wasPopupVisible = comboBox.isShowing() && comboBox.isPopupVisible(); - if (wasPopupVisible) { - comboBox.hidePopup(); - } - String text = editorComponent.getText(); - if (ui.getSelectedItem() != null) { - text = ""; - } - if (log.isDebugEnabled()) { - log.debug("updateFilter " + text); - } - model.setFilterText(text); - if (wasPopupVisible) { - comboBox.showPopup(); - } - } - - }; - - private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { - @Override - public JPopupMenu getPopup() { - return ui.getPopup(); - } - - @Override - public JComponent getInvoker() { - return ui.getChangeDecorator(); - } - }; - - /** - * Initialise le handler de l'ui - * - * @param decorator le decorateur a utiliser - * @param data la liste des données a gérer - */ - public void init(JXPathDecorator<O> decorator, List<O> data) { - - if (init) { - throw new IllegalStateException("can not init the handler twice"); - } - init = true; - - if (decorator == null) { - throw new NullPointerException("decorator can not be null (for type " + ui.getBeanType() + ")"); - } - - JAXXButtonGroup indexes = ui.getIndexes(); - - this.decorator = BeanUIUtil.createDecorator(decorator); - - final JComboBox combobox = ui.getCombobox(); - final JAXXFilterableComboBoxEditor editor = - new JAXXFilterableComboBoxEditor(ui.getCombobox().getEditor()); - combobox.setEditor(editor); - - editor.getEditorComponent().addMouseListener(new MouseAdapter() { - - @Override - public void mouseClicked(MouseEvent e) { - if (ui.isEnabled()) { - combobox.showPopup(); - } - } - - }); - editor.getEditorComponent().addKeyListener(new KeyAdapter() { - - @Override - public void keyPressed(KeyEvent e) { - if (!ui.isEnabled()) { - e.consume(); - return; - } - if (log.isDebugEnabled()) { - log.debug("keyPressed: " + e.getKeyCode()); - } - if (combobox.isPopupVisible() && ui.isEnterToSelectUniqueUniverse()) { - if (KeyEvent.VK_ENTER == e.getKeyCode() && combobox.getItemCount() == 1) { - // we don't want any other action for this one - if (log.isDebugEnabled()) { - log.debug("ENTER + only one selected item, consume"); - } - combobox.hidePopup(); - e.consume(); - return; - } - } - } - - @Override - public void keyReleased(KeyEvent e) { - if (log.isDebugEnabled()) { - log.debug("keyReleased: " + e.getKeyCode()); - } - if (combobox.isPopupVisible() && KeyEvent.VK_ESCAPE == e.getKeyCode()) { - if (log.isDebugEnabled()) { - log.debug("ESC , hide popup"); - } - e.consume(); - combobox.hidePopup(); - return; - } - if (!combobox.isPopupVisible() && KeyEvent.VK_ESCAPE != e.getKeyCode() && KeyEvent.VK_ENTER != e.getKeyCode()) { - if (log.isDebugEnabled()) { - log.debug("Will show popup, keycode: " + e.getKeyCode()); - } - combobox.showPopup(); - } - // if the typed text does not match the selected item, - // set the selected item to null - Object selectedItem = ui.getSelectedItem(); - String text = editor.getEditorComponent().getText(); - if (log.isDebugEnabled()) { - log.debug("keycode: " + e.getKeyCode() + ", editorText: " + text); - } - if (KeyEvent.VK_ENTER == e.getKeyCode() && ui.isEnterToSelectUniqueUniverse() && combobox.getItemCount() == 1) { - - // auto-select the - if (log.isDebugEnabled()) { - log.debug("Auto-select unique result with *ENTER* key"); - } - combobox.setSelectedIndex(0); - e.consume(); - // edition is done - combobox.hidePopup(); - return; - } - final String selectedItemString; - if (getBeanType().isInstance(selectedItem)) { - selectedItemString = BeanFilterableComboBoxHandler.this.decorator.toString(selectedItem); - } else { - selectedItemString = JAXXUtil.getStringValue(selectedItem); - } - if (selectedItem == null || !selectedItemString.equals(text)) { - unselectItem(); - } - } - - }); - - // init combobox renderer base on given decorator - combobox.setRenderer(new DecoratorListCellRenderer(this.decorator)); - ((JaxxFilterableComboBoxModel) combobox.getModel()).setDecorator(this.decorator); - combobox.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); - combobox.addItemListener(new ItemListener() { - - public void itemStateChanged(ItemEvent e) { - Object item = e.getItem(); - if (e.getStateChange() == ItemEvent.SELECTED) { - if (log.isDebugEnabled()) { - log.debug("itemStateChanged selected " + item + " - " + (item != null ? item.getClass() : null)); - } - combobox.getEditor().getEditorComponent().setForeground(null); - ui.setSelectedItem(item); - - } else { - if (log.isDebugEnabled()) { - log.debug("itemStateChanged deselected " + item + " - " + (item != null ? item.getClass() : null)); - } - combobox.getEditor().getEditorComponent().setForeground(ui.getInvalidComboEditorTextColor()); - } - } - }); - - // build popup - popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); - - setFilterable(false, ui.getFilterable()); - - ui.addPropertyChangeListener(this); - - // set datas - ui.setData(data); - - // select sort button - indexes.setSelectedButton(ui.getIndex()); - } - - /** Toggle the popup visible state. */ - public void togglePopup() { - popupHandler.togglePopup(); - } - - /** - * @return {@code true} if there is no data in comboBox, {@code false} - * otherwise. - */ - public boolean isEmpty() { - return CollectionUtils.isEmpty(ui.getData()); - } - - /** - * Add the given items into the comboBox. - * - * <strong>Note:</strong> The item will be inserted at his correct following - * the selected ordering. - * - * @param items items to add in comboBox. - * @since 2.5.28 - */ - public void addItems(Iterable<O> items) { - - List<O> data = ui.getData(); - - boolean wasEmpty = CollectionUtils.isEmpty(data); - - for (O item : items) { - data.add(item); - } - - updateUI(ui.getIndex(), ui.isReverseSort()); - - fireEmpty(wasEmpty); - } - - /** - * Remove the given items from the comboBox model. - * - * <strong>Note:</strong> If this item was selected, then selection will be - * cleared. - * - * @param items items to remove from the comboBox model - * @since 2.5.28 - */ - public void removeItems(Iterable<O> items) { - - List<O> data = ui.getData(); - - boolean needUpdate = false; - for (O item : items) { - boolean remove = data.remove(item); - - if (remove) { - - // item was found in data - - Object selectedItem = ui.getSelectedItem(); - if (item == selectedItem) { - - // item was selected item, reset selected item then - ui.setSelectedItem(null); - } - - needUpdate = true; - } - } - - if (needUpdate) { - - updateUI(ui.getIndex(), ui.isReverseSort()); - fireEmpty(false); - } - - } - - /** - * Add the given item into the comboBox. - * - * <strong>Note:</strong> The item will be inserted at his correct following - * the selected ordering. - * - * @param item item to add in comboBox. - * @since 2.5.9 - */ - public void addItem(O item) { - - addItems(Collections.singleton(item)); - } - - /** - * Remove the given item from the comboBox model. - * - * <strong>Note:</strong> If this item was selected, then selection will be - * cleared. - * - * @param item the item to remove from the comboBox model - * @since 2.5.9 - */ - public void removeItem(O item) { - - removeItems(Collections.singleton(item)); - } - - /** Sort data of the model. */ - public void sortData() { - - // just update UI should do the math of this - updateUI(ui.getIndex(), ui.isReverseSort()); - } - - /** - * Reset the combo-box; says remove any selected item and filter text. - */ - public void reset() { - if (ui.getSelectedItem() != null) { - ui.setSelectedItem(null); - } else { - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.setText(""); - } - - JComboBox comboBox = ui.getCombobox(); - if (comboBox.isShowing()) { - comboBox.hidePopup(); - } - } - - /** - * Focus combo only if autoFocus ui property is on. - * - * @since 2.8.5 - */ - public void focusCombo() { - if (ui.isAutoFocus()) { - ui.combobox.requestFocusInWindow(); - } - } - - /** - * Modifie l'état filterable de l'ui. - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setFilterable(Boolean oldValue, Boolean newValue) { - oldValue = oldValue != null && oldValue; - newValue = newValue != null && newValue; - if (oldValue.equals(newValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("filterable state : <" + oldValue + " to " + newValue + ">"); - } - if (!newValue) { - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.removeFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); - editorComponent.getDocument().removeDocumentListener(EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER); - ((JaxxFilterableComboBoxModel) ui.getCombobox().getModel()).setFilterText(null); - - } else { - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.addFocusListener(EDITOR_TEXT_COMP0NENT_FOCUSLISTENER); - editorComponent.getDocument().addDocumentListener(EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER); - EDITOR_TEXT_COMPONENT_DOCUMENTLISTENER.changedUpdate(null); - } - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setIndex(Integer oldValue, Integer newValue) { - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - AbstractButton button = ui.getIndexes().getButton(newValue); - if (button != null) { - button.setSelected(true); - } - updateUI(newValue, ui.isReverseSort()); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setSortOrder(Boolean oldValue, Boolean newValue) { - - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - - updateUI(ui.getIndex(), newValue); - } - - protected void updateUI(int index, boolean reversesort) { - - // change decorator context - decorator.setContextIndex(index); - - // keep selected item - Object previousSelectedItem = ui.getSelectedItem(); - - // remove autocomplete - if (previousSelectedItem != null) { - ui.getCombobox().setSelectedItem(null); - ui.selectedItem = null; - } - - List<O> data = ui.getData(); - - if (ui.isSortable() && CollectionUtils.isNotEmpty(data)) { - try { - // Sort data with the decorator jxpath tokens. - DecoratorUtil.sort(decorator, - data, - index, - reversesort); - - } catch (Exception eee) { - log.warn(eee.getMessage(), eee); - } - } - - // reload the model - SwingUtil.fillComboBox(ui.getCombobox(), data, null); - - if (previousSelectedItem != null) { - ui.setSelectedItem(previousSelectedItem); - } - - ui.getCombobox().requestFocus(); - } - - protected void unselectItem() { - if (ui.selectedItem == null) { - return; - } - - ui.selectedItem = null; - BeanUIUtil.invokeMethod(getMutator(), - ui.getBean(), - (O) null); - } - - /** - * Modifie la valeur sélectionnée dans la liste déroulante. - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setSelectedItem(O oldValue, O newValue) { - if (oldValue == null && newValue == null) { - return; - } - - if (!getBeanType().isInstance(newValue)) { - newValue = null; - } - - JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - editorComponent.setText(""); - - if (log.isDebugEnabled()) { - log.debug(ui.getProperty() + " on " + getBeanType() + " :: " + oldValue + " to " + newValue); - } - - BeanUIUtil.invokeMethod(getMutator(), - ui.getBean(), - newValue); - } - - public MultiJXPathDecorator<O> getDecorator() { - return decorator; - } - - /** @return get the type of objects contained in the comboBox model. */ - public Class<O> getBeanType() { - Class<O> result = ui.getBeanType(); - if (result == null) { - result = decorator == null ? null : decorator.getType(); - } - return result; - } - - /** @return le mutateur a utiliser pour modifier le bean associé. */ - protected Method getMutator() { - if (mutator == null && ui.getBean() != null && ui.getProperty() != null) { - mutator = BeanUtil.getMutator(ui.getBean(), ui.getProperty()); - } - return mutator; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - - if (BeanFilterableComboBox.PROPERTY_SELECTED_ITEM.equals(propertyName)) { - setSelectedItem((O) evt.getOldValue(), (O) evt.getNewValue()); - return; - } - - if (BeanFilterableComboBox.PROPERTY_FILTERABLE.equals(propertyName)) { - - setFilterable((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - return; - } - - if (BeanFilterableComboBox.PROPERTY_INDEX.equals(propertyName)) { - - // decorator index has changed, force reload of data in ui - setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); - return; - } - - if (BeanFilterableComboBox.PROPERTY_REVERSE_SORT.equals(propertyName)) { - - // sort order has changed, force reload of data in ui - setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - return; - } - - if (BeanFilterableComboBox.PROPERTY_DATA.equals(propertyName)) { - - // list has changed, force reload of index - setIndex(null, ui.getIndex()); - - // list has changed, fire empty property - List list = (List) evt.getOldValue(); - fireEmpty(CollectionUtils.isEmpty(list)); - } - } - - protected void fireEmpty(boolean wasEmpty) { - ui.firePropertyChange(BeanComboBox.PROPERTY_EMPTY, wasEmpty, - isEmpty()); - } - - /** Editor for the Combobox of the UI - uses the decorator */ - class JAXXFilterableComboBoxEditor implements ComboBoxEditor { - - Object oldItem; - - ComboBoxEditor wrapped; - - public JAXXFilterableComboBoxEditor(ComboBoxEditor wrapped) { - this.wrapped = wrapped; - } - - @Override - public JTextComponent getEditorComponent() { - return (JTextComponent) wrapped.getEditorComponent(); - } - - @Override - public void setItem(Object anObject) { - if (log.isDebugEnabled()) { - log.debug("setItem " + anObject + " - " + (anObject != null ? anObject.getClass() : null)); - } - Object item = anObject; - if (anObject != null) { - if (getBeanType().isInstance(anObject)) { - item = decorator.toString(anObject); - oldItem = anObject; - } - try { - wrapped.setItem(item); - - } catch (IllegalStateException e) { - // fail silently - } - } - } - - @Override - public Object getItem() { - JTextComponent editor = getEditorComponent(); - Object newValue = editor.getText(); - if (log.isDebugEnabled()) { - log.debug("getItem " + newValue + " - " + (newValue != null ? newValue.getClass() : null)); - } - - if (oldItem != null && getBeanType().isInstance(oldItem)) { - // The original value is not a string. Should return the value in it's - // original type. - if (newValue.equals(decorator.toString(oldItem))) { - newValue = oldItem; - } - } - if (log.isDebugEnabled()) { - log.debug("getItem 2 " + newValue + " - " + (newValue != null ? newValue.getClass() : null)); - } - return newValue; - } - - @Override - public void selectAll() { - wrapped.selectAll(); - } - - @Override - public void addActionListener(ActionListener l) { - wrapped.addActionListener(l); - } - - @Override - public void removeActionListener(ActionListener l) { - wrapped.removeActionListener(l); - } - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java deleted file mode 100644 index fdb7295..0000000 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * #%L - * JAXX :: Widgets - * %% - * 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.runtime.swing.editor.bean; - -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.collections.primitives.ArrayIntList; -import org.apache.commons.collections.primitives.IntList; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; -import org.nuiton.decorator.MultiJXPathDecorator; - -import javax.swing.DefaultListModel; -import javax.swing.JComponent; -import javax.swing.JList; -import javax.swing.JPopupMenu; -import javax.swing.ListModel; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.List; - -/** - * Le handler d'un {@link BeanListHeader}. - * - * Note: ce handler n'est pas stateless et n'est donc pas partageable entre - * plusieurs ui. - * - * @param <O> le type des objet contenus dans le modèle du composant. - * @author Tony Chemit - chemit@codelutin.com - * @see BeanListHeader - * @since 2.2 - */ -public class BeanListHeaderHandler<O> implements PropertyChangeListener { - - public static final Log log = - LogFactory.getLog(BeanListHeaderHandler.class); - - /** ui if the handler */ - protected BeanListHeader<O> ui; - - /** the decorator of data */ - protected MultiJXPathDecorator<O> decorator; - - /** flag to mark when handler was init (it can be init only once). */ - protected boolean init; - - private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { - - @Override - public JPopupMenu getPopup() { - return ui.getPopup(); - } - - @Override - public JComponent getInvoker() { - return ui.getChangeDecorator(); - } - }; - - public BeanListHeaderHandler(BeanListHeader<O> ui) { - this.ui = ui; - } - - /** - * Initialise le handler de l'ui - * - * @param decorator le decorateur a utiliser - * @param data la liste des données a gérer - */ - public void init(JXPathDecorator<O> decorator, List<O> data) { - - if (init) { - throw new IllegalStateException("can not init the handler twice"); - } - init = true; - - if (decorator == null) { - throw new NullPointerException("decorator can not be null (for type " + ui.getBeanType() + ")"); - } - - // list could have changed and the complex binding is not registred... - ui.removeDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); - ui.applyDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); - - JAXXButtonGroup indexes = ui.getIndexes(); - - this.decorator = BeanUIUtil.createDecorator(decorator); - - // init combobox renderer base on given decorator - ui.getList().setCellRenderer(new DecoratorListCellRenderer(this.decorator)); - - // build popup - popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupSeparator(), - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); - - ui.addPropertyChangeListener(this); - - // set datas - ui.setData(data); - - // select sort button - indexes.setSelectedButton(ui.getIndex()); - } - - /** Toggle the popup visible state. */ - public void togglePopup() { - popupHandler.togglePopup(); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - protected void setIndex(Integer oldValue, Integer newValue) { - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - updateUI(newValue, ui.isReverseSort()); - } - - /** - * Modifie l'index du décorateur - * - * @param oldValue l'ancienne valeur - * @param newValue la nouvelle valeur - */ - - protected void setSortOrder(Boolean oldValue, Boolean newValue) { - - if (newValue == null || newValue.equals(oldValue)) { - return; - } - if (log.isDebugEnabled()) { - log.debug("check state : <" + oldValue + " to " + newValue + ">"); - } - - updateUI(ui.getIndex(), newValue); - } - - @SuppressWarnings({"unchecked"}) - protected void updateUI(int index, boolean reverseSort) { - - // change decorator context - decorator.setContextIndex(index); - - String expression = decorator.getExpression(); - if (log.isDebugEnabled()) { - log.debug("will use expression (index = " + index + ") : " + - expression); - } - - // get the current selection in list - Object[] selection = ui.getList().getSelectedValues(); - - List<O> datas = ui.getData(); - try { - - // Sort data with the decorator jxpath tokens. - DecoratorUtil.sort(decorator, - datas, - index, - reverseSort); - } catch (Exception e) { - log.warn(e.getMessage(), e); - } - - ui.getList().setValueIsAdjusting(true); - try { - - // reload the model - ListModel listModel = ui.getList().getModel(); - - if (listModel instanceof DefaultListModel) { - DefaultListModel model = (DefaultListModel) listModel; - model.removeAllElements(); - for (O data : datas) { - model.addElement(data); - } - - } else { - - ui.getList().setListData(datas.toArray(new Object[datas.size()])); - } - - // re-apply selection - if (selection.length > 0) { - - // re compute selection (the new data could not contains some - // previously selected items) - IntList newSelection = new ArrayIntList(); - for (Object o : selection) { - if (datas.contains(o)) { - - newSelection.add(datas.indexOf(o)); - } - } - - if (!newSelection.isEmpty()) { - - // there is still a selection to re-apply - int[] ints = newSelection.toArray(new int[newSelection.size()]); - newSelection.clear(); - ui.getList().setSelectedIndices(ints); - } - } - - } finally { - ui.getList().setValueIsAdjusting(false); - } - - ui.getList().requestFocus(); - } - - public MultiJXPathDecorator<O> getDecorator() { - return decorator; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - - if (BeanListHeader.PROPERTY_INDEX.equals(propertyName)) { - - // decorator index has changed, force reload of data in ui - setIndex((Integer) evt.getOldValue(), - (Integer) evt.getNewValue()); - return; - } - - if (BeanListHeader.PROPERTY_REVERSE_SORT.equals(propertyName)) { - - // sort order has changed, force reload of data in ui - setSortOrder((Boolean) evt.getOldValue(), - (Boolean) evt.getNewValue()); - return; - } - - if (BeanListHeader.PROPERTY_DATA.equals(propertyName)) { - - // list has changed, force reload of index - setIndex(-1, ui.getIndex()); - } - - if (BeanListHeader.PROPERTY_LIST.equals(propertyName)) { - - // ui list has changed, replace binding - ui.removeDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); - ui.applyDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); - } - } - - public O getSelectedValue() { - JList list = ui.getList(); - return list == null ? null : (O) list.getSelectedValue(); - } -} diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanel.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanel.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java index 9cb6675..cdcbfa5 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/AboutPanelHandler.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java index 27425f5..e6f9842 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/BaseActionPanel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/BaseActionPanel.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ClockWidget.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ClockWidget.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ClockWidget.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ClockWidget.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ComboToListSelector.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ComboToListSelector.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ComboToListSelector.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/CompoundIcon.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/CompoundIcon.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java index b2f072c..94fa52c 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/CompoundIcon.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/CompoundIcon.java @@ -29,7 +29,7 @@ * * %%Ignore-License%% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import java.awt.*; import javax.swing.*; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUI.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java index 5bc7c88..cd2133e 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUIHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ErrorDialogUIHandler.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import javax.swing.InputMap; import javax.swing.JButton; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/FontSizor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/FontSizor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/FontSizorHandler.java similarity index 96% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/FontSizorHandler.java index a0c85a6..48085c4 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/FontSizorHandler.java @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; -import jaxx.runtime.binding.SimpleJAXXObjectBinding; +import org.nuiton.jaxx.runtime.binding.SimpleJAXXObjectBinding; /** * Handler of ui {@link FontSizor}. diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButton.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java index 2f93ab1..e65a7e4 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButtonHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/HidorButtonHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXDatePicker.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXDatePicker.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXDatePicker.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java index a8df576..f7797ec 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXRuntimeException.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXRuntimeException.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java similarity index 81% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java index 7fbc7b8..696565d 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JAXXWidgetUtil.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JAXXWidgetUtil.java @@ -19,16 +19,16 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.cell.DateCellEditor; -import jaxx.runtime.swing.editor.cell.FileCellEditor; -import jaxx.runtime.swing.editor.cell.KeyStrokeCellEditor; -import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import jaxx.runtime.swing.renderer.DateCellRenderer; +import org.nuiton.jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.swing.editor.cell.DateCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.cell.FileCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.cell.KeyStrokeCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.nuiton.jaxx.runtime.swing.renderer.DateCellRenderer; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JSearchTextField.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/JSearchTextField.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java index 67ec343..1cdd7b6 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/JSearchTextField.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/JSearchTextField.java @@ -29,9 +29,7 @@ * * %%Ignore-License%% */ -package jaxx.runtime.swing; - -import jaxx.runtime.swing.JAXXWidgetUtil; +package org.nuiton.jaxx.runtime.swing; import java.awt.Graphics; import java.awt.Image; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx index c3cd011..e2819a6 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelector.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelector.jaxx @@ -30,8 +30,8 @@ java.beans.PropertyChangeEvent java.beans.PropertyChangeListener javax.swing.event.ListDataListener - jaxx.runtime.swing.model.GenericListModel - jaxx.runtime.swing.model.GenericListListener + org.nuiton.jaxx.runtime.swing.model.GenericListModel + org.nuiton.jaxx.runtime.swing.model.GenericListListener java.util.Collection java.util.Set </import> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java index 581356e..f6fb2b0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListSelectorModel.java @@ -19,15 +19,15 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import com.google.common.collect.Lists; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.Collection; -import jaxx.runtime.swing.model.GenericListListener; -import jaxx.runtime.swing.model.GenericListModel; +import org.nuiton.jaxx.runtime.swing.model.GenericListListener; +import org.nuiton.jaxx.runtime.swing.model.GenericListModel; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListToListSelector.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/ListToListSelector.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/ListToListSelector.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidget.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidget.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java index 38cede6..aab2783 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/MemoryStatusWidgetHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.JLabel; import java.awt.Dimension; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/StatusMessagePanel.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/StatusMessagePanel.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/StatusMessagePanelHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/StatusMessagePanelHandler.java index 14df7f9..0d6cd38 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/StatusMessagePanelHandler.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.runtime.swing; import javax.swing.Timer; import java.awt.Color; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditor.jaxx similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditor.jaxx index e63cc0d..5f7ab2d 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditor.jaxx @@ -21,7 +21,7 @@ --> <BaseActionPanel layout='{new BorderLayout()}'> <import> - jaxx.runtime.swing.BaseActionPanel + org.nuiton.jaxx.runtime.swing.BaseActionPanel org.apache.commons.lang3.StringUtils diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java index d6173ea..be3652b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/FileEditorHandler.java @@ -19,10 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import com.google.common.io.Files; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.runtime.swing.editor.FileEditor; import javax.swing.JDialog; import javax.swing.JFileChooser; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditor.jaxx similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditor.jaxx index 541f363..8b1a15b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/I18nEditor.jaxx @@ -29,8 +29,8 @@ <import> - jaxx.runtime.SwingUtil - + org.nuiton.jaxx.runtime.SwingUtil + java.awt.BorderLayout java.awt.event.ItemEvent java.awt.event.ActionEvent @@ -41,8 +41,8 @@ java.beans.PropertyChangeEvent java.util.Locale - jaxx.runtime.swing.renderer.LocaleListCellRenderer - + org.nuiton.jaxx.runtime.swing.renderer.LocaleListCellRenderer + static org.nuiton.i18n.I18n.n </import> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java index 4240691..9ed18bb 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/KeyStrokeEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/KeyStrokeEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import java.awt.event.KeyEvent; import javax.swing.JTextField; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorPopup.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorPopup.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/NumberEditorPopup.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java index e679dc9..8602530 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java index afee508..ea8af6e 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/SimpleTimeEditorModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditor.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java index 868cc7b..0d25c02 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/TimeEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/TimeEditorHandler.java @@ -20,7 +20,7 @@ * #L% */ -package jaxx.runtime.swing.editor; +package org.nuiton.jaxx.runtime.swing.editor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx index 1a1b5cc..b0fb71b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx @@ -21,11 +21,11 @@ --> <Table fill='both' insets='0' genericType='O' - implements='jaxx.runtime.bean.BeanTypeAware<O>' + implements='org.nuiton.jaxx.runtime.bean.BeanTypeAware<O>' onFocusGained='handler.focusCombo()' onFocusLost='hidePopup()'> <import> - jaxx.runtime.swing.model.JaxxDefaultComboBoxModel + org.nuiton.jaxx.runtime.swing.model.JaxxDefaultComboBoxModel org.nuiton.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanComboBox.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx index a5c20b8..7035f6e 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<Table genericType='O' implements='jaxx.runtime.bean.BeanTypeAware<O>'> +<Table genericType='O' implements='org.nuiton.jaxx.runtime.bean.BeanTypeAware<O>'> <import> org.nuiton.decorator.JXPathDecorator diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanDoubleList.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx index 826f73a..d9260dd 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx @@ -19,11 +19,11 @@ --> <Table fill='both' insets='0' genericType='O' - implements='jaxx.runtime.bean.BeanTypeAware<O>' + implements='org.nuiton.jaxx.runtime.bean.BeanTypeAware<O>' onFocusGained='handler.focusCombo()' onFocusLost='hidePopup()'> <import> - jaxx.runtime.swing.model.JaxxFilterableComboBoxModel + org.nuiton.jaxx.runtime.swing.model.JaxxFilterableComboBoxModel org.nuiton.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx index 5df47c9..b38b826 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx @@ -21,7 +21,7 @@ --> <JPanel id='top' layout='{new BorderLayout()}' genericType='O' - implements='jaxx.runtime.bean.BeanTypeAware<O>'> + implements='org.nuiton.jaxx.runtime.bean.BeanTypeAware<O>'> <import> org.nuiton.decorator.JXPathDecorator diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanListHeader.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java index 6f73cc0..b8a3d97 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/BeanUIUtil.java @@ -19,12 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor.bean; +package org.nuiton.jaxx.runtime.swing.editor.bean; -import jaxx.runtime.swing.JAXXButtonGroup; -import jaxx.runtime.swing.JAXXRuntimeException; +import org.nuiton.jaxx.runtime.swing.JAXXButtonGroup; +import org.nuiton.jaxx.runtime.swing.JAXXRuntimeException; import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.AutoCompleteComboBoxEditor; @@ -58,7 +57,6 @@ import java.awt.event.FocusListener; import java.awt.event.KeyListener; import java.beans.Introspector; import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Date; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/package.html similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/bean/package.html diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java similarity index 93% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java index 6a8a7fc..168a7f0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/DateCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/DateCellEditor.java @@ -19,14 +19,14 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; import java.util.Date; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.JAXXDatePicker; +import org.nuiton.jaxx.runtime.swing.JAXXDatePicker; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java index 4e6ecc4..89bb70a 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/FileCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/FileCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; import java.awt.event.ActionEvent; @@ -28,7 +28,7 @@ import java.io.File; import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.editor.FileEditor; +import org.nuiton.jaxx.runtime.swing.editor.FileEditor; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java index aba3a6e..6d13ee4 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/KeyStrokeCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; import java.awt.event.ActionEvent; @@ -28,7 +28,7 @@ import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.KeyStroke; import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.editor.KeyStrokeEditor; +import org.nuiton.jaxx.runtime.swing.editor.KeyStrokeEditor; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java similarity index 96% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java index 5397e65..cacc83b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/cell/NumberCellEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/cell/NumberCellEditor.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.editor.cell; +package org.nuiton.jaxx.runtime.swing.editor.cell; import java.awt.Component; import java.awt.event.FocusEvent; @@ -31,8 +31,8 @@ import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.swing.editor.NumberEditor; /** * @author Sylvain Lletellier diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinate.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinate.java index 90dd0db..62b3fb9 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinate.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinate.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java index 05395fd..7fd3e2d 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java index 2b6ead2..aba20a5 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L @@ -23,7 +23,7 @@ package jaxx.runtime.swing.editor.gis; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java index beb4bb7..e3a84db 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinate.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinate.java index bdd031e..51615ec 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinate.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinate.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java index 1b6814a..84158f1 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditor.jcss diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java index 60a8714..17bbefd 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorHandler.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L @@ -23,7 +23,7 @@ package jaxx.runtime.swing.editor.gis; */ import com.google.common.base.Preconditions; -import jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java similarity index 98% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java index 058c1a4..b2b7f17 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java index c00038f..ab675eb 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/gis/MaskFormatterFromConverter.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/package.html similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/editor/package.html diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/ActionCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/ActionCheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java index d04aff3..e40d205 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/ActionCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/ActionCheckListModel.java @@ -30,9 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list; - -import org.nuiton.decorator.Decorator; +package org.nuiton.jaxx.runtime.swing.list; import java.util.ArrayList; import java.util.Arrays; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckList.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckList.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java index 7c33299..dd84d77 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckList.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckList.java @@ -31,7 +31,7 @@ * */ -package jaxx.runtime.swing.list; +package org.nuiton.jaxx.runtime.swing.list; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java similarity index 93% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java index 6ecc688..8b608f4 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListAction.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListAction.java @@ -1,27 +1,27 @@ -package jaxx.runtime.swing.list; - -/* - * #%L - * JAXX :: Widgets - * %% - * Copyright (C) 2008 - 2014 CodeLutin - * %% - * 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 org.nuiton.jaxx.runtime.swing.list; + +/* + * #%L + * JAXX :: Widgets + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + import java.util.ArrayList; import java.util.Collection; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListEditor.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListEditor.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java index c3b7c7e..a58ec67 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListEditor.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListEditor.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list; +package org.nuiton.jaxx.runtime.swing.list; import java.awt.Rectangle; import java.awt.event.MouseAdapter; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java index a5acd28..cace614 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListModel.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list; +package org.nuiton.jaxx.runtime.swing.list; import java.util.Collection; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListRenderer.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java index 5e22844..ee296d0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/CheckListRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/CheckListRenderer.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list; +package org.nuiton.jaxx.runtime.swing.list; import java.awt.Color; import java.awt.Component; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/DefaultCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/DefaultCheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java index a2696e0..ff6e708 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/DefaultCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/DefaultCheckListModel.java @@ -30,10 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list; - -import jaxx.runtime.JAXXUtil; -import org.nuiton.decorator.Decorator; +package org.nuiton.jaxx.runtime.swing.list; import java.util.ArrayList; import java.util.Arrays; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java similarity index 92% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java index 4394b2f..384ccad 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/CheckListFilterType.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/CheckListFilterType.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.list.filter; +package org.nuiton.jaxx.runtime.swing.list.filter; /* * #%L diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java similarity index 93% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java index cf42ba0..e317c04 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/DefaultFilterableCheckListModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.list.filter; +package org.nuiton.jaxx.runtime.swing.list.filter; /* * #%L @@ -22,8 +22,8 @@ package jaxx.runtime.swing.list.filter; * #L% */ -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.list.DefaultCheckListModel; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.swing.list.DefaultCheckListModel; import org.nuiton.decorator.Decorator; import java.util.ArrayList; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java similarity index 92% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java index f1897a2..4dfd6d5 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableActionCheckListModel.java @@ -30,9 +30,9 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.list.filter; +package org.nuiton.jaxx.runtime.swing.list.filter; -import jaxx.runtime.swing.list.ActionCheckListModel; +import org.nuiton.jaxx.runtime.swing.list.ActionCheckListModel; import org.nuiton.decorator.Decorator; public class FilterableActionCheckListModel<T> extends ActionCheckListModel<T> implements FilterableCheckListModel<T> { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java similarity index 90% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java index 32ea503..696d10b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckList.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckList.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.list.filter; +package org.nuiton.jaxx.runtime.swing.list.filter; /* * #%L @@ -22,8 +22,8 @@ package jaxx.runtime.swing.list.filter; * #L% */ -import jaxx.runtime.swing.list.CheckList; -import jaxx.runtime.swing.list.CheckListModel; +import org.nuiton.jaxx.runtime.swing.list.CheckList; +import org.nuiton.jaxx.runtime.swing.list.CheckListModel; import org.nuiton.decorator.Decorator; /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java similarity index 91% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java index 481e74b..70c60dd 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/list/filter/FilterableCheckListModel.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.list.filter; +package org.nuiton.jaxx.runtime.swing.list.filter; /* * #%L @@ -22,7 +22,7 @@ package jaxx.runtime.swing.list.filter; * #L% */ -import jaxx.runtime.swing.list.CheckListModel; +import org.nuiton.jaxx.runtime.swing.list.CheckListModel; import org.nuiton.decorator.Decorator; /** diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java similarity index 99% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java index ddffed6..d9065b0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jAppender.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jAppender.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.log; +package org.nuiton.jaxx.runtime.swing.log; import org.apache.log4j.Level; import org.apache.log4j.WriterAppender; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java similarity index 96% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java index c61492c..a726c0c 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jHandler.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jHandler.java @@ -19,10 +19,10 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.log; +package org.nuiton.jaxx.runtime.swing.log; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.Level; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/log/JAXXLog4jUI.jaxx diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html similarity index 100% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/package.html rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/package.html diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java similarity index 97% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java index 1bb370d..61fe82d 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/renderer/DateCellRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/renderer/DateCellRenderer.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing.renderer; +package org.nuiton.jaxx.runtime.swing.renderer; import java.awt.Component; import java.text.SimpleDateFormat; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java index eb5354b..d75e4e6 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanDoubleListState.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanDoubleListState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L @@ -22,8 +22,7 @@ package jaxx.runtime.swing.session; * #L% */ -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList; /** * @author Kevin Morin - morin@codelutin.com diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java index e1e27be..ad8e245 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/session/BeanFilterableComboBoxState.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.session; +package org.nuiton.jaxx.runtime.swing.session; /* * #%L @@ -22,7 +22,7 @@ package jaxx.runtime.swing.session; * #L% */ -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; /** * @author Kevin Morin - morin@codelutin.com diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/AbstractTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java similarity index 96% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/AbstractTableFilter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java index 918c2fd..51eb5bd 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/AbstractTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/AbstractTableFilter.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ComparatorUtils; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterChangeListener.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterChangeListener.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java index c676d17..a61e320 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterChangeListener.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterChangeListener.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; public interface FilterChangeListener { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java similarity index 93% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java index 1f95aea..1e4cdc9 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/FilterTableHeaderRenderer.java @@ -30,10 +30,10 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; -import jaxx.runtime.swing.CompoundIcon; -import jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.CompoundIcon; +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; import java.awt.Component; import java.awt.Image; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/JTableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/JTableFilter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java index 42d3bf2..9600f2f 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/JTableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/JTableFilter.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; import java.io.Serializable; import java.util.Collection; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java similarity index 91% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java index 1a9dc13..bf52131 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableAwareCheckListRenderer.java @@ -29,11 +29,10 @@ * * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.list.CheckListAction; -import jaxx.runtime.swing.list.CheckListRenderer; +import org.nuiton.jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.swing.list.CheckListRenderer; import org.nuiton.decorator.Decorator; import java.awt.Component; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilter.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java similarity index 94% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilter.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java index d3de44d..816c923 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilter.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilter.java @@ -31,7 +31,7 @@ */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; import java.io.Serializable; import java.util.Collection; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java similarity index 93% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java index 6d3d8ef..68da901 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterColumnPopup.java @@ -31,21 +31,16 @@ */ -package jaxx.runtime.swing.table.filter; - -import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.JSearchTextField; -import jaxx.runtime.swing.list.ActionCheckListModel; -import jaxx.runtime.swing.list.CheckList; -import jaxx.runtime.swing.list.filter.CheckListFilterType; -import jaxx.runtime.swing.list.DefaultCheckListModel; -import jaxx.runtime.swing.list.CheckListModel; -import jaxx.runtime.swing.list.filter.DefaultFilterableCheckListModel; -import jaxx.runtime.swing.list.filter.FilterableActionCheckListModel; -import jaxx.runtime.swing.list.filter.FilterableCheckList; -import jaxx.runtime.swing.list.filter.FilterableCheckListModel; +package org.nuiton.jaxx.runtime.swing.table.filter; + +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.JSearchTextField; +import org.nuiton.jaxx.runtime.swing.list.filter.CheckListFilterType; +import org.nuiton.jaxx.runtime.swing.list.filter.DefaultFilterableCheckListModel; +import org.nuiton.jaxx.runtime.swing.list.filter.FilterableActionCheckListModel; +import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckList; +import org.nuiton.jaxx.runtime.swing.list.filter.FilterableCheckListModel; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.nuiton.decorator.Decorator; import java.awt.*; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterState.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterState.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java index b0dc942..610d370 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableFilterState.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableFilterState.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; import org.apache.commons.collections4.CollectionUtils; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java similarity index 95% rename from jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java rename to jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java index a050ca9..1dbd7f9 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java +++ b/jaxx-widgets/src/main/java/org/nuiton/jaxx/runtime/swing/table/filter/TableRowFilterSupport.java @@ -30,7 +30,7 @@ * %%Ignore-License%% */ -package jaxx.runtime.swing.table.filter; +package org.nuiton.jaxx.runtime.swing.table.filter; import org.nuiton.decorator.Decorator; diff --git a/jaxx-widgets/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter b/jaxx-widgets/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter index 3ec3f9a..e26305d 100644 --- a/jaxx-widgets/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter +++ b/jaxx-widgets/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter @@ -1,2 +1,2 @@ -jaxx.runtime.swing.editor.gis.DmsCoordinateConverter -jaxx.runtime.swing.editor.gis.DmdCoordinateConverter \ No newline at end of file +org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinateConverter +org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinateConverter \ No newline at end of file diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java similarity index 98% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java index e8d58f5..542dc9d 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateConverterTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java similarity index 99% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java index ea0ae7d..616105a 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateEditorTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java similarity index 98% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java index 6f0960c..d53f6b7 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmdCoordinateTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java similarity index 98% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java index 2f80a08..0a11097 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateConverterTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java similarity index 99% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java index 9dc2db6..b8cee0d 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateEditorTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java similarity index 98% rename from jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java rename to jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java index c58d56e..ff0177a 100644 --- a/jaxx-widgets/src/test/java/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java +++ b/jaxx-widgets/src/test/java/org/nuiton/jaxx/runtime/swing/editor/gis/DmsCoordinateTest.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing.editor.gis; +package org.nuiton.jaxx.runtime.swing.editor.gis; /* * #%L diff --git a/jaxx-widgets/src/test/resources/log4j.properties b/jaxx-widgets/src/test/resources/log4j.properties index a9515ea..b7b98bb 100644 --- a/jaxx-widgets/src/test/resources/log4j.properties +++ b/jaxx-widgets/src/test/resources/log4j.properties @@ -26,6 +26,5 @@ 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.runtime.swing=DEBUG -#log4j.logger.jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder=DEBUG log4j.logger.org.nuiton=WARN +log4j.logger.org.nuiton.jaxx=INFO diff --git a/src/site/rst/JAXXContext.rst b/src/site/rst/JAXXContext.rst index 125c771..f75ad9d 100644 --- a/src/site/rst/JAXXContext.rst +++ b/src/site/rst/JAXXContext.rst @@ -54,7 +54,7 @@ Le type de l'objet correspondant en fait à la classe de la donnée. Le nom qui est facultatif permet de pouvoir distinguer plusieurs données d'un même type dans le context. Si le nom n'est pas utilisé pour caractériser une données on fixera alors sa valeur à *null*. -Afin de pouvoir caractériser les entrées dans le context, une classe a été définie *jaxx.runtime.context.JAXXContextEntryDef*. +Afin de pouvoir caractériser les entrées dans le context, une classe a été définie *org.nuiton.jaxx.runtime.context.JAXXContextEntryDef*. Les méthodes de lecture *********************** @@ -109,7 +109,7 @@ de type *JAXXContext* non nommé qui le context courant qui sera détecté comme Cette entrée spéciale ne sera pas stockée avec les autres entrées afin d'optimiser les algorithmes d'injection et de restitution. -jaxx.runtime.context.JAXXInitialContext +org.nuiton.jaxx.runtime.context.JAXXInitialContext *************************************** On a implanté un second type de context qui lui peut servir à l'initialisation des JAXXObject. diff --git a/src/site/rst/NavigationModel.rst b/src/site/rst/NavigationModel.rst index 4b442ff..a15d953 100644 --- a/src/site/rst/NavigationModel.rst +++ b/src/site/rst/NavigationModel.rst @@ -117,7 +117,7 @@ jaxx.runtime.swing.navigation.handler.NavigationTreeHandlerWithCardLayout ========================================================================= Extension de *jaxx.runtime.swing.navigation.handler.AbstractNavigationHandler* pour -l'utilisation de CardLayout (*jaxx.runtime.swing.CardLayout2*). +l'utilisation de CardLayout (*org.nuiton.jaxx.runtime.swing.CardLayout2*). jaxx.runtime.swing.navigation.handler.NavigationMultiTreeHandler ================================================================ @@ -274,7 +274,7 @@ jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout Il s'agit d'une implantation du listener précédent qui suppose que les uis associées aux noeuds sont affichées dans un unique container en utilisant le -layout *jaxx.runtime.swing.CardLayout2*. +layout *org.nuiton.jaxx.runtime.swing.CardLayout2*. La contrainte de chaque ui sera extactement le chemin de navigation du noeud associé. diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 5fb8294..de83fe9 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -75,7 +75,7 @@ Cette option permet de détecter un handler associé à chaque fichier jaxx. Le handler doit porter le nom du fichier java associé au fichier jaxx suffixé par Handler. -Ce handler doit de plus implanter un nouveau contract *jaxx.runtime.spi.UIHandler*. +Ce handler doit de plus implanter un nouveau contract *org.nuiton.jaxx.runtime.spi.UIHandler*. Le contrat contient deux méthodes @@ -298,10 +298,10 @@ Voir https://forge.nuiton.org/issues/show/666 Nouvelle api d'assistant ________________________ -Le package *jaxx.runtime.swing.wizard.ext** contient une nouvelle api simplifié +Le package *org.nuiton.jaxx.runtime.swing.wizard.ext** contient une nouvelle api simplifié pour créer des assitants avec des modèles attachés aux étapes. -Cette api remplace celle du **jaxx.runtime.swing.wizard.WizardOperationXXX**. +Cette api remplace celle du **org.nuiton.jaxx.runtime.swing.wizard.WizardOperationXXX**. Voir https://forge.nuiton.org/issues/show/665 diff --git a/src/site/rst/old-compiler-doc/JAXXContext.rst b/src/site/rst/old-compiler-doc/JAXXContext.rst index 368a10d..6ec5aa3 100644 --- a/src/site/rst/old-compiler-doc/JAXXContext.rst +++ b/src/site/rst/old-compiler-doc/JAXXContext.rst @@ -54,7 +54,7 @@ Le type de l'objet correspondant en fait à la classe de la donnée. Le nom qui est facultatif permet de pouvoir distinguer plusieurs données d'un même type dans le context. Si le nom n'est pas utilisé pour caractériser une données on fixera alors sa valeur à *null*. -Afin de pouvoir caractériser les entrées dans le context, une classe a été définie *jaxx.runtime.context.JAXXContextEntryDef*. +Afin de pouvoir caractériser les entrées dans le context, une classe a été définie *org.nuiton.jaxx.runtime.context.JAXXContextEntryDef*. Les méthodes de lecture *********************** @@ -109,7 +109,7 @@ de type *JAXXContext* *non nommé* qui le context courant qui sera détecté com Cette entrée spéciale ne sera pas stockée avec les autres entrées afin d'optimiser les algorithmes d'injection et de restitution. -jaxx.runtime.context.JAXXInitialContext +org.nuiton.jaxx.runtime.context.JAXXInitialContext *************************************** On a implanté un second type de context qui lui peut servir à l'initialisation des JAXXObject. diff --git a/src/site/rst/old-compiler-doc/NavigationTreeModel.rst b/src/site/rst/old-compiler-doc/NavigationTreeModel.rst index 3366816..8c871a6 100644 --- a/src/site/rst/old-compiler-doc/NavigationTreeModel.rst +++ b/src/site/rst/old-compiler-doc/NavigationTreeModel.rst @@ -174,7 +174,7 @@ jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout ************************************************************************** Il s'agit d'une implantation du listener précédent qui suppose que les uis associées aux noeuds sont affichées dans un -unique container en utilisant le layout *jaxx.runtime.swing.CardLayout2*. +unique container en utilisant le layout *org.nuiton.jaxx.runtime.swing.CardLayout2*. La contrainte de chaque ui sera extactement le chemin de navigation du noeud associé. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.