[Jaxx-commits] r2758 - in trunk: . jaxx-demo/src/main/java/jaxx/demo jaxx-demo/src/main/java/jaxx/demo/component/jaxx jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/feature/databinding jaxx-demo/src/main/java/jaxx/demo/feature/nav jaxx-demo/src/main/java/jaxx/demo/feature/validation/list jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple jaxx-demo/src/main/java/jaxx/demo/fun

Author: tchemit Date: 2013-11-28 11:58:35 +0100 (Thu, 28 Nov 2013) New Revision: 2758 Url: http://nuiton.org/projects/jaxx/repository/revisions/2758 Log: - improve jaxx demo - fixes #2947: Updates nuiton-i18n to 2.5.2 - fixes #2948: Updates eugene to 2.7.3 - fixes #2949: Updates plexus-utils to 3.0.15 - fixes #2951: Updates rsyntaxtextarea to 2.5.0 Modified: 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/DemoSourcesHandler.java 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/component/jaxx/BoxedDecoratorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx trunk/pom.xml Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -35,11 +35,11 @@ if (DemoPanel.class.equals(getClass())) { return StringUtil.EMPTY_STRING_ARRAY; } - return new String[]{ getDefaultSource() }; + return addDefaultSources(); } -protected String getDefaultSource() { - return getClass().getSimpleName() + ".jaxx"; +protected String[] addDefaultSources(String... sources) { + return DemoSourcesHandler.addDefaultSources(this, sources); } public String getLabel() { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -38,16 +38,6 @@ <script><![CDATA[ public void init() { - //fontSizor.setDefaultFontSize(getConfig().getFontSize()); - fontSizor.init(); - fontSizor.setCallBack(new Runnable() { - - @Override - public void run() { - log.info("update font size : " + fontSizor.getFontSize()); - getConfig().setFontSize(fontSizor.getFontSize()); - } - }); handler.init(this); } @@ -55,17 +45,10 @@ return getContextValue(DemoConfig.class); } -public void updateSource(ItemEvent event) { - setCurrentSource((String) sourceTabs.getSelectedItem()); - editor.setText(handler.getSourceContent(this, getCurrentSource())); - editor.setSyntaxEditingStyle(handler.getSourceEditingStyle(this, getCurrentSource())); - editor.setCaretPosition(0); -} + ]]> </script> - <DemoSourcesHandler id='handler'/> - <Class id='incomingClass' javaBean='null' genericType='?'/> <String id='currentSource' javaBean='null'/> @@ -80,12 +63,11 @@ <JComboBox id='sourceTabs' model='{new DefaultComboBoxModel()}' - onItemStateChanged='if(event.getStateChange() == ItemEvent.SELECTED) { updateSource(event); }'/> + onItemStateChanged='if(event.getStateChange() == ItemEvent.SELECTED) { handler.updateSource(event); }'/> <javax.swing.Box.Filler constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> <FontSizor id='fontSizor' opaque='false' showFontSize='true' fontSize='{getConfig().getFontSize()}'/> - <!--defaultFontSize='{getConfig().getFontSize()}' fontSize='{getConfig().getFontSize()}'/>--> </JToolBar> <JScrollPane id='editorPane' columnHeaderView='{editorPaneHeader}' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -24,13 +24,20 @@ */ package jaxx.demo; +import com.google.common.collect.Lists; +import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; +import jaxx.runtime.swing.FontSizor; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; +import java.awt.event.ItemEvent; +import java.io.InputStream; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -44,13 +51,42 @@ * Mise a jour: $Date$ par : * $Author$ */ -public class DemoSourcesHandler { +public class DemoSourcesHandler implements UIHandler<DemoSources> { /** Logger */ private static final Log log = LogFactory.getLog(DemoSourcesHandler.class); protected static Map<String, String> sourcesCache; + public static String[] addDefaultSources(JAXXObject ui, String... extraSources) { + List<String> sources = Lists.newArrayList(); + String packageName = ui.getClass().getPackage().getName(); + String simpleName = ui.getClass().getSimpleName(); + addIfExist(ui, sources, packageName, simpleName + ".jaxx"); + addIfExist(ui, sources, packageName, simpleName + ".css"); + addIfExist(ui, sources, packageName, simpleName + "Handler.java"); + addIfExist(ui, sources, packageName, simpleName + "Model.java"); + Collections.addAll(sources, extraSources); + return sources.toArray(new String[sources.size()]); + } + + private static void addIfExist(JAXXObject ui, + List<String> sources, + String packageName, + String resourcePath) { + String path = "/" + packageName.replaceAll("\\.", "/"); + path += "/" + resourcePath; + InputStream resource = ui.getClass().getResourceAsStream(path); + try { + if (resource != null) { + sources.add(resourcePath); + } + } finally { + IOUtils.closeQuietly(resource); + } + + } + public static Map<String, String> getSourcesCache() { if (sourcesCache == null) { sourcesCache = new TreeMap<String, String>(); @@ -58,7 +94,7 @@ return sourcesCache; } - public String getSourceContent(DemoSources ui, String name) { + public String getSourceContent(String name) { if (name == null) { return ""; } @@ -69,7 +105,7 @@ log.debug(name + " from " + ui.getIncomingClass()); } int lastDotIndex = name.lastIndexOf("."); - String path = "/"+ name.substring(0, lastDotIndex).replaceAll("\\.", "/"); + String path = "/" + name.substring(0, lastDotIndex).replaceAll("\\.", "/"); path += name.substring(lastDotIndex); result = IOUtils.toString(ui.getIncomingClass().getResourceAsStream(path)); if (log.isDebugEnabled()) { @@ -84,7 +120,7 @@ return result; } - public String getSourceEditingStyle(DemoSources ui, String source) { + public String getSourceEditingStyle(String source) { if (source == null) { return ""; @@ -104,7 +140,37 @@ return s; } - public void init(DemoSources ui) { + DemoSources ui; + + @Override + public void beforeInit(DemoSources ui) { + this.ui = ui; + } + + @Override + public void afterInit(final DemoSources ui) { + + //fontSizor.setDefaultFontSize(getConfig().getFontSize()); + final FontSizor fontSizor = ui.getFontSizor(); + fontSizor.init(); + fontSizor.setCallBack(new Runnable() { + + @Override + public void run() { + log.info("update font size : " + fontSizor.getFontSize()); + ui.getConfig().setFontSize(fontSizor.getFontSize()); + } + }); + } + + public void updateSource(ItemEvent event) { + ui.setCurrentSource((String) ui.sourceTabs.getSelectedItem()); + ui.editor.setText(getSourceContent(ui.getCurrentSource())); + ui.editor.setSyntaxEditingStyle(getSourceEditingStyle(ui.getCurrentSource())); + ui.editor.setCaretPosition(0); + } + + public void init(final DemoSources ui) { List<String> sources = ui.getSources(); if (sources == null) { return; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -23,10 +23,8 @@ #L% --> - <JFrame id='mainFrame' width='1024' height='800' - decorator='help' - onWindowClosing='getHandler().close(mainFrame)'> + decorator='help' onWindowClosing='handler.close(mainFrame)'> <import> jaxx.demo.tree.DemoTreeHelper @@ -44,9 +42,6 @@ <DemoConfig id='config' initializer='getContextValue(DemoConfig.class)'/> - <DemoUIHandler id='handler' - initializer='getContextValue(DemoUIHandler.class)'/> - <DemoTreeHelper id='treeHelper' initializer='getContextValue(DemoTreeHelper.class)'/> @@ -56,10 +51,6 @@ public boolean acceptLocale(Locale l, String expected) { return l !=null && l.toString().equals(expected); } - -private void $afterCompleteSetup() { - getHandler().initUI(this); -} ]]> </script> @@ -67,32 +58,32 @@ <JMenu id='menuFile'> <JMenuItem id='menuFileConfiguration' - onActionPerformed="getHandler().showConfig(this)"/> + onActionPerformed="handler.showConfig(this)"/> <JMenu id='menuFileLanguage'> <JMenuItem id='menuFileLanguageFR' - onActionPerformed="getHandler().changeLanguage(this, Locale.FRANCE)"/> + onActionPerformed="handler.changeLanguage(this, Locale.FRANCE)"/> <JMenuItem id='menuFileLanguageUK' - onActionPerformed="getHandler().changeLanguage(this, Locale.UK)"/> + onActionPerformed="handler.changeLanguage(this, Locale.UK)"/> </JMenu> <JSeparator/> <JMenuItem id='menuFileFullscreen' - onActionPerformed="getHandler().changeScreen(this, true)"/> + onActionPerformed="handler.changeScreen(this, true)"/> <JMenuItem id='menuFileNormalscreen' - onActionPerformed="getHandler().changeScreen(this, false)"/> + onActionPerformed="handler.changeScreen(this, false)"/> <JSeparator/> <JMenuItem id='menuFileExit' - onActionPerformed="getHandler().close(this)"/> + onActionPerformed="handler.close(this)"/> </JMenu> <JMenu id='menuHelp'> <JMenuItem id='menuHelpLogs' - onActionPerformed="getHandler().showLogs(this)"/> + onActionPerformed="handler.showLogs(this)"/> <JMenuItem id='menuHelpHelp' - onActionPerformed="getHandler().showHelp(this, null)"/> + onActionPerformed="handler.showHelp(this, null)"/> <JMenuItem id='menuHelpSite' - onActionPerformed="getHandler().gotoSite(this)"/> + onActionPerformed="handler.gotoSite(this)"/> <JMenuItem id='menuHelpAbout' - onActionPerformed="getHandler().showAbout(this)"/> + onActionPerformed="handler.showAbout(this)"/> </JMenu> </JMenuBar> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -33,6 +33,7 @@ import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.config.ConfigUIHelper; @@ -40,8 +41,8 @@ import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.DecoratorProvider; import org.nuiton.i18n.I18n; -import org.nuiton.decorator.DecoratorProvider; import javax.swing.AbstractAction; import javax.swing.InputMap; @@ -72,7 +73,7 @@ * @author tchemit <chemit@codelutin.com> * @see DemoUI */ -public class DemoUIHandler { //implements JAXXHelp { +public class DemoUIHandler implements UIHandler<DemoUI>{ /** Logger */ static private Log log = LogFactory.getLog(DemoUIHandler.class); @@ -171,8 +172,14 @@ inputMap.put(keyStroke, OPEN_CONFIG_ACTION); } - public void initUI(final DemoUI ui) { + @Override + public void beforeInit(DemoUI ui) { + } + + @Override + public void afterInit(final DemoUI ui) { + // Creation of selection listener to open ui when tree selection change TreeSelectionListener listener = new TreeSelectionListener() { @Override @@ -459,37 +466,37 @@ helper.addCategory(n_("jaxxdemo.config.category.other"), n_("jaxxdemo.config.category.other.description")); - helper.addOption(DemoConfig.Option.FULL_SCREEN, - DemoConfig.PROPERTY_FULLSCREEN); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.FULL_SCREEN). + setOptionPropertyName(DemoConfig.PROPERTY_FULLSCREEN). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.FONT_SIZE, - DemoConfig.PROPERTY_FONT_SIZE); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.FONT_SIZE). + setOptionPropertyName(DemoConfig.PROPERTY_FONT_SIZE). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.LOCALE, - DemoConfig.PROPERTY_LOCALE); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.LOCALE). + setOptionPropertyName(DemoConfig.PROPERTY_LOCALE). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.DEMO_COLOR, - DemoConfig.PROPERTY_DEMO_COLOR); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.DEMO_COLOR). + setOptionPropertyName(DemoConfig.PROPERTY_DEMO_COLOR). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.DEMO_CLASS, - DemoConfig.PROPERTY_DEMO_CLASS); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.DEMO_CLASS). + setOptionPropertyName(DemoConfig.PROPERTY_DEMO_CLASS). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.KEY_OPEN_CONFIG, - DemoConfig.PROPERTY_KEY_OPEN_CONFIG); - helper.setOptionCallBack("ui"); + helper.addOption(DemoConfig.Option.KEY_OPEN_CONFIG). + setOptionPropertyName(DemoConfig.PROPERTY_KEY_OPEN_CONFIG). + setOptionCallBack("ui"); - helper.addOption(DemoConfig.Option.LOG_LEVEL, - DemoConfig.PROPERTY_LOG_LEVEL); - helper.setOptionCallBack("log"); + helper.addOption(DemoConfig.Option.LOG_LEVEL). + setOptionPropertyName(DemoConfig.PROPERTY_LOG_LEVEL). + setOptionCallBack("log"); - helper.addOption(DemoConfig.Option.LOG_PATTERN_LAYOUT, - DemoConfig.PROPERTY_LOG_PATTERN_LAYOUT); - helper.setOptionCallBack("log"); + helper.addOption(DemoConfig.Option.LOG_PATTERN_LAYOUT). + setOptionPropertyName(DemoConfig.PROPERTY_LOG_PATTERN_LAYOUT). + setOptionCallBack("log"); helper.buildUI(context, "jaxxdemo.config.category.other"); 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 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -56,12 +56,6 @@ }}'/> <script><![CDATA[ - -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), "BoxedDecoratorDemo.css" }; -} - void $afterCompleteSetup() { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { if (boxed == buttonD) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -28,8 +28,6 @@ jaxx.runtime.swing.editor.bean.BeanComboBox </import> - <BeanComboBoxDemoHandler id='handler' constructorParams='this'/> - <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> @@ -54,22 +52,4 @@ </row> </Table> - <script><![CDATA[ - -protected void $afterCompleteSetup() { - handler.init(); -} - -@Override -protected String[] getSources() { - return new String[]{ - getDefaultSource(), - "BeanComboBoxDemo.css", - "BeanComboBoxDemo.java", - "BeanComboBoxDemoHandler.java" - }; -} - -]]></script> - </jaxx.demo.DemoPanel> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -27,6 +27,7 @@ import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; +import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import java.util.List; @@ -40,19 +41,18 @@ * @author tchemit <chemit@codelutin.com> * @since 2.5.9 */ -public class BeanComboBoxDemoHandler { +public class BeanComboBoxDemoHandler implements UIHandler<BeanComboBoxDemo> { - private final BeanComboBoxDemo ui; + private JXPathDecorator<People> decorator; - private final JXPathDecorator<People> decorator; - - public BeanComboBoxDemoHandler(BeanComboBoxDemo ui) { - this.ui = ui; + @Override + public void beforeInit(BeanComboBoxDemo ui) { this.decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); } - public void init() { + @Override + public void afterInit(BeanComboBoxDemo ui) { List<People> data = new DemoDataProvider().getPeoples(); ui.getComboBox().init(decorator, data); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -28,8 +28,6 @@ jaxx.runtime.swing.editor.bean.BeanDoubleList </import> - <BeanDoubleListDemoHandler id='handler' constructorParams='this'/> - <Table fill='both'> <row> <cell> @@ -49,20 +47,4 @@ </row> </Table> - <script><![CDATA[ - -protected void $afterCompleteSetup() { - handler.init(); -} - -@Override -protected String[] getSources() { - return new String[]{ - getDefaultSource(), - "BeanDoubleListDemoHandler.java", - }; -} - -]]></script> - </jaxx.demo.DemoPanel> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -29,30 +29,34 @@ */ import com.google.common.base.Predicate; -import java.util.List; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.Movie; import jaxx.demo.entities.People; +import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.util.List; + /** @author kmorin */ -public class BeanDoubleListDemoHandler { +public class BeanDoubleListDemoHandler implements UIHandler<BeanDoubleListDemo> { private BeanDoubleListDemo ui; - public BeanDoubleListDemoHandler(BeanDoubleListDemo ui) { + @Override + public void beforeInit(BeanDoubleListDemo ui) { this.ui = ui; } - public void init() { + @Override + public void afterInit(BeanDoubleListDemo ui) { DemoDataProvider demoDataProvider = new DemoDataProvider(); List<People> data = demoDataProvider.getPeoples(); JXPathDecorator<People> decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); ui.getDoubleList().init(decorator, data, data.subList(0, 1)); - + final Movie nacho = demoDataProvider.getMovie("0"); final Predicate<People> filter = new Predicate<People>() { @@ -63,15 +67,13 @@ ui.getFilterOnNachoButton().addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { - if (ui.getFilterOnNachoButton().isSelected()) { - ui.getDoubleList().getHandler().addFilter(filter); - + if (BeanDoubleListDemoHandler.this.ui.getFilterOnNachoButton().isSelected()) { + BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().addFilter(filter); + } else { - ui.getDoubleList().getHandler().clearFilters(); + BeanDoubleListDemoHandler.this.ui.getDoubleList().getHandler().clearFilters(); } } }); - } - } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -28,8 +28,6 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> - <BeanFilterableComboBoxDemoHandler id='handler' constructorParams='this'/> - <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> @@ -55,22 +53,4 @@ </row> </Table> - <script><![CDATA[ - -protected void $afterCompleteSetup() { - handler.init(); -} - -@Override -protected String[] getSources() { - return new String[]{ - getDefaultSource(), - "BeanFilterableComboBoxDemo.css", - "BeanFilterableComboBoxDemo.java", - "BeanFilterableComboBoxDemoHandler.java" - }; -} - -]]></script> - </jaxx.demo.DemoPanel> \ No newline at end of file Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -27,6 +27,7 @@ import jaxx.demo.entities.DemoDataProvider; import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; +import jaxx.runtime.spi.UIHandler; import org.nuiton.decorator.JXPathDecorator; import java.util.List; @@ -40,19 +41,20 @@ * @author kmorin <kmorin@codelutin.com> * @since 2.5.12 */ -public class BeanFilterableComboBoxDemoHandler { +public class BeanFilterableComboBoxDemoHandler implements UIHandler<BeanFilterableComboBoxDemo> { - private final BeanFilterableComboBoxDemo ui; + private JXPathDecorator<People> decorator; - private final JXPathDecorator<People> decorator; - public BeanFilterableComboBoxDemoHandler(BeanFilterableComboBoxDemo ui) { - this.ui = ui; + @Override + public void beforeInit(BeanFilterableComboBoxDemo ui) { this.decorator = (JXPathDecorator<People>) new DemoDecoratorProvider().getDecoratorByType(People.class); } - public void init() { + @Override + public void afterInit(BeanFilterableComboBoxDemo ui) { + List<People> data = new DemoDataProvider().getPeoples(); ui.getComboBox().init(decorator, data); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -1,5 +1,4 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> - <!--handler='jaxx.demo.component.jaxx.editor.CoordinateDemoHandler'>--> <import> jaxx.runtime.swing.editor.NumberEditor @@ -12,24 +11,14 @@ <!-- model --> <CoordinateDemoModel id='model'/> + <!-- internal editor models --> <DmsCoordinate id='latitudeDms'/> <DmdCoordinate id='latitudeDmd'/> <Float id='latitudeDd' javaBean='null'/> - <DmsCoordinate id='longitudeDms'/> <DmdCoordinate id='longitudeDmd'/> <Float id='longitudeDd' javaBean='null'/> - <script><![CDATA[ - -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), "CoordinateDemoModel.java", "CoordinateDemoHandler.java" }; -} - -]]> - </script> - <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -34,11 +34,6 @@ <script><![CDATA[ -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), "NumberEditorDemoModel.java" }; -} - public void changeNumberPattern() { editor.setNumberPattern(numberPattern.getText()); } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -9,28 +9,6 @@ <!-- model --> <SimpleTimeEditorDemoModel id='demoModel'/> - <script><![CDATA[ - -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), - "SimpleTimeEditorModel.java", - "SimpleTimeEditorDemo.css" - }; -} - -void $afterCompleteSetup() { - - // init time editor - editor.init(); - - // set current time in model - demoModel.setTime(new java.util.Date()); -} -]]> - </script> - - <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> @@ -63,9 +41,6 @@ <cell> <SimpleTimeEditor id='editor' constructorParams='this' border='{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}'/> - <!--property='time'--> - <!--bean='{demoModel}'--> - <!--date="{demoModel.getTime()}"/>--> </cell> </row> <row> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -1,10 +1,25 @@ package jaxx.demo.component.jaxx.editor; +import jaxx.runtime.spi.UIHandler; + /** * Created on 11/22/13. * * @author Tony CHEMIT <chemit@codelutin.com> * @since 2.6 */ -public class SimpleTimeEditorDemoHandler { +public class SimpleTimeEditorDemoHandler implements UIHandler<SimpleTimeEditorDemo> { + @Override + public void beforeInit(SimpleTimeEditorDemo ui) { + + } + + @Override + public void afterInit(SimpleTimeEditorDemo ui) { + // init time editor + ui.editor.init(); + + // set current time in model + ui.demoModel.setTime(new java.util.Date()); + } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -33,14 +33,6 @@ <script><![CDATA[ -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), - "TimeEditorDemoModel.java", - "TimeEditorDemo.css" - }; -} - void $afterCompleteSetup() { // init time editor Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BeanDataBindingDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -29,7 +29,7 @@ <script><![CDATA[ @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "BaseBeanDataBinding.jaxx" }; + return addDefaultSources( "BaseBeanDataBinding.jaxx" ); } ]]> </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BindingExtremeDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -66,7 +66,7 @@ } @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "DemoUIModel.java", "DefaultDemoUIModel.java" }; + return addDefaultSources( "DemoUIModel.java", "DefaultDemoUIModel.java" ); } ]]> </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -40,14 +40,11 @@ <NavDemoTreeTableHelper id='treeTableHelper' constructorParams='getDataProvider()'/> - <NavDemoHandler id='handler' constructorParams='this'/> - <script><![CDATA[ @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), - "NavDemoHandler.java", + return addDefaultSources( "tree/NavDemoTreeNode.java", "tree/NavDemoTreeHelper.java", "tree/NavDemoTreeCellRenderer.java", @@ -57,12 +54,8 @@ "treetable/NavDemoTreeTableHelper.java", "treetable/ActorsTreeTableNodeLoador.java", "treetable/MoviesTreeTableNodeLoador.java" - }; + ); } - -private void $afterCompleteSetup() { - getHandler().$afterCompleteSetup(); -} ]]> </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 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -38,6 +38,7 @@ import jaxx.demo.feature.nav.treetable.NavDemoTreeTableNode; import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.nav.NavNode; @@ -67,58 +68,23 @@ * @author tchemit <chemit@codelutin.com> * @since 2.2 */ -public class NavDemoHandler { +public class NavDemoHandler implements UIHandler<NavDemo> { private static final Log log = LogFactory.getLog(NavDemoHandler.class); - protected final NavDemo ui; + protected NavDemo ui; public static String MOVIES_CATEGORY_NODE = n_("jaxxdemo.common.movies"); public static String ACTORS_CATEGORY_NODE = n_("jaxxdemo.common.actors"); - public NavDemoHandler(NavDemo ui) { + @Override + public void beforeInit(NavDemo ui) { this.ui = ui; } - public void initUI(MoviesContentUI contentUI) { - DecoratorProvider provider = - contentUI.getContextValue(DecoratorProvider.class); - JXPathDecorator<Movie> decorator = - (JXPathDecorator<Movie>) provider.getDecoratorByType(Movie.class); - contentUI.getListHeader().init(decorator, new ArrayList<Movie>()); - } - - public void initUI(ActorsContentUI contentUI) { - DecoratorProvider provider = - contentUI.getContextValue(DecoratorProvider.class); - JXPathDecorator<People> decorator = - (JXPathDecorator<People>) provider.getDecoratorByType(People.class); - contentUI.getListHeader().init(decorator, new ArrayList<People>()); - } - - public void selectChild(AbstractContentUI<?> contentUI, - AbstractDemoBean selected) { - contentUI.getTreeHelper().selectNode(selected.getId()); - contentUI.getTreeTableHelper().selectNode(selected.getId()); - } - - public String getContent(AbstractDemoBean data) { - if (data == null) { - return "no content"; - } - StringBuilder buffer = new StringBuilder(); - buffer.append(data); - return buffer.toString(); - } - - public ImageIcon getImage(AbstractDemoBean data) { - return data == null ? null : SwingUtil.createIcon(data.getImage()); - } - - /** To init the {@link NavDemo} ui. */ - public void $afterCompleteSetup() { - + @Override + public void afterInit(final NavDemo ui) { // share in context ui.setContextValue(this); @@ -199,6 +165,41 @@ SwingUtil.addExpandOnClickListener(table); } + public void initUI(MoviesContentUI contentUI) { + DecoratorProvider provider = + contentUI.getContextValue(DecoratorProvider.class); + JXPathDecorator<Movie> decorator = + (JXPathDecorator<Movie>) provider.getDecoratorByType(Movie.class); + contentUI.getListHeader().init(decorator, new ArrayList<Movie>()); + } + + public void initUI(ActorsContentUI contentUI) { + DecoratorProvider provider = + contentUI.getContextValue(DecoratorProvider.class); + JXPathDecorator<People> decorator = + (JXPathDecorator<People>) provider.getDecoratorByType(People.class); + contentUI.getListHeader().init(decorator, new ArrayList<People>()); + } + + public void selectChild(AbstractContentUI<?> contentUI, + AbstractDemoBean selected) { + contentUI.getTreeHelper().selectNode(selected.getId()); + contentUI.getTreeTableHelper().selectNode(selected.getId()); + } + + public String getContent(AbstractDemoBean data) { + if (data == null) { + return "no content"; + } + StringBuilder buffer = new StringBuilder(); + buffer.append(data); + return buffer.toString(); + } + + public ImageIcon getImage(AbstractDemoBean data) { + return data == null ? null : SwingUtil.createIcon(data.getImage()); + } + protected void openUI(NavNode<?, ?> demoNode) { // Get demoNode type Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -37,26 +37,20 @@ </import> <script><![CDATA[ -void $afterCompleteSetup() { - handler.initUI(); -} - @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "ListBeanValidationDemo.css", + return addDefaultSources( + "ListBeanValidationDemo.css", "/jaxx.demo.entities.People.java", "/jaxx.demo.entities.People-error-validation.xml", "/jaxx.demo.entities.People-info-validation.xml", "/jaxx.demo.entities.People-warning-validation.xml", "ListBeanValidationDemoHandler.java", "PeopleTableModel.java" - }; + ); } ]]></script> - <!-- Handler of this ui --> - <ListBeanValidationDemoHandler id='handler' constructorParams='this'/> - <!-- model --> <PeopleTableModel id='model'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2013-11-28 10:58:35 UTC (rev 2758) @@ -26,6 +26,7 @@ import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.entities.People; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingListValidatorDataLocator; import jaxx.runtime.validator.swing.SwingListValidatorMessageTableRenderer; import jaxx.runtime.validator.swing.SwingValidatorUtil; @@ -50,15 +51,17 @@ * @author tchemit <chemit@codelutin.com> * @since 2.5.3 */ -public class ListBeanValidationDemoHandler { +public class ListBeanValidationDemoHandler implements UIHandler<ListBeanValidationDemo>{ - private final ListBeanValidationDemo ui; + private ListBeanValidationDemo ui; - public ListBeanValidationDemoHandler(ListBeanValidationDemo ui) { + @Override + public void beforeInit(ListBeanValidationDemo ui) { this.ui = ui; } - public void initUI() { + @Override + public void afterInit(ListBeanValidationDemo ui) { // customize data table Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -38,13 +38,10 @@ </import> <script><![CDATA[ - -void $afterCompleteSetup() { -} - @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "Validation.css", + return addDefaultSources( + "Validation.css", "/jaxx.demo.entities.Identity.java", "/jaxx.demo.entities.Identity-error-validation.xml", "/jaxx.demo.entities.Identity-info-validation.xml", @@ -53,7 +50,7 @@ "/jaxx.demo.entities.Model-error-validation.xml", "/jaxx.demo.entities.Model-info-validation.xml", "/jaxx.demo.entities.Model-warning-validation.xml" - }; + ); } ]]> </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -45,7 +45,8 @@ @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "Validation.css", + return addDefaultSources ( + "Validation.css", "/jaxx.demo.entities.Identity.java", "/jaxx.demo.entities.Identity-error-validation.xml", "/jaxx.demo.entities.Identity-info-validation.xml", @@ -54,7 +55,7 @@ "/jaxx.demo.entities.Model-error-validation.xml", "/jaxx.demo.entities.Model-info-validation.xml", "/jaxx.demo.entities.Model-warning-validation.xml" - }; + ); } ]]></script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/CalculatorDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -38,7 +38,7 @@ @Override protected String[] getSources() { - return new String[]{ getDefaultSource(), "CalculatorDemo.css", "CalculatorEngine.java" }; + return addDefaultSources( "CalculatorEngine.java" ); } ]]> </script> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/fun/LabelStyleDemo.jaxx 2013-11-28 10:58:35 UTC (rev 2758) @@ -30,15 +30,6 @@ javax.swing.BorderFactory </import> - <!--<style source="LabelStyleDemo.css"/>--> - <script><![CDATA[ -@Override -protected String[] getSources() { - return new String[]{ getDefaultSource(), "LabelStyleDemo.css" }; -} - -]]> - </script> <Table id='demoPanel' anchor='north' fill='both'> <row> <cell weightx='1' weighty='1' insets='6, 3, 0, 0'> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-28 09:29:10 UTC (rev 2757) +++ trunk/pom.xml 2013-11-28 10:58:35 UTC (rev 2758) @@ -117,12 +117,12 @@ <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> - <eugeneVersion>2.6.3</eugeneVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <eugeneVersion>2.7.3</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.5-1</swingXVersion> - <plexusUtilVersion>3.0.10</plexusUtilVersion> + <plexusUtilVersion>3.0.15</plexusUtilVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -294,7 +294,8 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.0.7</version> + <!--<version>2.0.7</version>--> + <version>2.5.0</version> </dependency> <!-- swinglabs dependencies -->