r2189 - 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/component/swing jaxx-demo/src/main/java/jaxx/demo/entities 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/nav/content jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/e
Author: tchemit Date: 2011-02-01 18:43:44 +0100 (Tue, 01 Feb 2011) New Revision: 2189 Url: http://nuiton.org/repositories/revision/jaxx/2189 Log: optimize widgets code and demo too\! 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/DemoTab.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCallBackUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoPanel.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -25,11 +25,15 @@ <JPanel id='top' abstract='true'> + <import> + org.nuiton.util.StringUtil + </import> + <script><![CDATA[ protected String[] getSources() { - if (getClass() == DemoPanel.class) { - return new String[0]; + if (DemoPanel.class.equals(getClass())) { + return StringUtil.EMPTY_STRING_ARRAY; } return new String[]{ getDefaultSource() }; } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSources.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -26,15 +26,16 @@ <JPanel layout='{new BorderLayout()}'> <import> - org.fife.ui.rsyntaxtextarea.RSyntaxTextArea + jaxx.runtime.SwingUtil jaxx.runtime.swing.FontSizor + + java.awt.RenderingHints javax.swing.DefaultComboBoxModel - java.awt.RenderingHints + + org.fife.ui.rsyntaxtextarea.RSyntaxTextArea </import> <script><![CDATA[ -import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; -import jaxx.runtime.swing.FontSizor; public void init() { //fontSizor.setDefaultFontSize(getConfig().getFontSize()); @@ -65,7 +66,7 @@ <DemoSourcesHandler id='handler'/> - <Class id='incomingClass' javaBean='null'/> + <Class id='incomingClass' javaBean='null' genericType='?'/> <String id='currentSource' javaBean='null'/> @@ -91,7 +92,7 @@ constraints='BorderLayout.CENTER'> <RSyntaxTextArea id='editor' font-size='{getConfig().getFontSize()}' - minimumSize="{jaxx.runtime.SwingUtil.newMinDimension()}" + minimumSize="{SwingUtil.newMinDimension()}" textAntiAliasHint='{RenderingHints.KEY_ANTIALIASING.toString()}' editable="false" wrapStyleWord="false" Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTab.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -26,6 +26,7 @@ <JTabbedPane id='top'> <import> + java.util.Arrays javax.swing.SwingUtilities </import> @@ -53,7 +54,7 @@ <tab id='tabDemoSources' title='Sources'> <DemoSources id='sourceTabs' - sources='{java.util.Arrays.asList(demoPanel.getSources())}' + sources='{Arrays.asList(demoPanel.getSources())}' incomingClass='{demoPanel.getClass()}' constructorParams='demoPanel'/> </tab> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2011-02-01 17:43:44 UTC (rev 2189) @@ -37,7 +37,7 @@ #mainFrame { title:"JAXX Demo"; - iconImage:{jaxx.runtime.SwingUtil.createIcon(getConfig().getOption("application.icon.path")).getImage()}; + iconImage:{SwingUtil.createIcon(getConfig().getOption("application.icon.path")).getImage()}; undecorated:{getConfig().isFullScreen()}; } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -29,12 +29,14 @@ onWindowClosing='getHandler().close(mainFrame)'> <import> - java.awt.Dimension jaxx.demo.tree.DemoTreeHelper jaxx.demo.tree.DemoCellRenderer + + jaxx.runtime.SwingUtil jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.StatusMessagePanel - + + java.awt.Dimension java.util.Locale </import> 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-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -27,13 +27,16 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> + jaxx.runtime.SwingUtil jaxx.runtime.swing.BlockingLayerUI jaxx.runtime.swing.BlockingLayerUI2 - javax.swing.JComponent - javax.swing.DefaultListModel + java.awt.Color + java.awt.event.ActionEvent + javax.swing.AbstractAction - java.awt.event.ActionEvent + javax.swing.DefaultListModel + javax.swing.JComponent </import> <BlockingLayerUI id='layerUI' acceptAction='{new AbstractAction() { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/ComboEditorDemo.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -25,6 +25,12 @@ <jaxx.demo.DemoPanel> + + <import> + org.nuiton.i18n.LanguageEnum + org.nuiton.i18n.CountryEnum + </import> + <Table fill='both'> <row> <cell> @@ -40,8 +46,8 @@ <JLabel text='EnumEditor (language) :' labelFor='{languageEditor}'/> </cell> <cell> - <EnumEditor id='languageEditor' - constructorParams='org.nuiton.i18n.LanguageEnum.class'/> + <EnumEditor id='languageEditor' genericType='LanguageEnum' + constructorParams='LanguageEnum.class'/> </cell> </row> <row> @@ -49,8 +55,8 @@ <JLabel text='EnumEditor (country) :' labelFor='{countryEditor}'/> </cell> <cell> - <EnumEditor id='countryEditor' - constructorParams='org.nuiton.i18n.CountryEnum.class'/> + <EnumEditor id='countryEditor' genericType='CountryEnum' + constructorParams='CountryEnum.class'/> </cell> </row> <row> 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-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -38,15 +38,15 @@ </script> <JMenuBar id='menuBar'> <JMenu text='Font size'> - <JRadioButtonMenuItem text='10' value='{new Integer(10)}' + <JRadioButtonMenuItem text='10' value='{10}' buttonGroup='fontSize'/> - <JRadioButtonMenuItem text='12' value='{new Integer(12)}' + <JRadioButtonMenuItem text='12' value='{12}' buttonGroup='fontSize' selected='true'/> - <JRadioButtonMenuItem text='14' value='{new Integer(14)}' + <JRadioButtonMenuItem text='14' value='{14}' buttonGroup='fontSize'/> - <JRadioButtonMenuItem text='18' value='{new Integer(18)}' + <JRadioButtonMenuItem text='18' value='{18}' buttonGroup='fontSize'/> - <JRadioButtonMenuItem text='24' value='{new Integer(24)}' + <JRadioButtonMenuItem text='24' value='{24}' buttonGroup='fontSize'/> </JMenu> </JMenuBar> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JSpinnerDemo.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -24,15 +24,12 @@ --> <jaxx.demo.DemoPanel> - <import> - javax.swing.SpinnerNumberModel - </import> - + <JLabel text='Spacing:' displayedMnemonic='S' labelFor='{spinner}'/> <JSpinner minimum='0' maximum='50' id='spinner'/> - <VBox spacing='{((Integer) spinner.getValue()).intValue()}'> + <VBox spacing='{(Integer) spinner.getValue()}'> <JLabel text='Use the spinner to'/> <JLabel text='adjust the spacing'/> <JLabel text='between these lines'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2011-02-01 17:43:44 UTC (rev 2189) @@ -47,6 +47,8 @@ public static final String PROPERTY_IMAGE = "image"; + private static final long serialVersionUID = 1L; + protected String id; protected String image; 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-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/BaseBeanDataBinding.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -34,14 +34,18 @@ <String id='contentMessage' javaBean='"message..."'/> <script> - void $afterCompleteSetup(){} - public Boolean isEditing2() { return editing2; } + void $afterCompleteSetup(){ + } - public void setEditing2(Boolean newValue) { - Boolean oldValue = this.editing2; - this.editing2 = newValue; - firePropertyChange("editing2", oldValue, newValue) ; + public Boolean isEditing2() { + return editing2; } + + public void setEditing2(Boolean editing2) { + Boolean oldValue = this.editing2; + this.editing2 = editing2; + firePropertyChange("editing2", oldValue, editing2); + } </script> </jaxx.demo.DemoPanel> 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 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemo.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -25,17 +25,10 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> - jaxx.demo.feature.nav.content.* - jaxx.demo.feature.nav.tree.* - jaxx.demo.feature.nav.treetable.* - jaxx.demo.entities.* - jaxx.runtime.decorator.DecoratorProvider - jaxx.runtime.swing.nav.NavNode - jaxx.runtime.swing.editor.bean.BeanListHeader + jaxx.demo.feature.nav.tree.NavDemoTreeHelper + jaxx.demo.feature.nav.treetable.NavDemoTreeTableHelper org.jdesktop.swingx.JXTreeTable - javax.swing.tree.TreePath - java.lang.reflect.Constructor </import> <CardLayout2 id='contentLayout'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/AbstractContentUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -24,7 +24,7 @@ <JPanel abstract='true' layout='{new BorderLayout()}' - genericType='B extends Object'> + genericType='B'> <import> jaxx.demo.feature.nav.NavDemoHandler 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-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -22,9 +22,10 @@ #L% --> -<AbstractContentUI superGenericType='java.util.List<People>'> +<AbstractContentUI superGenericType='List<People>'> <import> + java.util.List jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -22,9 +22,10 @@ #L% --> -<AbstractContentUI superGenericType='java.util.List<Movie>'> +<AbstractContentUI superGenericType='List<Movie>'> <import> + java.util.List jaxx.demo.entities.Movie jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -51,133 +51,28 @@ <Color id='backgroundColor' javaBean='null'/> <script><![CDATA[ - -/*final Action closeAction = new AbstractAction("close") { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - JDialog container = getParentContainer(JDialog.class); - if (container != null) { - container.dispose(); - } else { - setVisible(false); - } - } -};*/ - public void setLicenseFile(String filename) { handler.setLicenseFile(filename); - //String load = load(filename); - //setLicenseText(load); } public void setThirdpartyFile(String filename) { handler.setThirdpartyFile(filename); - //String load = load(filename); - //setThirdpartyText(load); } public void buildTopPanel() { handler.buildTopPanel(); - // image - //JLabel labelIcon; - //if (iconPath != null) { - // Icon logoIcon = Resource.getIcon(iconPath); - // labelIcon = new JLabel(logoIcon); - //} else { - // labelIcon = new JLabel(); - //} - //topPanel.add(labelIcon); } public void init() { handler.init(); - /*if (getAboutText() == null) { - tabs.remove(aboutContent); - } - if (getLicenseText() == null) { - tabs.remove(licenseContent); - } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - licenseTextArea.setCaretPosition(0); - } - }); - - } - if (getThirdpartyText() == null) { - tabs.remove(thirdpartyContent); - } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - thirdpartyTextArea.setCaretPosition(0); - } - }); - }*/ } public void showInDialog(Frame ui, boolean undecorated) { handler.showInDialog(ui, undecorated); - /*JDialog f = new JDialog(ui, true); - f.add(this); - if (iconPath != null) { - f.setIconImage(SwingUtil.createIcon(iconPath).getImage()); - } - f.setResizable(false); - f.setSize(550, 450); - f.setUndecorated(undecorated); - JRootPane rootPane = f.getRootPane(); - rootPane.setDefaultButton(close); - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); - rootPane.getActionMap().put("close", closeAction); - f.addWindowListener(new WindowAdapter() { - @Override - public void windowClosed(WindowEvent e) { - Component ui = (Component) e.getSource(); - if (log.isInfoEnabled()) { - log.info("destroy ui "+ ui); - } - JAXXUtil.destroy(ui); - JAXXUtil.destroy(AboutPanel.this); - } - }); - SwingUtil.center(ui, f); - f.setVisible(true);*/ } -/*protected String load(String filename) { - InputStream licenseStream = getClass().getResourceAsStream("/" + filename); - String result = null; - try { - if (licenseStream != null) { - result = IOUtils.toString(licenseStream); - } - } catch (IOException ex) { - // ignore it - } finally { - if (licenseStream != null) { - try { - licenseStream.close(); - } catch (IOException ex) { - log.error("could not close file " + filename); - } - } - } - if (result == null) { - result = "resource " + filename + " not found"; - } - return result; -}*/ - void $afterCompleteSetup() { handler.$afterCompleteSetup(); - //buildTopPanel(); - //close.setText(_("aboutframe.ok")); } ]]> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ErrorDialogUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -36,31 +36,13 @@ public static void init(Frame frame) { ErrorDialogUIHandler.init(frame); - /*disposeUI(); - instance = new ErrorDialogUI(frame); - instance.setModalityType(ModalityType.TOOLKIT_MODAL);*/ } public static void showError(Exception e) { ErrorDialogUIHandler.showError(e); - /*if (instance == null) { - instance = new ErrorDialogUI(); - } - instance.getErrorMessage().setText(e.getMessage()); - StringWriter w = new StringWriter(); - e.printStackTrace(new PrintWriter(w)); - instance.getErrorStack().setText(w.toString()); - instance.getErrorStack().setCaretPosition(0); - instance.pack(); - jaxx.runtime.SwingUtil.center(instance.getContextValue(JFrame.class,"parent"), instance); - instance.setVisible(true);*/ } public static void disposeUI() { ErrorDialogUIHandler.disposeUI(); - /*if (instance != null) { - JAXXUtil.destroy(instance); - } - instance=null;*/ } public ErrorDialogUI(Frame frame) { @@ -69,17 +51,11 @@ setContextValue(frame); setContextValue(frame,"parent"); } - } void $afterCompleteSetup() { handler.$afterCompleteSetup(); } - -/*JRootPane rootPane = getRootPane(); -rootPane.setDefaultButton(close); -rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); -rootPane.getActionMap().put("close", close.getAction());*/ ]]></script> <Table> <row fill='both'> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/FontSizor.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -22,14 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - - <JPanel layout='{new BorderLayout()}'> - <!--import> - java.awt.BorderLayout - </import--> - <FontSizorHandler id='handler' constructorParams='this'/> <!-- default size of font --> @@ -43,50 +37,20 @@ <Boolean id='showFontSize' javaBean='false'/> <script><![CDATA[ -/* -public static final String BINDING_FONT_SIZE_CALL_BACK = "fontSize.callBack"; -public static final String BINDING_DEFAULT_FONT_SIZE_CALL_BACK = "defaultFontSize.callBack"; -*/ - public void init() { handler.init(); - /*if (fontSize == null) { - setFontSize(defaultFontSize); - }*/ } boolean updateDefaultSizeEnabled(Float fontSize, Float defaultFontSize, boolean enabled) { return handler.updateDefaultSizeEnabled( fontSize,defaultFontSize, enabled); - /*if (fontSize==null || defaultFontSize==null) { - return false; - } - return !fontSize.equals(defaultFontSize) && enabled;*/ } -public void setCallBack(final Runnable action) { +public void setCallBack(Runnable action) { handler.setCallBack(action); - /*removeDataBinding(BINDING_FONT_SIZE_CALL_BACK); - registerDataBinding(new SimpleJAXXObjectBinding(this, BINDING_FONT_SIZE_CALL_BACK, true ,"fontSize") { - - @Override - public void processDataBinding() { - action.run(); - } - }); - applyDataBinding(BINDING_FONT_SIZE_CALL_BACK);*/ } void $afterCompleteSetup() { - handler.$afterCompleteSetup(); - /*registerDataBinding(new SimpleJAXXObjectBinding(this, BINDING_DEFAULT_FONT_SIZE_CALL_BACK, true ,"defaultFontSize") { - - @Override - public void processDataBinding() { - setFontSize(defaultFontSize); - } - }); - //applyDataBinding(BINDING_DEFAULT_FONT_SIZE_CALL_BACK); - */ + handler.$afterCompleteSetup(); } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -59,20 +59,6 @@ myHandler.$afterCompleteSetup(); } -/*addPropertyChangeListener("targetVisible", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); - } - boolean newValue = (Boolean) evt.getNewValue(); - if (target != null) { - target.setVisible(newValue); - } - } -});*/ - public void setTarget(JComponent target) { JComponent oldValue = this.target; this.target = target; @@ -86,21 +72,6 @@ public void setHideIcon(Icon icon) { putClientProperty("hideIcon", icon); } - -/*protected String updateToolTipText(boolean c) { - String i = c ? hideTip : showTip; - return i; -} - -protected String updateText(boolean c) { - String i = c ? hideText : showText; - return i; -} - -protected Icon updateIcon(boolean c) { - String key = c ? "hideIcon" : "showIcon"; - return (Icon) getClientProperty(key); -}*/ ]]> </script> </JToggleButton> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -46,7 +46,7 @@ <script><![CDATA[ -public void setHandler(ListSelectorHandler handler) { +public void setHandler(ListSelectorHandler<B> handler) { this.handler = handler; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidget.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -31,9 +31,6 @@ <import> java.awt.Color java.awt.Graphics - java.awt.font.FontRenderContext - java.awt.font.LineMetrics - java.awt.geom.Rectangle2D java.awt.event.ActionEvent javax.swing.Timer </import> @@ -47,18 +44,7 @@ <script><![CDATA[ - /* -import java.awt.font.FontRenderContext; -import java.awt.font.LineMetrics; -import java.awt.geom.Rectangle2D; -private final static String memoryTestStr = "99999/99999Mb"; - -private FontRenderContext frc = new FontRenderContext(null, false, false); - -private LineMetrics lm = new JLabel().getFont().getLineMetrics(memoryTestStr, frc); -*/ - @Override public void actionPerformed(ActionEvent evt) { repaint(); @@ -84,48 +70,11 @@ @Override public void paintComponent(Graphics g) { handler.paintComponent(g); - /*Insets insets = new Insets(0, 0, 0, 0); - Runtime runtime = Runtime.getRuntime(); - int freeMemory = (int) (runtime.freeMemory() / 1024L); - int totalMemory = (int) (runtime.totalMemory() / 1024L); - int usedMemory = totalMemory - freeMemory; - int width = getWidth() - insets.left - insets.right; - int height = getHeight() - insets.top - insets.bottom - 1; - float fraction = (float) usedMemory / (float) totalMemory; - g.setColor(progressBackground); - g.fillRect(insets.left, insets.top, (int) ((float) width * fraction), height); - // No i18n string was : - // String str = usedMemory / 1024 + "/" + totalMemory / 1024 + "Mb"; - String str = _("memorywidget.memory", usedMemory / 1024, totalMemory / 1024); - //FontRenderContext frc = new FontRenderContext(null, false, false); - Rectangle2D bounds = g.getFont().getStringBounds(str, frc); - Graphics g2 = g.create(); - g2.setClip(insets.left, insets.top, - (int) ((float) width * fraction), height); - g2.setColor(progressForeground); - g2.drawString(str, insets.left - + (int) ((double) width - bounds.getWidth()) / 2, - (int) ((float) insets.top + lm.getAscent())); - g2.dispose(); - g2 = g.create(); - g2.setClip(insets.left + (int) ((float) width * fraction), - insets.top, getWidth() - insets.left - - (int) ((float) width * fraction), height); - g2.setColor(getForeground()); - g2.drawString(str, insets.left - + (int) ((double) width - bounds.getWidth()) / 2, - (int) ((float) insets.top + lm.getAscent())); - g2.dispose();*/ } void $afterCompleteSetup() { handler.$afterCompleteSetup(); - /*setFont(new JLabel().getFont()); - Rectangle2D bounds = getFont().getStringBounds(memoryTestStr, frc); - Dimension dim = new Dimension((int) bounds.getWidth(), (int) bounds .getHeight()); - setPreferredSize(dim); - setMaximumSize(dim);*/ } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -42,16 +42,13 @@ public void clearStatus() { handler.clearStatus(); - /*handler.stopStatusFader(this); - getStatusLabel().setText(EMPTY_STATUS); - //getStatusLabel().setString(EMPTY_STATUS);*/ } public void startProgress() { startProgress(null); } -public void startProgress(final String status) { +public void startProgress(String status) { setBusy(true); setStatus(status); } @@ -67,15 +64,6 @@ public void setStatus(String status) { handler.setStatus(status); - /*if (status != null) { - handler.stopStatusFader(this); - getStatusLabel().setText(status); - //getStatusLabel().setString(status); - } - - if (!isBusy()) { - handler.startStatusFader(this); - }*/ } @Override @@ -102,19 +90,10 @@ public void init() { handler.init(); - /*if (isShowBusy()) { - Dimension dim = new Dimension(30, 15); - //Dimension dim = new Dimension(30, (int) statusLabel.getPreferredSize().getHeight()); - //log.info("dimension of busy = "+ dim); - //busyWidget.setPreferredSize(dim); - busyWidget.setMaximumSize(dim); - busyWidget.setMinimumSize(dim); - }*/ } void $afterCompleteSetup() { -handler.$afterCompleteSetup(); - //init(); + handler.$afterCompleteSetup(); } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -31,6 +31,9 @@ onFocusLost='setPopupVisible(false)'> <import> + + jaxx.runtime.SwingUtil + java.awt.BorderLayout java.awt.event.ItemEvent java.awt.event.ActionEvent @@ -92,12 +95,6 @@ onStateChanged='log.info(indexes.getSelectedValue())'/> <script><![CDATA[ -import java.util.Locale; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import jaxx.runtime.swing.renderer.LocaleListCellRenderer; -import static org.nuiton.i18n.I18n.n_; - public static final String DEFAULT_SELECTED_TOOLTIP = n_("i18neditor.selected"); public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n_("i18neditor.unselected"); @@ -114,181 +111,37 @@ void $afterCompleteSetup() { handler.$afterCompleteSetup(); - //buildTopPanel(); - //close.setText(_("aboutframe.ok")); } @Override public void propertyChange(PropertyChangeEvent evt) { handler.propertyChange(evt); - /*String name = evt.getPropertyName(); - if (log.isDebugEnabled()) { - log.debug(name+" <old:"+evt.getOldValue()+" - new:"+evt.getNewValue()+">"); - } - log.info(name + " <old:"+evt.getOldValue()+" - new:"+evt.getNewValue()+">"); - if (LOCALES_PROPERTY.equals(name)) { - java.util.Collection<?> newLocales = (java.util.Collection<?>) evt.getNewValue(); - // mise a jour de la popup - boolean oldShowText = renderer.isShowText(); - try { - renderer.setShowText(true); - popup.removeAll(); - for (Object o : newLocales) { - Locale l = (Locale) o; - boolean selected = l.equals(selectedLocale); - String text = isShowPopupText() ? renderer.getText(l) : null; - Icon icon = isShowPopupIcon() ? renderer.getIcon(l) : null; - JRadioButtonMenuItem b = new JRadioButtonMenuItem(text, icon, selected); - popup.add(b); - b.addActionListener(this); - b.putClientProperty("locale", l); - b.setToolTipText(getTip(l)); - b.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, getIndexes()); - b.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, l); - } - } finally { - renderer.setShowText(oldShowText); - popup.invalidate(); - } - return; - } - if (SHOW_ICON_PROPERTY.equals(name)) { - renderer.setShowIcon((Boolean) evt.getNewValue()); - processDataBinding("button.icon"); - return; - } - if (SHOW_TEXT_PROPERTY.equals(name)) { - renderer.setShowText((Boolean) evt.getNewValue()); - processDataBinding("button.text"); - return; - } - if (SHOW_POPUP_ICON_PROPERTY.equals(name)) { - rebuildPopup(); - return; - } - if (SHOW_POPUP_TEXT_PROPERTY.equals(name)) { - rebuildPopup(); - return; - } - if (POPUP_BORDER_PROPERTY.equals(name)) { - popup.setBorder((Border)evt.getNewValue()); - return; - } - if (POPUP_VISIBLE_PROPERTY.equals(name)) { - Boolean newValue = (Boolean) evt.getNewValue(); - if (newValue == null || !newValue) { - if (getPopup() != null && getPopup().isVisible()) { - getPopup().setVisible(false); - } - return; - } - if (!getPopup().isVisible()) { - SwingUtilities.invokeLater(showPopupRunnable); - } - return; - } - if (SELECTED_LOCALE_PROPERTY.equals(name)) { - Locale newLocale = (Locale) evt.getNewValue(); - // mise a jour de la popup - try { - for (Component c : popup.getComponents()) { - if (c instanceof JRadioButtonMenuItem) { - JRadioButtonMenuItem b = (JRadioButtonMenuItem) c; - Locale l = (Locale) b.getClientProperty("locale"); - b.setSelected(newLocale.equals(l)); - } - } - } finally { - popup.invalidate(); - } - return; - }*/ } @Override public void actionPerformed(ActionEvent event) { handler.actionPerformed(event); - /*Locale value = (Locale) - ((JComponent)event.getSource()).getClientProperty("locale"); - if (log.isDebugEnabled()) { - log.debug("new locale : " + value); - } - setSelectedLocale(value);*/ } public void loadI18nBundles() { handler.loadI18nBundles(); - /*Locale[] locales = org.nuiton.i18n.I18n.getStore().getLocales(); - setLocales(java.util.Arrays.asList(locales));*/ } protected void rebuildPopup() { handler.rebuildPopup(); - /*log.debug("start rebuild"); - try { - for (Component c : popup.getComponents()) { - if (c instanceof JRadioButtonMenuItem) { - JRadioButtonMenuItem b = (JRadioButtonMenuItem) c; - Locale l = (Locale) b.getClientProperty("locale"); - String text = isShowPopupText() ? renderer.getSafeText(l) : null; - Icon icon = isShowPopupIcon() ? renderer.getSafeIcon(l) : null; - b.setIcon(icon); - b.setText(text); - log.debug("text=" + text); - log.debug("icon=" + icon); - } - } - } finally { - popup.invalidate(); - }*/ } protected String getTip(Locale l) { return handler.getTip(l); - /*boolean selected = l.equals(selectedLocale); - String tip = selected ? getSelectedTip(l):getNotSelectedTip(l); - return tip;*/ } protected String getSelectedTip(Locale l) { return handler.getSelectedTip(l); - /*String selectedTip = getSelectedToolTipText(); - if (selectedTip == null) { - // use default selected tip text - selectedTip = DEFAULT_SELECTED_TOOLTIP; - } - String tip = renderer.getToolTipText(l); - tip = _(selectedTip, tip); - return tip;*/ } protected String getNotSelectedTip(Locale l) { return handler.getNotSelectedTip(l); - /*String selectedTip = getNotSelectedToolTipText(); - if (selectedTip == null) { - // use default not selected tip text - selectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; - } - String tip = renderer.getToolTipText(l); - tip = _(selectedTip, tip); - return tip;*/ } - -/*protected Runnable showPopupRunnable = new Runnable() { - @Override - public void run() { - getPopup().pack(); - JToggleButton invoker = getButton(); - Dimension dim = getPopup().getPreferredSize(); - Dimension invokerDim = invoker.getSize(); - getPopup().show(invoker, (int) (invokerDim.getWidth() - dim.getWidth()), invoker.getHeight()); -// getPopup().setVisible(true); - } -};*/ - -/* -addPropertyChangeListener(this);*/ - ]]> </script> </JPanel> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2011-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -50,7 +50,7 @@ <Number id="model" javaBean='null'/> <!-- editor model type (specify it when you want to use a special type other than Integer or Float)--> - <Class id="modelType" javaBean='null'/> + <Class id="modelType" genericType='?' javaBean='null'/> <!-- useFloat property --> <Boolean id='useFloat' javaBean='false'/> 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-02-01 17:43:17 UTC (rev 2188) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2011-02-01 17:43:44 UTC (rev 2189) @@ -28,7 +28,6 @@ onFocusLost='hidePopup()'> <import> - static org.nuiton.i18n.I18n.n_ jaxx.runtime.decorator.JXPathDecorator javax.swing.border.TitledBorder </import> @@ -103,7 +102,7 @@ </JPopupMenu> <script><
tchemit＠users.nuiton.org