Author: tchemit Date: 2011-07-31 23:32:29 +0200 (Sun, 31 Jul 2011) New Revision: 2289 Url: http://nuiton.org/repositories/revision/jaxx/2289 Log: Evolution #1644: Move decorator neutral api to nuiton-utils Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-demo/src/license/THIRD-PARTY.properties trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MultiJXPathDecoratorTest.java trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties trunk/jaxx-validator/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2011-07-31 21:32:29 UTC (rev 2289) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -6,14 +6,16 @@ # - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 21:46:20 CET 2011 +#Sun Jul 31 15:20:00 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-07-31 21:32:29 UTC (rev 2289) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -9,12 +9,13 @@ # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Feb 16 19:45:34 WET 2011 +#Sun Jul 31 15:14:09 CEST 2011 +asm--asm--3.1--jar=http://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -28,7 +28,7 @@ <import> org.nuiton.util.StringUtil </import> - + <script><![CDATA[ protected String[] getSources() { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -31,10 +31,10 @@ java.awt.RenderingHints javax.swing.DefaultComboBoxModel - + org.fife.ui.rsyntaxtextarea.RSyntaxTextArea </import> - + <script><![CDATA[ public void init() { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,7 +29,7 @@ java.util.Arrays javax.swing.SwingUtilities </import> - + <script><![CDATA[ private void $afterCompleteSetup() { @@ -49,7 +49,8 @@ </script> <tab id='tabDemoPanel' title='{demoPanel.getDemoTabTitle()}'> - <DemoPanel id='demoPanel' initializer='getContextValue(DemoPanel.class, "content")'/> + <DemoPanel id='demoPanel' + initializer='getContextValue(DemoPanel.class, "content")'/> </tab> <tab id='tabDemoSources' title='Sources'> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -31,7 +31,7 @@ <import> jaxx.demo.tree.DemoTreeHelper jaxx.demo.tree.DemoCellRenderer - + jaxx.runtime.SwingUtil jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.StatusMessagePanel Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -52,7 +52,7 @@ import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.DecoratorProvider; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -30,7 +30,7 @@ import jaxx.demo.tree.DemoTreeHelper; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.DefaultApplicationContext; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.DecoratorProvider; import jaxx.runtime.swing.ErrorDialogUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -33,7 +33,7 @@ java.awt.Color java.awt.event.ActionEvent - + javax.swing.AbstractAction javax.swing.DefaultListModel javax.swing.JComponent Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JButtonDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -49,7 +49,7 @@ javax.swing.JOptionPane java.awt.Color </import> - + <javax.swing.ImageIcon id='pencil' constructorParams='getClass().getResource("/jaxx/demo/images/pencil_black.gif")'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JMenuItemDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -27,7 +27,7 @@ <import> javax.swing.JOptionPane </import> - + <script> void $afterCompleteSetup(){} </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -27,7 +27,7 @@ <import> javax.swing.ImageIcon </import> - + <HBox horizontalAlignment='center' verticalAlignment='middle'> <VBox> <JRadioButton text='Animal' value='Lynx.jpg' buttonGroup='radioButtons' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -28,7 +28,7 @@ java.awt.Font javax.swing.UIManager </import> - + <script><![CDATA[ protected Font updateFont(Object selectedValue) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSliderDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -27,7 +27,7 @@ <import> java.awt.Color </import> - + <HBox horizontalAlignment='center' verticalAlignment='middle'> <VBox> <JSlider id='red' maximum='255' value='200'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - + <jaxx.demo.DemoPanel> <Table constraints='BorderLayout.CENTER'> <row> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,7 +24,7 @@ */ package jaxx.demo.entities; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.DecoratorProvider; /** * Demo decorator provider. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Identity.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,10 +29,8 @@ import java.beans.PropertyChangeSupport; import java.io.File; -import static org.nuiton.i18n.I18n.n_; - public class Identity { - + protected String firstName = ""; protected String lastName = ""; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -38,13 +38,13 @@ } public Boolean isEditing2() { - return editing2; + return editing2; } public void setEditing2(Boolean editing2) { - Boolean oldValue = this.editing2; - this.editing2 = editing2; - firePropertyChange("editing2", oldValue, editing2); + Boolean oldValue = this.editing2; + this.editing2 = editing2; + firePropertyChange("editing2", oldValue, editing2); } </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -37,14 +37,14 @@ import jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode; import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; -import jaxx.runtime.decorator.DecoratorProvider; -import jaxx.runtime.decorator.JXPathDecorator; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTreeTable; +import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.util.decorator.JXPathDecorator; import javax.swing.ImageIcon; import javax.swing.JPanel; @@ -198,7 +198,7 @@ SwingUtil.addExpandOnClickListener(table); } - protected void openUI(NavNode demoNode) { + protected void openUI(NavNode<?, ?> demoNode) { // Get demoNode type Class<?> editType = demoNode.getInternalClass(); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -69,7 +69,7 @@ <JButton text='jaxxdemo.action.remove' enabled='{list.getSelectedIndex()!=-1}'/> </JPanel> - + <BeanListHeader id='listHeader' constraints='BorderLayout.EAST' i18nPrefix='jaxxdemo.common.' data='{getData()}' genericType='People' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -53,7 +53,8 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}' minimumSize='{SwingUtil.newMinDimension()}'> - <JLabel horizontalAlignment='center' icon='{getHandler().getImage(getData())}'/> + <JLabel horizontalAlignment='center' + icon='{getHandler().getImage(getData())}'/> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/ActorsTreeNodeLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.tree; +import jaxx.demo.entities.People; import jaxx.demo.feature.nav.NavDemoDataProvider; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.tree; +import jaxx.demo.entities.Movie; import jaxx.demo.feature.nav.NavDemoDataProvider; -import jaxx.demo.entities.Movie; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,14 +25,14 @@ package jaxx.demo.feature.nav.tree; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.DecoratorProvider; +import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/NavDemoTreeNode.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -41,9 +41,9 @@ } public NavDemoTreeNode(Class<?> internalClass, - String id, - String context, - NavTreeNodeChildLoador<?, ?, NavDemoTreeNode> loador) { + String id, + String context, + NavTreeNodeChildLoador<?, ?, NavDemoTreeNode> loador) { super(internalClass, id, context, loador); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/ActorsTreeTableNodeLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.treetable; +import jaxx.demo.entities.People; import jaxx.demo.feature.nav.NavDemoDataProvider; -import jaxx.demo.entities.People; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.treetable.NavTreeTableNodeChildLoador; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,8 +25,8 @@ package jaxx.demo.feature.nav.treetable; +import jaxx.demo.entities.Movie; import jaxx.demo.feature.nav.NavDemoDataProvider; -import jaxx.demo.entities.Movie; import jaxx.demo.feature.nav.NavDemoHandler; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavHelper; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,9 +24,9 @@ */ package jaxx.demo.feature.nav.treetable; -import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; +import jaxx.demo.feature.nav.NavDemoDataProvider; import jaxx.runtime.swing.nav.NavNode; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; @@ -46,7 +46,7 @@ @Override public Object getValueAt(Object o, int i) { - NavNode node = (NavNode)o; + NavNode node = (NavNode) o; // Get node type Class<?> editType = node.getInternalClass(); @@ -59,12 +59,12 @@ } return ""; - // People node + // People node } else if (editType.equals(People.class)) { People people = dataProvider.getPeople(id); return getPeopleColumn(people, i); - // Movie node + // Movie node } else if (editType.equals(Movie.class)) { Movie movie = dataProvider.getMovie(id); return getMovieColumn(movie, i); @@ -78,12 +78,12 @@ String result = ""; switch (i) { - case 0: - result = movie.getTitle(); - break; - case 2: - result = String.valueOf(movie.getYear()); - break; + case 0: + result = movie.getTitle(); + break; + case 2: + result = String.valueOf(movie.getYear()); + break; } return result; } @@ -92,15 +92,15 @@ String result = ""; switch (i) { - case 0: - result = people.getFirstName(); - break; - case 1: - result = people.getLastName(); - break; - case 2: - result = String.valueOf(people.getAge()); - break; + case 0: + result = people.getFirstName(); + break; + case 1: + result = people.getLastName(); + break; + case 2: + result = String.valueOf(people.getAge()); + break; } return result; } @@ -108,8 +108,8 @@ @Override public String[] getColumnsNames() { return new String[]{_("jaxxdemo.common.firstName"), - _("jaxxdemo.common.lastName"), - _("jaxxdemo.common.age")}; + _("jaxxdemo.common.lastName"), + _("jaxxdemo.common.age")}; } @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableNode.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -39,9 +39,9 @@ } public NavDemoTreeTableNode(Class<?> internalClass, - String id, - String context, - NavTreeTableNodeChildLoador<?, ?, NavDemoTreeTableNode> childLoador) { + String id, + String context, + NavTreeTableNodeChildLoador<?, ?, NavDemoTreeTableNode> childLoador) { super(internalClass, id, context, childLoador); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -30,7 +30,7 @@ javax.swing.BorderFactory javax.swing.border.BevelBorder </import> - + <!--<style source='CalculatorDemo.css'/>--> <script><![CDATA[ plus.setText("+"); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,7 +29,7 @@ java.awt.Color javax.swing.BorderFactory </import> - + <!--<style source="LabelStyleDemo.css"/>--> <script><![CDATA[ @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,9 +25,9 @@ package jaxx.demo.tree; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.NavNodeChildLoador; +import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,7 +37,7 @@ * @author tchemit <tchemit@codelutin.com> * @since 2.1 */ -public class DemoNodeLoador extends NavTreeNodeChildLoador<Object,Object, DemoNode> { +public class DemoNodeLoador extends NavTreeNodeChildLoador<Object, Object, DemoNode> { private static final long serialVersionUID = 1L; @@ -64,7 +64,7 @@ if (log.isDebugEnabled()) { log.debug("Creating node for object : " + data); } - + DemoNode node = null; if (data instanceof String) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXContext.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -38,7 +38,7 @@ * <h2>named entry</h2> * a such entry filter on class of the object and on the name of the entry. * <p/> - * To add a <b>named</b> entry, use {@link #setContextValue(Object,String)} and {@link #getContextValue(Class,String)} + * To add a <b>named</b> entry, use {@link #setContextValue(Object, String)} and {@link #getContextValue(Class, String)} * to reteave a such entry. * * @author letellier Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -103,8 +103,8 @@ * * @param bindingId the id of the binding * @return the binding, or {@code null} if not found. + * @see JAXXBinding * @since 2.4.2 - * @see JAXXBinding */ JAXXBinding getDataBinding(String bindingId); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -469,7 +469,7 @@ todo.add(container); while (todo.size() > 0) { for (ListIterator<Container> i = todo.listIterator(); - i.hasNext();) { + i.hasNext(); ) { Container parent = i.next(); i.remove(); for (Component c : parent.getComponents()) { @@ -954,8 +954,7 @@ URI uri = new URI(url); desktop.browse(uri); - } - catch (Exception e) { + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Error while opening link", e); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -36,8 +36,8 @@ * Use the factory methods <code>newContextEntryDef</code> and * <code>newListContextEntryDef</code< to obtain new instances. * + * @param <O> type of the entry associated to the definition * @author tchemit <chemit@codelutin.com> - * @param <O> type of the entry associated to the definition */ public class JAXXContextEntryDef<O> implements Serializable { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,10 +29,12 @@ /** * A simple contract to define a String decorator on any java object. * + * @param <O> the type of data to decorate * @author tchemit <chemit@codelutin.com> - * @param <O> the type of data to decorate * @since 1.7.2 (was previously {@code jaxx.runtime.Decorator}) + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public abstract class Decorator<O> implements Serializable { private static final long serialVersionUID = -1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -41,7 +41,9 @@ * * @author tchemit <chemit@codelutin.com> * @since 1.7 + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public abstract class DecoratorProvider { /** Logger */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorUtils.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -45,7 +45,7 @@ * #newPropertyDecorator(Class, String)}</li> <li>{@link * #newJXPathDecorator(Class, String)}</li> <li> * {@link #newMultiJXPathDecorator(Class, String, String)})</li> - * <li>{@link #newMultiJXPathDecorator(Class, String,String, String)})</li> + * <li>{@link #newMultiJXPathDecorator(Class, String, String, String)})</li> * </ul> * <p/> * To sort a list of data, using a {@link JXPathDecorator}, use the method @@ -54,7 +54,9 @@ * * @author tchemit <chemit@codelutiln.com> * @since 1.7.2 (was previously {@code jaxx.runtime.DecoratorUtils}) + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class DecoratorUtils { /** Logger */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/JXPathDecorator.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -58,7 +58,9 @@ * @author tchemit <chemit@codelutin.com> * @see Decorator * @since 1.7.2 (was previously {@code jaxx.runtime.JXPathDecorator}) + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class JXPathDecorator<O> extends Decorator<O> { private static final long serialVersionUID = 1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MapPropertyHandler.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -53,7 +53,9 @@ * @author tchemit <chemit@codelutin.com> * @see DynamicPropertyHandler * @since 2.0.1 + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class MapPropertyHandler implements DynamicPropertyHandler { /** Logger */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/MultiJXPathDecorator.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -36,7 +36,9 @@ * @author tchemit <chemit@codelutin.com> * @see Decorator * @since 1.7.2 (was previously {@code jaxx.runtime.MultiJXPathDecorator}) + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class MultiJXPathDecorator<O> extends JXPathDecorator<O> { private static final long serialVersionUID = 1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/PropertyDecorator.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -42,11 +42,13 @@ * Decorator<Object> d = DecoratorUtils.newPropertyDecorator(PropertyDecorator.class,"property"); * </pre> * + * @param <O> type of data to decorate * @author tchemit <chemit@codelutin.com> - * @param <O> type of data to decorate * @see Decorator * @since 1.7.2 (was previously {@code jaxx.runtime.PropertyDecorator}) + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class PropertyDecorator<O> extends Decorator<O> { private static final long serialVersionUID = 1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -52,8 +52,8 @@ /** * Une éditeur d'enum. * + * @param <E> le type d'enumeration a editer. * @author tchemit <chemit@codelutin.com> - * @param <E> le type d'enumeration a editer. * @since 1.6.0 */ public class EnumEditor<E extends Enum<E>> extends JComboBox { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,8 +29,8 @@ /** * Contract to be added on JAXXObject which wants to use javax help. * + * @param <B> type of broker. * @author tchemit <chemit@codelutin.com> - * @param <B> type of broker. * @see JAXXHelpBroker * @since 1.3 */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -71,7 +71,7 @@ void reload(N node); - boolean canLoadChild(N node) ; + boolean canLoadChild(N node); //-------------------------------------------------------------------------- //-- Listeners notifications Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -150,7 +150,7 @@ * on direct childs of the node. * * @param id the id of the researched node - * @param bridge model owner of nodes + * @param bridge model owner of nodes * @param provider data provider * @return the found node or {@code null} if not found */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -145,7 +145,7 @@ * Add childs to given {@code parentNode} using retrive {@code datas} from * the data provider. * <p/> - * This method is invoked by the {@link #loadChilds(NavBridge , NavNode , NavDataProvider)}. + * This method is invoked by the {@link #loadChilds(NavBridge, NavNode, NavDataProvider)}. * * @param parentNode the node where to insert * @param datas the data used to create node Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/package.html 2011-07-31 21:32:29 UTC (rev 2289) @@ -31,36 +31,36 @@ Tow implementations are offers : <ul> - <li>One for the <b>JTree</b> in <b>jaxx.runtime.swing.nav.tree</b></li> - <li>One for the <b>JXTreeTable</b> in - <b>jaxx.runtime.swing.nav.treetable</b></li> + <li>One for the <b>JTree</b> in <b>jaxx.runtime.swing.nav.tree</b></li> + <li>One for the <b>JXTreeTable</b> in + <b>jaxx.runtime.swing.nav.treetable</b></li> </ul> <p> - Replace the previous framework from package - <code>jaxx.runtime.swing.navigation</code> + Replace the previous framework from package + <code>jaxx.runtime.swing.navigation</code> </p> <h1>Why this api ?</h1> <p> - The main goal of this api is to offer an auto-loading system of tree - model. + The main goal of this api is to offer an auto-loading system of tree + model. </p> <p> - While previous api we had to load all the model in memory, now we can build - a tree model with no data. + While previous api we had to load all the model in memory, now we can build + a tree model with no data. </p> <p> - When the tree will need to expand a node, it will ask first in childs of - node were loaded, if not, load them then give by hand to system. + When the tree will need to expand a node, it will ask first in childs of + node were loaded, if not, load them then give by hand to system. </p> <p> - This api allow to switch easily between tree implementation and tree table - api. + This api allow to switch easily between tree implementation and tree table + api. </p> Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeBridge.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -192,7 +192,7 @@ // recurse notify on childs for (Enumeration<? extends NavTreeNode<?>> childs = node.children(); - childs.hasMoreElements();) { + childs.hasMoreElements(); ) { N child = (N) childs.nextElement(); notifyChildNodesInserted(child); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -290,7 +290,7 @@ } return; } - + // chargement des noeuds fils du noeud courant try { if (log.isDebugEnabled()) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -220,7 +220,7 @@ // recurse notify on childs for (Enumeration<? extends NavTreeTableNode<?>> childs = node.children(); - childs.hasMoreElements();) { + childs.hasMoreElements(); ) { N child = (N) childs.nextElement(); notifyChildNodesInserted(child); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableHelper.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -47,7 +47,7 @@ /** Logger */ static private final Log log = LogFactory.getLog(NavTreeTableHelper.class); - + public NavTreeTableHelper() { super(new NavTreeTableBridge<N>()); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorListCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,7 +24,7 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; +import org.nuiton.util.decorator.Decorator; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.DecoratorProvider; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorProvider; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,7 +24,7 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; +import org.nuiton.util.decorator.Decorator; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -32,8 +32,8 @@ /** * A {@link TableCellRenderer} which displays enum values from their ordinal value. * + * @param <E> le type de l'énumération. * @author tchemit <chemit@codelutin.com> - * @param <E> le type de l'énumération. * @since 1.5 */ public class EnumTableCellRenderer<E extends Enum<E>> implements TableCellRenderer { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.JXPathDecorator; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.JXPathDecorator; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; @@ -57,14 +57,17 @@ this(new DefaultTableCellRenderer(), decorator); } - public MultiDecoratorTableCelleRenderer(TableCellRenderer delegate, JXPathDecorator<?>... decorator) { + public MultiDecoratorTableCelleRenderer(TableCellRenderer delegate, + JXPathDecorator<?>... decorator) { this.delegate = delegate; - this.types = new ArrayList<Class<?>>(); + types = new ArrayList<Class<?>>(); List<Decorator<?>> tmp = new ArrayList<Decorator<?>>(); for (JXPathDecorator<?> d : decorator) { if (types.contains(d.getInternalClass())) { - throw new IllegalArgumentException("can not have twice a decorator of type " + d.getInternalClass()); + throw new IllegalArgumentException( + "can not have twice a decorator of type " + + d.getInternalClass()); } types.add(d.getInternalClass()); tmp.add(d); @@ -73,7 +76,12 @@ } @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasfocus, int row, int column) { + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasfocus, + int row, + int column) { if (value != null) { int i = types.indexOf(value.getClass()); if (i != -1) { @@ -81,6 +89,12 @@ value = d.toString(value); } } - return delegate.getTableCellRendererComponent(table, value, isSelected, hasfocus, row, column); + return delegate.getTableCellRendererComponent(table, + value, + isSelected, + hasfocus, + row, + column + ); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -40,8 +40,8 @@ * <b>Note:</b> le type des étapes doit être uné énumération qui implante {@link * WizardStep}. * + * @param <E> le type des étapes. * @author tchemit <chemit@codelutin.com> - * @param <E> le type des étapes. * @see WizardStep * @since 1.3 */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardStepUI.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -27,9 +27,9 @@ /** * Le contrat d'une ui d'étape. * - * @author tchemit <chemit@codelutin.com> * @param <E> le type d'étape * @param <M> le type de modèle + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface WizardStepUI<E extends WizardStep, M extends WizardModel<E>> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUI.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,9 +29,9 @@ /** * Contrat a respecter pour une ui de wizard. * - * @author tchemit <chemit@codelutin.com> * @param <E> le type d'etape * @param <M> le type de model + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface WizardUI<E extends WizardStep, M extends WizardModel<E>> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -36,10 +36,10 @@ /** * Une classe pour lancer une ui de wizard. * + * @param <E> le type des etapes + * @param <M> le type de modele + * @param <UI> le type d'ui * @author tchemit <chemit@codelutin.com> - * @param <E> le type des etapes - * @param <M> le type de modele - * @param <UI> le type d'ui * @since 1.3 */ public abstract class WizardUILancher<E extends WizardStep, M extends WizardModel<E>, UI extends WizardUI<E, M>> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -40,8 +40,8 @@ /** * Un modèle de wizard avec des opérations. * + * @param <E> le type des étapes. * @author tchemit <chemit@codelutin.com> - * @param <E> le type des étapes. * @since 1.3 */ public abstract class WizardExtModel<E extends WizardExtStep> extends WizardModel<E> { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUI.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -29,9 +29,9 @@ /** * Contrat a respecter pour une ui de wizard. * - * @author tchemit <chemit@codelutin.com> * @param <E> le type d'etape * @param <M> le type de model + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface WizardExtUI<E extends WizardExtStep, M extends WizardExtModel<E>> extends WizardUI<E, M> { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -27,6 +27,10 @@ import java.util.ArrayList; import java.util.List; +/** + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator + */ +@Deprecated public class Data { int pos; Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/DecoratorProviderTest.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -34,7 +34,9 @@ * User: chemit * Date: 28 oct. 2009 * Time: 21:28:46 + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class DecoratorProviderTest { private static final String BY_NAME = "name"; Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathContextTester.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -33,7 +33,9 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.0.1 + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public abstract class JXPathContextTester { JXPathContext context; Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -38,7 +38,9 @@ /** * @author tchemit <chemit@codelutin.com> * @since 1.7.2 (was previously {@code jaxx.runtime.JXPathDecoratorTest}). + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class JXPathDecoratorTest { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MapPropertyHandlerTest.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -40,7 +40,9 @@ * * @author tchemit <chemit@codelutin.com> * @since 2.0.1 + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class MapPropertyHandlerTest extends JXPathContextTester { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MultiJXPathDecoratorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MultiJXPathDecoratorTest.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/MultiJXPathDecoratorTest.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -37,7 +37,9 @@ /** * @author tchemit <chemit@codelutin.com> * @since 1.7.2 (was previously {@code jaxx.runtime.MultiJXPathDecoratorTest}). + * @deprecated since 2.5, prefer use now the api from nuiton-utils in package org.nuiton.uitl.decorator */ +@Deprecated public class MultiJXPathDecoratorTest { protected MultiJXPathDecorator<?> decorator; Modified: trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-tutorial-validation/src/license/THIRD-PARTY.properties 2011-07-31 21:32:29 UTC (rev 2289) @@ -1,18 +1,20 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 23:13:29 CET 2011 +#Sun Jul 31 15:21:14 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-validator/src/license/THIRD-PARTY.properties 2011-07-31 21:32:29 UTC (rev 2289) @@ -1,16 +1,21 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) v 2.1 +# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 14:09:48 CET 2011 +#Sun Jul 31 15:19:58 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -28,7 +28,7 @@ onFocusLost='hidePopup()'> <import> - jaxx.runtime.decorator.JXPathDecorator + org.nuiton.util.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -26,9 +26,9 @@ package jaxx.runtime.swing.editor.bean; import jaxx.runtime.SwingUtil; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.decorator.JXPathDecorator; -import jaxx.runtime.decorator.MultiJXPathDecorator; +import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2011-07-31 21:32:29 UTC (rev 2289) @@ -26,7 +26,7 @@ <JPanel id='top' layout='{new BorderLayout()}' genericType='O'> <import> - jaxx.runtime.decorator.JXPathDecorator + org.nuiton.util.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -25,9 +25,9 @@ package jaxx.runtime.swing.editor.bean; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.decorator.JXPathDecorator; -import jaxx.runtime.decorator.MultiJXPathDecorator; +import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.collections.primitives.ArrayIntList; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2011-07-31 21:32:29 UTC (rev 2289) @@ -24,10 +24,10 @@ */ package jaxx.runtime.swing.editor.bean; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.DecoratorUtils; -import jaxx.runtime.decorator.JXPathDecorator; -import jaxx.runtime.decorator.MultiJXPathDecorator; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.DecoratorUtils; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.util.decorator.MultiJXPathDecorator; import jaxx.runtime.swing.JAXXButtonGroup; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.logging.Log; Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-07-31 12:46:23 UTC (rev 2288) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2011-07-31 21:32:29 UTC (rev 2289) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -6,21 +6,23 @@ # - GNU General Public License - Version 2 with the class path exception # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) v 2.1 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - Public Domain # - The Apache Software License, Version 2.0 -# - The OpenSymphony Software License 1.1 # - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Feb 19 21:50:40 CET 2011 +#Sun Jul 31 15:20:34 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html commons-cli--commons-cli--1.0--jar=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0