Author: tchemit Date: 2012-07-31 17:26:06 +0200 (Tue, 31 Jul 2012) New Revision: 2461 Url: http://nuiton.org/repositories/revision/jaxx/2461 Log: fixes #2217: Improve ConfigUI Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2012-07-31 15:26:06 UTC (rev 2461) @@ -26,18 +26,13 @@ <import> java.awt.Color - java.awt.Font javax.swing.DefaultListSelectionModel javax.swing.ScrollPaneConstants jaxx.runtime.swing.editor.config.model.CategoryModel jaxx.runtime.swing.editor.config.model.ConfigTableModel jaxx.runtime.swing.editor.config.model.ConfigUIModel - jaxx.runtime.swing.editor.config.model.OptionModel - static org.nuiton.i18n.I18n.n_ </import> - <!--<style source='ConfigCategoryUI.css'/>--> - <ConfigCategoryUIHandler id='handler' constructorParams='this'/> <script><![CDATA[ Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUI.jaxx 2012-07-31 15:26:06 UTC (rev 2461) @@ -28,24 +28,16 @@ jaxx.runtime.swing.editor.config.model.ConfigUIModel </import> - <!--<style source='ConfigUI.css'/>--> - <script><![CDATA[ public void init(String defaultCategory) { getHandler().initUI(defaultCategory); } -public void destroy() { - log.info("destroy ui " + getName()); - JAXXUtil.destroy(this); - model.destroy(); -} - @Override protected void finalize() throws Throwable { super.finalize(); - destroy(); + getHandler().destroy(); } ]]> </script> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2012-07-31 15:18:20 UTC (rev 2460) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2012-07-31 15:26:06 UTC (rev 2461) @@ -25,6 +25,7 @@ */ package jaxx.runtime.swing.editor.config; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.config.model.CallBackEntry; @@ -130,6 +131,14 @@ categories.setSelectedIndex(categoryIndex); } + public void destroy() { + if (log.isDebugEnabled() ) { + log.debug("destroy ui " + ui.getName()); + } + JAXXUtil.destroy(ui); + ui.getModel().destroy(); + } + public void changeCategory(ChangeEvent e) { JPanel p = (JPanel) ui.getCategories().getSelectedComponent(); if (p == null) { @@ -238,7 +247,7 @@ protected void closeUI(Window parentWindow, ConfigUIModel model) { - ui.destroy(); + destroy(); // close the config ui parentWindow.dispose();