From tchemit@users.nuiton.org Tue Jul 31 17:26:06 2012
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] r2461 -
	trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
Date: Tue, 31 Jul 2012 17:26:06 +0200
Message-ID: <20120731152606.CD44C158BF@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4816711757305928993=="

--===============4816711757305928993==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/ConfigCa=
tegoryUI.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/ConfigUI=
Handler.java

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/C=
onfigCategoryUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
ategoryUI.jaxx	2012-07-31 15:18:20 UTC (rev 2460)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigC=
ategoryUI.jaxx	2012-07-31 15:26:06 UTC (rev 2461)
@@ -26,18 +26,13 @@
=20
   <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>
=20
-  <!--<style source=3D'ConfigCategoryUI.css'/>-->
-
   <ConfigCategoryUIHandler id=3D'handler' constructorParams=3D'this'/>
=20
   <script><![CDATA[

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/C=
onfigUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigU=
I.jaxx	2012-07-31 15:18:20 UTC (rev 2460)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigU=
I.jaxx	2012-07-31 15:26:06 UTC (rev 2461)
@@ -28,24 +28,16 @@
     jaxx.runtime.swing.editor.config.model.ConfigUIModel
   </import>
=20
-  <!--<style source=3D'ConfigUI.css'/>-->
-
   <script><![CDATA[
=20
 public void init(String defaultCategory) {
     getHandler().initUI(defaultCategory);
 }
=20
-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/C=
onfigUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigU=
IHandler.java	2012-07-31 15:18:20 UTC (rev 2460)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigU=
IHandler.java	2012-07-31 15:26:06 UTC (rev 2461)
@@ -25,6 +25,7 @@
  */
 package jaxx.runtime.swing.editor.config;
=20
+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);
     }
=20
+    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 =3D (JPanel) ui.getCategories().getSelectedComponent();
         if (p =3D=3D null) {
@@ -238,7 +247,7 @@
=20
     protected void closeUI(Window parentWindow, ConfigUIModel model) {
=20
-        ui.destroy();
+        destroy();
=20
         // close the config ui
         parentWindow.dispose();


--===============4816711757305928993==--