From tchemit@users.labs.libre-entreprise.org Wed Mar 18 19:17:17 2009
From: tchemit@users.labs.libre-entreprise.org
To: buix-commits@list.nuiton.org
Subject: [Buix-commits] r1271 - in jaxx/trunk:
	jaxx-example/src/main/java/jaxx/demo jaxx-runtime-swing
	jaxx-runtime-swing/src/main/java/jaxx/runtime/swing
Date: Wed, 18 Mar 2009 19:17:16 +0100
Message-ID: <20090318181717.00159461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6154836817033287124=="

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

Author: tchemit
Date: 2009-03-18 18:17:16 +0000 (Wed, 18 Mar 2009)
New Revision: 1271

Added:
   jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLay=
erUI2.java
Modified:
   jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx
   jaxx/trunk/jaxx-runtime-swing/changelog.txt
   jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLay=
erUI.java
Log:
introduce BlockingLayerUI2

Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.=
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
--- jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx	2=
009-03-18 08:46:51 UTC (rev 1270)
+++ jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx	2=
009-03-18 18:17:16 UTC (rev 1271)
@@ -11,22 +11,38 @@
                         accept(e, "from icon of layer");
                      }
                      }}' />
+    <jaxx.runtime.swing.BlockingLayerUI2 id=3D'layerUI2'
+                     blockIcon=3D'{SwingUtil.createImageIcon("action-block.p=
ng")}'
+                     acceptIcon=3D'{SwingUtil.createImageIcon("action-accept=
.png")}'
+                     acceptAction=3D'{new AbstractAction() { private static =
final long serialVersionUID =3D 1L;
+                     @Override
+                     public void actionPerformed(ActionEvent e) {
+                        accept(e, "from icon of layer");
+                     }
+                     }}' />
     <script><![CDATA[
 import jaxx.runtime.SwingUtil;
=20
 void $afterCompleteSetup() {
     for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {
+        if (boxed =3D=3D d) {
+            SwingUtil.getLayer(boxed).setUI(layerUI2);
+            continue;
+        }
+
         jaxx.runtime.swing.BlockingLayerUI ui =3D layerUI.clone();
         if ( boxed =3D=3D c) {
             ui.setBlock(true);
         }
         SwingUtil.getLayer(boxed).setUI(ui);
-        //ui.setDirty(true);
     }
 }
=20
 public void setLayer(boolean active) {
     for (JComponent boxed : SwingUtil.getLayeredComponents(this)) {
+        if (boxed =3D=3D d) {
+            continue;
+        }
         jaxx.runtime.swing.BlockingLayerUI ui =3D (jaxx.runtime.swing.Blocki=
ngLayerUI)SwingUtil.getLayer(boxed).getUI();
         if ( boxed =3D=3D c) {
             ui.setBlock(active);
@@ -59,6 +75,8 @@
                          onActionPerformed=3D'accept(event, "from button (no=
 layer)")'/>
                     <JButton id=3D'c' text=3D'button C (full block)' decorat=
or=3D'boxed' _clickedText=3D'"button C was clicked"'
                          onActionPerformed=3D'accept(event, "from button (no=
 layer)");'/>
+                     <JButton id=3D'd' text=3D'button D (full block 2)' deco=
rator=3D'boxed' _clickedText=3D'"button D was clicked"'
+                         onActionPerformed=3D'accept(event, "from button (no=
 layer)");'/>
                 </JPanel>
             </cell>
         </row>

Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt
=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
--- jaxx/trunk/jaxx-runtime-swing/changelog.txt	2009-03-18 08:46:51 UTC (rev =
1270)
+++ jaxx/trunk/jaxx-runtime-swing/changelog.txt	2009-03-18 18:17:16 UTC (rev =
1271)
@@ -1,4 +1,5 @@
 1.3 ?? 200903??
+ * 20090318 [chemit] - introduce the BlockingLayerUI2 class (should be merge=
 with BlockingLayerUI)
  * 20090318 [chemit] - introduce the CardLayout2Ext class
  * 20090312 [chemit] - add some usefull code from ObServe (load Nimbus L&F, =
load ui configuration)
  * 20090309 [chemit] - in BlockingLayerUI, add a new state 'block' to enable=
/disable blocking mode with a blockingColor

Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Bloc=
kingLayerUI.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
--- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLa=
yerUI.java	2009-03-18 08:46:51 UTC (rev 1270)
+++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLa=
yerUI.java	2009-03-18 18:17:16 UTC (rev 1271)
@@ -4,9 +4,7 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics2D;
-import java.awt.Insets;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;

Added: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Blockin=
gLayerUI2.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
--- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLa=
yerUI2.java	                        (rev 0)
+++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLa=
yerUI2.java	2009-03-18 18:17:16 UTC (rev 1271)
@@ -0,0 +1,206 @@
+package jaxx.runtime.swing;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import org.jdesktop.jxlayer.JXLayer;
+
+/**
+ *
+ * A JXLayer ui implementation that permits to block a component but still
+ * allow an action when clicking everywhere on the layer.
+ *=20
+ * Moreover, an icon can be added on the right-top icon painted and changed
+ * when the mouse is over the layer.
+ *
+ * You can change the blocking and accepting icon.
+ *
+ * To hook an click on the layer's icon, you can :
+ *
+ * <ul><li>pass an Action via method {@link #setAcceptAction(Action)}</li>
+ * <li>override the method {@link #acceptEvent(java.awt.event.MouseEvent, or=
g.jdesktop.jxlayer.JXLayer)}</li>
+ * </ul>
+ *
+ * @author tony
+ * @since 1.3
+ */
+public class BlockingLayerUI2 extends org.jdesktop.jxlayer.plaf.AbstractLaye=
rUI<JComponent> {
+
+    public static final String CAN_CLICK_PROPERTY =3D "canClick";
+    public static final String ACCEPT_ICON_PROPERTY =3D "acceptIcon";
+    public static final String BLOCK_ICON_PROPERTY =3D "blockIcon";
+    private static final long serialVersionUID =3D 1L;
+    /**
+     * Action to be treated when click on icon
+     */
+    protected Action acceptAction;
+    /**
+     * Icon when you can not click
+     */
+    protected BufferedImage blockIcon;
+    /**
+     * Icon when you can click
+     */
+    protected BufferedImage acceptIcon;
+    /**
+     * Internal state to known when we can accept click
+     */
+    protected boolean canClick;
+
+    public void setAcceptAction(Action acceptAction) {
+        this.acceptAction =3D acceptAction;
+    }
+
+    public void setAcceptIcon(ImageIcon acceptIcon) {
+        this.acceptIcon =3D prepareIcon(acceptIcon);
+        firePropertyChange(ACCEPT_ICON_PROPERTY, null, acceptIcon);
+        setDirty(true);
+    }
+
+    public void setBlockIcon(ImageIcon blockIcon) {
+        this.blockIcon =3D prepareIcon(blockIcon);
+        firePropertyChange(BLOCK_ICON_PROPERTY, null, blockIcon);
+        setDirty(true);
+    }
+
+    public void setCanClick(boolean canClick) {
+        boolean oldvalue =3D this.canClick;
+        this.canClick =3D canClick;
+        firePropertyChange(CAN_CLICK_PROPERTY, oldvalue, canClick);
+        if (oldvalue !=3D canClick) {
+            setDirty(true);
+        }
+    }
+
+    @Override
+    public void setDirty(boolean isDirty) {
+        super.setDirty(isDirty);
+    }
+
+    public void setBlockIcon(BufferedImage blockIcon) {
+        this.blockIcon =3D blockIcon;
+    }
+
+    public BufferedImage getBlockIcon() {
+        return blockIcon;
+    }
+
+    protected BufferedImage getAcceptIcon() {
+        return acceptIcon;
+    }
+
+    public boolean isCanClick() {
+        return canClick;
+    }
+
+    @Override
+    public BlockingLayerUI2 clone() {
+        BlockingLayerUI2 clone =3D new BlockingLayerUI2();
+        clone.acceptAction =3D acceptAction;
+        clone.acceptIcon =3D acceptIcon;
+        clone.blockIcon =3D blockIcon;
+        clone.setCanClick(false);
+        return clone;
+    }
+
+    @Override
+    protected void processKeyEvent(KeyEvent e, JXLayer<JComponent> l) {
+
+        e.consume();
+
+    }
+
+    @Override
+    protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent>=
 l) {
+
+        e.consume();
+
+    }
+
+    @Override
+    protected void processMouseEvent(MouseEvent e, JXLayer<JComponent> l) {
+        switch (e.getID()) {
+            case MouseEvent.MOUSE_ENTERED:
+                setCanClick(true);
+                break;
+            case MouseEvent.MOUSE_EXITED:
+                setCanClick(false);
+                break;
+            case MouseEvent.MOUSE_CLICKED:
+                if (canClick) {
+                    acceptEvent(e, l);
+                }
+                break;
+        }
+        e.consume();
+    }
+
+    @Override
+    protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) {
+        super.paintLayer(g2, l);
+
+        // to be in sync with the view if the layer has a border
+            /*Insets layerInsets =3D l.getInsets();
+        g2.translate(layerInsets.left, layerInsets.top);
+
+        JComponent view =3D l.getView();
+        // To prevent painting on view's border
+        Insets insets =3D view.getInsets();
+        g2.clip(new Rectangle(insets.left, insets.top,
+        view.getWidth() - insets.left - insets.right,
+        view.getHeight() - insets.top - insets.bottom));
+         */
+
+        if (getCurrentIcon() !=3D null) {
+            g2.drawImage(getCurrentIcon(), l.getWidth() - getCurrentIcon().g=
etWidth() - 1, 0, null);
+        }
+    }
+
+    protected void acceptEvent(MouseEvent e, JXLayer<JComponent> l) {
+        if (acceptAction !=3D null) {
+            acceptAction.putValue("layer", l);
+            Component source =3D l.getView();
+            acceptAction.actionPerformed(new ActionEvent(source, 0, "accept"=
));
+        }
+    }
+
+    protected BufferedImage getCurrentIcon() {
+        return canClick ? acceptIcon : blockIcon;
+    }
+
+    protected BufferedImage prepareIcon(ImageIcon image) {
+        BufferedImage icon =3D new BufferedImage(image.getIconWidth(), image=
.getIconHeight(), BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2 =3D (Graphics2D) icon.getGraphics();
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.=
VALUE_ANTIALIAS_ON);
+        g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHint=
s.VALUE_STROKE_PURE);
+        g2.drawImage(image.getImage(), 0, 0, null);
+        g2.dispose();
+        return icon;
+    }
+
+    protected void updateCanClickState(JXLayer<JComponent> l, MouseEvent e) {
+        // udpate toolTipText
+        Point layerLocation =3D l.getView().getLocation();
+        Point mousePoint =3D e.getPoint();
+        BufferedImage currentIcon =3D getCurrentIcon();
+        if (currentIcon =3D=3D null) {
+            setCanClick(false);
+            return;
+        }
+        int minX =3D (int) layerLocation.getX() + l.getWidth() - currentIcon=
.getWidth();
+        int maxX =3D (int) layerLocation.getX() + l.getWidth();
+        int minY =3D 0;
+        int maxY =3D currentIcon.getHeight();
+        boolean accept =3D minX <=3D mousePoint.getX() && mousePoint.getX() =
<=3D maxX;
+        accept &=3D minY <=3D mousePoint.getLocation().getY() && mousePoint.=
getLocation().getY() <=3D maxY;
+        setCanClick(accept);
+    }
+}


--===============6154836817033287124==--