You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by tk...@apache.org on 2002/04/17 16:39:50 UTC

cvs commit: xml-batik/sources/org/apache/batik/swing/gvt JGVTComponent.java

tkormann    02/04/17 07:39:50

  Modified:    sources/org/apache/batik/swing JSVGCanvas.java
               sources/org/apache/batik/swing/gvt JGVTComponent.java
  Log:
  quick fix to remove an old bug (trying to pan, zoom...) with no document currently display (basically, when the browser start).
  
  Revision  Changes    Path
  1.33      +19 -1     xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java
  
  Index: JSVGCanvas.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/JSVGCanvas.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- JSVGCanvas.java	21 Feb 2002 10:33:44 -0000	1.32
  +++ JSVGCanvas.java	17 Apr 2002 14:39:50 -0000	1.33
  @@ -69,7 +69,7 @@
    *
    * @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
    * @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
  - * @version $Id: JSVGCanvas.java,v 1.32 2002/02/21 10:33:44 hillion Exp $
  + * @version $Id: JSVGCanvas.java,v 1.33 2002/04/17 14:39:50 tkormann Exp $
    */
   public class JSVGCanvas extends JSVGComponent {
   
  @@ -512,6 +512,9 @@
        */
       protected class ZoomInAction extends AbstractAction {
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = getRenderingTransform();
               if (at != null) {
                   Dimension dim = getSize();
  @@ -531,6 +534,9 @@
        */
       protected class ZoomOutAction extends AbstractAction {
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = getRenderingTransform();
               if (at != null) {
                   Dimension dim = getSize();
  @@ -558,6 +564,9 @@
           }
   
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = new AffineTransform(getRenderingTransform());
               at.translate(-inc, 0);
               setRenderingTransform(at);
  @@ -577,6 +586,9 @@
           }
   
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = new AffineTransform(getRenderingTransform());
               at.translate(inc, 0);
               setRenderingTransform(at);
  @@ -596,6 +608,9 @@
           }
   
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = new AffineTransform(getRenderingTransform());
               at.translate(0, inc);
               setRenderingTransform(at);
  @@ -615,6 +630,9 @@
           }
   
           public void actionPerformed(ActionEvent evt) {
  +            if (gvtRoot == null) {
  +                return;
  +            }
               AffineTransform at = new AffineTransform(getRenderingTransform());
               at.translate(0, -inc);
               setRenderingTransform(at);
  
  
  
  1.27      +3 -2      xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java
  
  Index: JGVTComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- JGVTComponent.java	18 Feb 2002 11:03:20 -0000	1.26
  +++ JGVTComponent.java	17 Apr 2002 14:39:50 -0000	1.27
  @@ -54,7 +54,7 @@
    * This class represents a component which can display a GVT tree.
    *
    * @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
  - * @version $Id: JGVTComponent.java,v 1.26 2002/02/18 11:03:20 hillion Exp $
  + * @version $Id: JGVTComponent.java,v 1.27 2002/04/17 14:39:50 tkormann Exp $
    */
   public class JGVTComponent extends JComponent {
   
  @@ -1004,7 +1004,8 @@
           protected void selectInteractor(InputEvent ie) {
               if (!disableInteractions &&
                   !suspendInteractions &&
  -                interactor == null) {
  +                interactor == null &&
  +                gvtRoot != null) {
                   Iterator it = interactors.iterator();
                   while (it.hasNext()) {
                       Interactor i = (Interactor)it.next();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org