Author: chatellier Date: 2009-07-16 15:23:51 +0000 (Thu, 16 Jul 2009) New Revision: 2492 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Add comment about layers. Remove icons and accept action on blocking 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-07-16 15:22:47 UTC (rev 2491) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-16 15:23:51 UTC (rev 2492) @@ -31,23 +31,22 @@ <!-- Next path --> <java.lang.String id='nextPath' javaBean='null'/> + <!-- Layer bloquant completement la saisie --> <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() { + blockingColor='{new Color(50,50,50)}' /> + <!-- acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { accept(e); } - }}' /> - <!-- Sensitivity UI bloking layer --> + }}' --> + + <!-- Layer avec les icones permettant d'ajouter des facteurs --> <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { + 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) { @@ -149,15 +148,20 @@ } } +/** + * Action appelée lors du clic sur un layer. + * + * @param e l'event initial intersepté par le layer + */ protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); Class classBean = (Class)source.getClientProperty("bean"); String beanID = (String)source.getClientProperty("beanID"); TopiaEntity bean = null; - if (beanID == null){ + if (beanID == null) { bean = getVerifier().getEntity(classBean); } - else{ + else { bean = getVerifier().getEntity(classBean, beanID); } if (bean != null) {