[Jaxx-commits] 10/94: ending migration

This is an automated email from the git hooks/post-receive script. New commit to annotated tag v2.0.0-beta-1 in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 659716f65625a1aaf5794ee345219c366b8f892d Author: Tony Chemit <chemit@codelutin.com> Date: Wed Oct 7 21:03:42 2009 +0000 ending migration --- .../java/jaxx/compiler/CompilerConfiguration.java | 2 +- .../compiler/DefaultCompilerConfiguration.java | 4 +- .../HelpRootCompiledObjectDecorator.java | 2 +- .../compiler/generators/JAXXObjectGenerator.java | 6 +- jaxx-compiler/src/site/rst/JAXXContext.rst | 2 +- .../src/main/java/jaxx/demo/DemoTreeHelper.java | 2 +- .../src/main/java/jaxx/demo/DemoUIHandler.java | 2 +- .../jaxx/navigation/FullNavigationTreeHelper.java | 2 +- .../src/main/java/jaxx/runtime/JAXXAction.java | 1 - .../jaxx/runtime/{context => }/JAXXContext.java | 5 +- .../src/main/java/jaxx/runtime/JAXXObject.java | 1 - .../src/main/java/jaxx/runtime/SwingUtil.java | 8 +-- jaxx-runtime/src/main/java/jaxx/runtime/Util.java | 1 - .../java/jaxx/runtime/context/DataContext.java | 1 + .../runtime/context/DefaultApplicationContext.java | 2 + .../jaxx/runtime/context/DefaultJAXXContext.java | 1 + .../jaxx/runtime/context/JAXXContextEntryDef.java | 1 + .../jaxx/runtime/context/JAXXInitialContext.java | 1 + .../java/jaxx/runtime/swing/JaxxHelpBroker.java | 82 ++++++++++++++++++---- .../java/jaxx/runtime/{ => swing}/JaxxHelpUI.java | 3 +- .../swing/{ => editor}/MyDefaultCellEditor.java | 7 +- .../navigation/NavigationTreeContextHelper.java | 2 +- .../swing/navigation/NavigationTreeHandler.java | 2 +- .../NavigationTreeHandlerWithCardLayout.java | 2 +- .../swing/navigation/NavigationTreeHelper.java | 2 +- .../swing/navigation/NavigationTreeModel.java | 2 +- .../navigation/NavigationTreeModelBuilder.java | 2 +- .../swing/navigation/NavigationTreeNode.java | 2 +- .../swing/{ => renderer}/BooleanCellRenderer.java | 2 +- .../EmptyNumberTableCellRenderer.java | 2 +- .../{ => renderer}/EnumTableCellRenderer.java | 2 +- .../{ => renderer}/I18nTableCellRenderer.java | 2 +- .../{ => renderer}/LocaleListCellRenderer.java | 2 +- .../swing/wizard/WizardOperationAction.java | 2 +- .../swing/wizard/WizardOperationActionThread.java | 2 +- .../jaxx/runtime/swing/wizard/WizardUILancher.java | 2 +- .../runtime/context/DefaultJAXXContextTest.java | 1 + .../swing/navigation/NavigationTreeModelTest.java | 6 +- .../jaxx/runtime/swing/editor/ColumnSelector.jaxx | 2 +- .../java/jaxx/runtime/swing/editor/I18nEditor.jaxx | 4 +- .../swing/editor/config/ConfigUIBuilder.java | 4 +- maven-jaxx-plugin/pom.xml | 21 +++--- .../org/nuiton/jaxx/plugin/JaxxGeneratorMojo.java | 4 +- pom.xml | 29 +++++++- src/site/rst/JAXXContext.rst | 2 +- src/site/rst/migration.rst | 2 +- 46 files changed, 160 insertions(+), 81 deletions(-) diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java index bd7a17c..7349bb8 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java @@ -2,7 +2,7 @@ package jaxx.compiler; import java.io.File; import jaxx.compiler.decorators.CompiledObjectDecorator; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; /** * TODO javadoc. diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java index 543cbd1..00e61d2 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java @@ -5,7 +5,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import java.io.File; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; /** * Options of the {@link JAXXCompiler} and {@link JAXXCompilerLaunchor}. @@ -46,7 +46,7 @@ public class DefaultCompilerConfiguration implements CompilerConfiguration { */ private boolean resetAfterCompile; /** - * the name of implementation of {@link jaxx.runtime.context.JAXXContext} + * the name of implementation of {@link jaxx.runtime.JAXXContext} * to be used on {@link jaxx.runtime.JAXXObject}. */ protected Class<? extends JAXXContext> jaxxContextClass; diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java index eb11a1a..3ea6337 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java @@ -45,7 +45,7 @@ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecora if (options.isGenerateHelp()) { // add JaxxHelpUI interface - Class<?> validatorInterface = jaxx.runtime.JaxxHelpUI.class; + Class<?> validatorInterface = jaxx.runtime.swing.JaxxHelpUI.class; String helpBrokerFQN = getBrokerFQN(compiler); javaFile.addInterface(JAXXCompiler.getCanonicalName(validatorInterface) + "<" + helpBrokerFQN + ">"); diff --git a/jaxx-compiler/src/main/java/jaxx/compiler/generators/JAXXObjectGenerator.java b/jaxx-compiler/src/main/java/jaxx/compiler/generators/JAXXObjectGenerator.java index 6f7f5f6..ff0eeeb 100644 --- a/jaxx-compiler/src/main/java/jaxx/compiler/generators/JAXXObjectGenerator.java +++ b/jaxx-compiler/src/main/java/jaxx/compiler/generators/JAXXObjectGenerator.java @@ -11,7 +11,7 @@ import jaxx.compiler.reflect.MethodDescriptor; import jaxx.compiler.types.TypeManager; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXObjectDescriptor; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.Util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,7 +49,7 @@ public class JAXXObjectGenerator implements Generator { protected static final JavaField PREVIOUS_VALUES_FIELD = JavaField.newField(0, "java.util.Map", "$previousValues", "new java.util.HashMap()"); protected static final JavaField DELEGATE_CONTEXT_FIELD = JavaField.newField(PROTECTED, - "jaxx.runtime.context.JAXXContext", "delegateContext"); + JAXXContext.class.getName(), "delegateContext"); protected static final JavaField PROPERTY_CHANGE_SUPPORT_FIELD = JavaField.newField(0, "java.beans.PropertyChangeSupport", "$propertyChangeSupport"); protected static final JavaMethod GET_CONTEXT_VALUE_METHOD = JavaMethod.newMethod(java.lang.reflect.Modifier.PUBLIC, "<T> T", "getContextValue", @@ -431,7 +431,7 @@ public class JAXXObjectGenerator implements Generator { } code.append("$initialize();"); code.append(JAXXCompiler.getLineSeparator()); - return JavaMethod.newMethod(Modifier.PUBLIC, null, className, code.toString(), new JavaArgument("jaxx.runtime.context.JAXXContext", "parentContext")); + return JavaMethod.newMethod(Modifier.PUBLIC, null, className, code.toString(), new JavaArgument(JAXXContext.class.getName(), "parentContext")); } public JavaMethod createInitializer(JAXXCompiler compiler) throws CompilerException { diff --git a/jaxx-compiler/src/site/rst/JAXXContext.rst b/jaxx-compiler/src/site/rst/JAXXContext.rst index 5175ffc..c606cda 100644 --- a/jaxx-compiler/src/site/rst/JAXXContext.rst +++ b/jaxx-compiler/src/site/rst/JAXXContext.rst @@ -13,7 +13,7 @@ Ajout d'un context applicatif dans JAXX. Le besoin initial de ce développement est de pouvoir facilement intégrer un context applicatif dans JAXX et de pouvoir l'utiliser dans les fichiers JAXX pour injecter par exemple des données dans les widgets. -jaxx.runtime.context.JAXXContext +jaxx.runtime.JAXXContext ======================== Il s'agit du contrat de base du context applicatif. diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java b/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java index 0d0e527..9f65603 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java +++ b/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java @@ -20,7 +20,7 @@ */ package jaxx.demo; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.CardLayout2; diff --git a/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java b/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java index 3f695ac..702c2aa 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java @@ -21,7 +21,7 @@ package jaxx.demo; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.navigation.NavigationTreeNode; import org.apache.commons.logging.Log; diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java index e917cc5..dce72e6 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeHelper.java @@ -21,7 +21,7 @@ package jaxx.demo.component.jaxx.navigation; import jaxx.runtime.JAXXObject; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import static jaxx.runtime.context.JAXXContextEntryDef.newListDef; import jaxx.runtime.decorator.Decorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java index deadbbe..0c3df04 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXAction.java @@ -1,7 +1,6 @@ package jaxx.runtime; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.context.JAXXContext; /** * 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/context/JAXXContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContext.java rename to jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java index e8fdfb8..5fa6725 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java @@ -1,9 +1,9 @@ -package jaxx.runtime.context; +package jaxx.runtime; import java.awt.Container; /** - * The {@link jaxx.runtime.context.JAXXContext} contract defines a generic context. + * The {@link jaxx.runtime.JAXXContext} contract defines a generic context. * <p/> * A context contains two king of entries : * <p/> @@ -60,7 +60,6 @@ public interface JAXXContext { * @param klazz the klazz entry * @param name extra name of the entry */ - public <T> void removeContextValue(Class<T> klazz, String name); /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java index 5ca926f..54a03a1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java @@ -5,7 +5,6 @@ package jaxx.runtime; import java.util.Map; -import jaxx.runtime.context.JAXXContext; /** * The <code>JAXXObject</code> interface is implemented by all classes diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java b/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java index 9c5df22..1b61147 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java @@ -53,10 +53,10 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import jaxx.runtime.swing.BooleanCellRenderer; -import jaxx.runtime.swing.EmptyNumberTableCellRenderer; -import jaxx.runtime.swing.EnumTableCellRenderer; -import jaxx.runtime.swing.I18nTableCellRenderer; +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 jaxx.runtime.swing.Item; import jaxx.runtime.swing.JAXXComboBox; import org.apache.commons.logging.Log; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/Util.java b/jaxx-runtime/src/main/java/jaxx/runtime/Util.java index 9b3f505..3f551e4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/Util.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/Util.java @@ -1,6 +1,5 @@ package jaxx.runtime; -import jaxx.runtime.context.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java index 483927c..f272292 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java @@ -1,5 +1,6 @@ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; import jaxx.runtime.*; import java.awt.Container; import java.beans.PropertyChangeListener; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java index d4c2d18..502da7a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java @@ -118,6 +118,8 @@ public class DefaultApplicationContext extends DefaultJAXXContext { value = super.getContextValue(realClass, name); } + //TC-20091007 TODO Make possible use of named autoload entries + //(add a parameter on AutoLoad annotation) if (value == null) { AutoLoad anno = clazz.getAnnotation(AutoLoad.class); diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java index bcc1a73..9bde7b2 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java @@ -1,5 +1,6 @@ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; import jaxx.runtime.*; import static jaxx.runtime.context.JAXXContextEntryDef.newDef; import org.apache.commons.logging.Log; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java index 0e9db03..54042b4 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java @@ -1,5 +1,6 @@ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; import java.util.Collections; import java.util.List; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java b/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java index a3c1bd2..bc3c1fe 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java @@ -1,5 +1,6 @@ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; import java.awt.Container; import java.util.Map.Entry; import jaxx.runtime.JAXXObject; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpBroker.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpBroker.java index efab228..781f848 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpBroker.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpBroker.java @@ -11,6 +11,7 @@ import java.net.URL; import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; +import java.util.Locale; import java.util.Map; import java.util.Vector; import javax.help.CSH; @@ -19,7 +20,7 @@ import javax.help.HelpSet; import javax.swing.AbstractButton; import javax.swing.SwingUtilities; import javax.swing.UIManager; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -35,34 +36,68 @@ import org.apache.commons.logging.LogFactory; public abstract class JaxxHelpBroker<B extends JaxxHelpBroker<?>> { public static final String JAXX_CONTEXT_ENTRY = "jaxxcontext"; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * Logger + */ static private Log log = LogFactory.getLog(JaxxHelpBroker.class); + /** + * name of helpset + */ protected final String helpsetName; + /** + * default id to use if none given + */ protected final String defaultID; + /** + * help key + */ protected final String helpKey; - // Main HelpSet & Broker - protected final HelpSet helpset; - protected final HelpBroker helpBroker; + /** + * helpset to use + */ + protected HelpSet helpset; + /** + * help broker + */ + protected HelpBroker helpBroker; + /** + * current locale used + */ + protected Locale locale; + /** + * cache of cursors modified when in context-sensitive mode + */ protected Hashtable<Component, Cursor> cursors; + /** + * cursor to use in context-sensitive mode + */ protected Cursor onItemCursor; + /** + * cache of component which cursor have been modified + */ protected final Map<Component, String> cache; protected JaxxHelpBroker(String helpsetName, String helpKey, String defaultID) { + this(null, helpsetName, helpKey, defaultID); + } + + protected JaxxHelpBroker(Locale locale, String helpsetName, String helpKey, String defaultID) { if (helpsetName == null) { throw new NullPointerException("parameter helpsetName can not be null!"); } + this.locale = locale; this.helpsetName = helpsetName; this.helpKey = helpKey; this.defaultID = defaultID; cache = new HashMap<Component, String>(); - try { - ClassLoader cl = getClass().getClassLoader(); - URL url = HelpSet.findHelpSet(cl, helpsetName); - helpset = new HelpSet(cl, url); - helpBroker = helpset.createHelpBroker(); - } catch (Exception ee) { - throw new IllegalStateException("could not find help set " + helpsetName + " for reason " + ee.getMessage(), ee); - } +// try { +// ClassLoader cl = getClass().getClassLoader(); +// URL url = HelpSet.findHelpSet(cl, helpsetName, this.locale); +// helpset = new HelpSet(cl, url); +// helpBroker = helpset.createHelpBroker(); +// } catch (Exception ee) { +// throw new IllegalStateException("could not find help set " + helpsetName + " for reason " + ee.getMessage(), ee); +// } } public void prepareUI(JAXXObject c) { @@ -96,6 +131,9 @@ public abstract class JaxxHelpBroker<B extends JaxxHelpBroker<?>> { } public HelpBroker getHelpBroker() { + if (helpBroker == null) { + helpBroker = getHelpset().createHelpBroker(); + } return helpBroker; } @@ -104,6 +142,15 @@ public abstract class JaxxHelpBroker<B extends JaxxHelpBroker<?>> { } public HelpSet getHelpset() { + if (helpset == null) { + try { + ClassLoader cl = getClass().getClassLoader(); + URL url = HelpSet.findHelpSet(cl, helpsetName, this.locale); + helpset = new HelpSet(cl, url); + } catch (Exception ee) { + throw new IllegalStateException("could not find help set " + helpsetName + " for reason " + ee.getMessage(), ee); + } + } return helpset; } @@ -115,6 +162,15 @@ public abstract class JaxxHelpBroker<B extends JaxxHelpBroker<?>> { return defaultID; } + public void setLocale(Locale locale) { + this.locale = locale; + // need to reload helpset and helpbroker + helpset = null; + helpBroker = null; + getHelpset(); + getHelpBroker(); + } + public void showHelpSet() { if (log.isDebugEnabled()) { log.debug(this); diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/JaxxHelpUI.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpUI.java similarity index 85% rename from jaxx-runtime/src/main/java/jaxx/runtime/JaxxHelpUI.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpUI.java index a47a663..fde1208 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/JaxxHelpUI.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/JaxxHelpUI.java @@ -1,7 +1,6 @@ -package jaxx.runtime; +package jaxx.runtime.swing; import java.awt.Component; -import jaxx.runtime.swing.JaxxHelpBroker; /** * diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/MyDefaultCellEditor.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java similarity index 95% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/MyDefaultCellEditor.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java index 0d909cd..a7faef9 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/MyDefaultCellEditor.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java @@ -1,6 +1,4 @@ -package jaxx.runtime.swing; - -import org.nuiton.util.EnumEditor; +package jaxx.runtime.swing.editor; import javax.swing.DefaultCellEditor; import javax.swing.Icon; @@ -10,6 +8,7 @@ import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.table.TableCellEditor; import java.awt.Component; +import jaxx.runtime.swing.editor.EnumEditor; /** * @author chemit @@ -35,7 +34,7 @@ public class MyDefaultCellEditor extends DefaultCellEditor { return new MyDefaultCellEditor(editor); } - public static TableCellEditor newEnumEditor(EnumEditor editor) { + public static TableCellEditor newEnumEditor(EnumEditor<?> editor) { return new MyDefaultCellEditor(editor) { private static final long serialVersionUID = 1L; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java index f87b58d..fa269fc 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java @@ -1,7 +1,7 @@ package jaxx.runtime.swing.navigation; import javax.swing.JTree; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; /** diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java index 1b12ebe..1a79868 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java @@ -6,7 +6,7 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreePath; import jaxx.runtime.JAXXAction; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandlerWithCardLayout.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandlerWithCardLayout.java index ae94155..5e96f5d 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandlerWithCardLayout.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandlerWithCardLayout.java @@ -1,6 +1,6 @@ package jaxx.runtime.swing.navigation; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.CardLayout2; import org.apache.commons.logging.Log; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java index 6e73d79..11d0317 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java @@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.regex.Pattern; import javax.swing.JTree; import javax.swing.tree.TreePath; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import 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/navigation/NavigationTreeModel.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java index 239b623..f975dd1 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java @@ -1,6 +1,6 @@ package jaxx.runtime.swing.navigation; -import jaxx.runtime.context.JAXXContext; +import 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/swing/navigation/NavigationTreeModelBuilder.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java index 7b5c1bd..6937e91 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModelBuilder.java @@ -2,7 +2,7 @@ package jaxx.runtime.swing.navigation; import java.util.Enumeration; import jaxx.runtime.JAXXAction; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.JAXXObject; import jaxx.runtime.decorator.Decorator; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java index 932b0ed..9e07697 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeNode.java @@ -4,7 +4,7 @@ import java.util.Enumeration; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; import jaxx.runtime.JAXXAction; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.JAXXObject; import org.apache.commons.jxpath.JXPathContext; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BooleanCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/BooleanCellRenderer.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java index 85187a3..5760d7a 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/BooleanCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package jaxx.runtime.swing.renderer; import javax.swing.Icon; import javax.swing.JCheckBox; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/EmptyNumberTableCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java similarity index 96% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/EmptyNumberTableCellRenderer.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java index d7876e7..9cc4a68 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/EmptyNumberTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package jaxx.runtime.swing.renderer; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/EnumTableCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java similarity index 97% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/EnumTableCellRenderer.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java index 3e89df9..9c88e56 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/EnumTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package jaxx.runtime.swing.renderer; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/I18nTableCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java similarity index 98% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/I18nTableCellRenderer.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java index 3f6fa7a..9b8100e 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/I18nTableCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package jaxx.runtime.swing.renderer; import static org.nuiton.i18n.I18n._; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/LocaleListCellRenderer.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java similarity index 99% rename from jaxx-runtime/src/main/java/jaxx/runtime/swing/LocaleListCellRenderer.java rename to jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java index 18537f9..d0bad56 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/LocaleListCellRenderer.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java @@ -1,4 +1,4 @@ -package jaxx.runtime.swing; +package jaxx.runtime.swing.renderer; import java.awt.Component; import java.util.HashMap; diff --git a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java index c7c3c3b..52d26e7 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java @@ -1,7 +1,7 @@ package jaxx.runtime.swing.wizard; import javax.swing.SwingWorker; -import jaxx.runtime.context.JAXXContext; +import 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/swing/wizard/WizardOperationActionThread.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java index aefe8cd..b5e2e0b 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java @@ -4,7 +4,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Date; import javax.swing.SwingWorker.StateValue; -import jaxx.runtime.context.JAXXContext; +import 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/swing/wizard/WizardUILancher.java b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java index a140d1f..0769eac 100644 --- a/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java +++ b/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java @@ -2,7 +2,7 @@ package jaxx.runtime.swing.wizard; import java.awt.Window; import javax.swing.ImageIcon; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.JAXXObject; import org.apache.commons.beanutils.ConstructorUtils; diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java b/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java index 70dae65..3c22bb1 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java +++ b/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java @@ -1,5 +1,6 @@ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; import jaxx.runtime.*; import org.junit.Assert; import org.junit.Before; diff --git a/jaxx-runtime/src/test/java/jaxx/runtime/swing/navigation/NavigationTreeModelTest.java b/jaxx-runtime/src/test/java/jaxx/runtime/swing/navigation/NavigationTreeModelTest.java index 9699cf2..a83912d 100644 --- a/jaxx-runtime/src/test/java/jaxx/runtime/swing/navigation/NavigationTreeModelTest.java +++ b/jaxx-runtime/src/test/java/jaxx/runtime/swing/navigation/NavigationTreeModelTest.java @@ -4,7 +4,7 @@ import jaxx.runtime.swing.navigation.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationTreeModel; import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder; import jaxx.runtime.context.DefaultJAXXContext; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXContextEntryDef; import org.junit.Assert; import org.junit.Test; @@ -85,7 +85,7 @@ public class NavigationTreeModelTest { } /** - * Test the {@link NavigationTreeModel#getJAXXContextValue(jaxx.runtime.context.JAXXContext, String)} with an entry point + * Test the {@link NavigationTreeModel#getJAXXContextValue(jaxx.runtime.JAXXContext, String)} with an entry point * as a bean. * <p/> * Tree is like this @@ -205,7 +205,7 @@ public class NavigationTreeModelTest { } /** - * Test the {@link NavigationTreeModel#getJAXXContextValue(jaxx.runtime.context.JAXXContext, String)} with an entry point + * Test the {@link NavigationTreeModel#getJAXXContextValue(jaxx.runtime.JAXXContext, String)} with an entry point * as a list. * <p/> * Tree is like this diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/ColumnSelector.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/ColumnSelector.jaxx index 26c47b4..894ec2c 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/ColumnSelector.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/ColumnSelector.jaxx @@ -44,7 +44,7 @@ <script><![CDATA[ import javax.swing.table.TableColumn; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.swing.I18nTableCellRenderer; +import jaxx.runtime.swing.renderer.I18nTableCellRenderer; public static final String TABLE_PROPERTY = "myTable"; public static final String POPUP_VISIBLE_PROPERTY = "popupVisible"; diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx index 78d4d4d..8ff7a16 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx @@ -42,7 +42,7 @@ <Locale id='selectedLocale' javaBean='Locale.getDefault()'/> - <jaxx.runtime.swing.LocaleListCellRenderer id='renderer' + <jaxx.runtime.swing.renderer.LocaleListCellRenderer id='renderer' showIcon='{isShowIcon()}' showText='{isShowText()}' javaBean='new LocaleListCellRenderer(showIcon , showText)'/> @@ -71,7 +71,7 @@ <script><![CDATA[ import java.util.Locale; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.LocaleListCellRenderer; +import jaxx.runtime.swing.renderer.LocaleListCellRenderer; import static org.nuiton.i18n.I18n.n_; public static final String DEFAULT_SELECTED_TOOLTIP = n_("i18neditor.selected"); diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java index a5a84e7..d1cc9f0 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java @@ -32,7 +32,7 @@ import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.JRootPane; import javax.swing.KeyStroke; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.SwingUtil; @@ -59,7 +59,7 @@ public class ConfigUIBuilder { * @param defaultCategory la categorie a selectionner * @return l'ui instanciate */ - public static ConfigUI newConfigUI(jaxx.runtime.context.JAXXContext parentContext, final ConfigUIModel model, String defaultCategory) { + public static ConfigUI newConfigUI(jaxx.runtime.JAXXContext parentContext, final ConfigUIModel model, String defaultCategory) { JAXXContext tx = new JAXXInitialContext().add(parentContext).add(model); final ConfigUI ui = new ConfigUI(tx); diff --git a/maven-jaxx-plugin/pom.xml b/maven-jaxx-plugin/pom.xml index 36922fd..ff20a08 100644 --- a/maven-jaxx-plugin/pom.xml +++ b/maven-jaxx-plugin/pom.xml @@ -57,6 +57,11 @@ <artifactId>maven-helper-plugin</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </dependency> + <!-- pour acceder aux BeansInfos swing via Introspector --> <dependency> <groupId>com.sun</groupId> @@ -67,26 +72,18 @@ </dependency> <!-- tests dependencies --> -<!-- - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> ---> + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> - <version>1.0</version> - <scope>test</scope> </dependency> - <dependency> + <!-- <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.5</version> - </dependency> + </dependency>--> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> diff --git a/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/JaxxGeneratorMojo.java b/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/JaxxGeneratorMojo.java index 497edaa..daac7f5 100644 --- a/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/JaxxGeneratorMojo.java +++ b/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/JaxxGeneratorMojo.java @@ -25,7 +25,7 @@ import jaxx.compiler.beans.BeanInfoUtil; import jaxx.compiler.decorators.CompiledObjectDecorator; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import jaxx.compiler.tags.TagManager; -import jaxx.runtime.context.JAXXContext; +import jaxx.runtime.JAXXContext; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Resource; @@ -98,7 +98,7 @@ public class JaxxGeneratorMojo extends AbstractJaxxMojo implements CompilerConfi */ protected String validatorFQN; /** - * the name of implementation of {@link jaxx.runtime.context.JAXXContext} + * the name of implementation of {@link jaxx.runtime.JAXXContext} * to be used on {@link jaxx.runtime.JAXXObject}. * <p/> * Must not be abstract. diff --git a/pom.xml b/pom.xml index e35291c..8e3ebe3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,6 @@ <module>jaxx-widgets</module> - <!-- deprecated since 1.7.2, will be removed before 2.0.0 - <module>jaxx-example</module--> <module>jaxx-demo</module> </modules> @@ -257,6 +255,26 @@ <artifactId>log4j</artifactId> <version>1.2.14</version> </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>junit</groupId> @@ -266,6 +284,13 @@ </dependency> <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-verifier</artifactId> + <version>1.0</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>1.2</version> diff --git a/src/site/rst/JAXXContext.rst b/src/site/rst/JAXXContext.rst index 5175ffc..c606cda 100644 --- a/src/site/rst/JAXXContext.rst +++ b/src/site/rst/JAXXContext.rst @@ -13,7 +13,7 @@ Ajout d'un context applicatif dans JAXX. Le besoin initial de ce développement est de pouvoir facilement intégrer un context applicatif dans JAXX et de pouvoir l'utiliser dans les fichiers JAXX pour injecter par exemple des données dans les widgets. -jaxx.runtime.context.JAXXContext +jaxx.runtime.JAXXContext ======================== Il s'agit du contrat de base du context applicatif. diff --git a/src/site/rst/migration.rst b/src/site/rst/migration.rst index 834d189..7898c89 100644 --- a/src/site/rst/migration.rst +++ b/src/site/rst/migration.rst @@ -15,7 +15,7 @@ Nouvelles fonctionnalités * JList, JComboBox et JTree n'acceptent plus de fils Item (utiliser JAXXList, JAXXComboBox, JAXXTree). - * changement de paquetage de jaxx.runtime.JAXXContext vers jaxx.runtime.context.JAXXContext + * changement de paquetage de jaxx.runtime.JAXXContext vers jaxx.runtime.JAXXContext * changement de paquetage de jaxx.runtime.\*Decorator vers jaxx.runtime.decorator.\*Decorator -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.