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/InputContentUI.jaxx =================================================================== --- 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='nextPath' javaBean='null'/> - <!-- TODO is both of blocking UI used ? --> - <jaxx.runtime.swing.BlockingLayerUI id='layerUI' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - useIcon='true' - blockingColor='{new Color(50,50,50)}' - acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } - }}' /> - <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' + <!-- Sensitivity UI bloking layer --> + <jaxx.runtime.swing.BlockingLayerUI2 id='sensitivityLayerUI' blockIcon='{SwingUtil.createImageIcon("building.png")}' acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } }}' /> <script><![CDATA[ @@ -93,10 +83,9 @@ // 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) {} -} - public void setLayer(boolean active) { if (this.get$objectMap() != null) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { @@ -108,13 +97,8 @@ isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); } if (isSensitivity) { - jaxx.runtime.swing.BlockingLayerUI2 ui = active ? layerUI2.clone() : null; + jaxx.runtime.swing.BlockingLayerUI2 ui = active ? sensitivityLayerUI.clone() : null; SwingUtil.getLayer(boxed).setUI(ui); - } else { - jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - ui.setBlock(true); - ui.setUseIcon(isSensitivity && isActif()); - SwingUtil.getLayer(boxed).setUI(ui); } } }