From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:10 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2309 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 02 Jun 2009 17:46:04 +0200
Message-ID: <20090602154604.DD322461A74@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9023871607738640907=="

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

Author: chatellier
Date: 2009-06-02 15:46:04 +0000 (Tue, 02 Jun 2009)
New Revision: 2309

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.=
jaxx
Log:
Remove non blocking useless layer.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputCon=
tentUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-06-02 15:38:17 UTC (rev 2308)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2009-06-02 15:46:04 UTC (rev 2309)
@@ -30,26 +30,16 @@
     <!-- Next button title -->
     <java.lang.String id=3D'nextPath' javaBean=3D'null'/>
=20
-    <!-- TODO is both of blocking UI used ? -->
-    <jaxx.runtime.swing.BlockingLayerUI id=3D'layerUI'
-                     blockIcon=3D'{SwingUtil.createImageIcon("building.png")=
}'
-                     acceptIcon=3D'{SwingUtil.createImageIcon("building_add.=
png")}'
-                     useIcon=3D'true'
-                     blockingColor=3D'{new Color(50,50,50)}'
-                     acceptAction=3D'{new AbstractAction() { private static =
final long serialVersionUID =3D 1L;
-                     @Override
-                     public void actionPerformed(ActionEvent e) {
-                        accept(e);
-                     }
-                     }}' />
-    <jaxx.runtime.swing.BlockingLayerUI2 id=3D'layerUI2'
+    <!-- Sensitivity UI bloking layer -->
+    <jaxx.runtime.swing.BlockingLayerUI2 id=3D'sensitivityLayerUI'
                          blockIcon=3D'{SwingUtil.createImageIcon("building.p=
ng")}'
                          acceptIcon=3D'{SwingUtil.createImageIcon("building_=
add.png")}'
-                         acceptAction=3D'{new AbstractAction() { private sta=
tic final long serialVersionUID =3D 1L;
-                         @Override
-                         public void actionPerformed(ActionEvent e) {
-                            accept(e);
-                         }
+                         acceptAction=3D'{new AbstractAction() {
+                            private static final long serialVersionUID =3D 1=
L;
+                            @Override
+                            public void actionPerformed(ActionEvent e) {
+                                accept(e);
+                            }
                          }}' />
=20
     <script><![CDATA[
@@ -93,10 +83,9 @@
=20
 // TODO this method cause a lot of probleme
 // must cast TopiaEntity to impl in inherited UIs...
-public void setBean(TopiaEntity t) {
+// 20090602 chatellier : useless method ? cause a lot of cast problem
+//public void setBean(TopiaEntity t) {}
=20
-}
-
 public void setLayer(boolean active) {
     if (this.get$objectMap() !=3D null) {
         for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {
@@ -108,13 +97,8 @@
                    isSensitivity =3D UtilsUI.isSensitivity(classBean.getSimp=
leName().replace("Impl", "") + "." + method);
             }
             if (isSensitivity) {
-                jaxx.runtime.swing.BlockingLayerUI2 ui =3D active ? layerUI2=
.clone() : null;
+                jaxx.runtime.swing.BlockingLayerUI2 ui =3D active ? sensitiv=
ityLayerUI.clone() : null;
                 SwingUtil.getLayer(boxed).setUI(ui);
-            } else {
-                jaxx.runtime.swing.BlockingLayerUI ui =3D active ? layerUI.c=
lone() : null;
-                ui.setBlock(true);
-                ui.setUseIcon(isSensitivity && isActif());
-                SwingUtil.getLayer(boxed).setUI(ui);
             }
         }
     }


--===============9023871607738640907==--