deweese 2003/11/09 15:34:58
Modified: sources/org/apache/batik/bridge SVGAElementBridge.java
sources/org/apache/batik/dom/events AbstractEvent.java
EventSupport.java
Log:
The A element now respects 'preventDefault' on the event object.
Revision Changes Path
1.26 +9 -1 xml-batik/sources/org/apache/batik/bridge/SVGAElementBridge.java
Index: SVGAElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGAElementBridge.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SVGAElementBridge.java 9 Aug 2003 16:58:37 -0000 1.25
+++ SVGAElementBridge.java 9 Nov 2003 23:34:58 -0000 1.26
@@ -52,12 +52,14 @@
import java.awt.Cursor;
+import org.apache.batik.dom.events.AbstractEvent;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.gvt.GraphicsNode;
import org.w3c.dom.Element;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
+import org.w3c.dom.events.UIEvent;
import org.w3c.dom.svg.SVGAElement;
/**
@@ -136,6 +138,8 @@
}
public void handleEvent(Event evt) {
+ if (AbstractEvent.getEventPreventDefault(evt))
+ return;
SVGAElement elt = (SVGAElement)evt.getCurrentTarget();
Cursor cursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
userAgent.setSVGCursor(cursor);
@@ -156,6 +160,8 @@
}
public void handleEvent(Event evt) {
+ if (AbstractEvent.getEventPreventDefault(evt))
+ return;
//
// Only modify the cursor if the target's cursor property is
// 'auto'. Note that we do not need to check the value of
@@ -205,6 +211,8 @@
}
public void handleEvent(Event evt) {
+ if (AbstractEvent.getEventPreventDefault(evt))
+ return;
// No need to set the cursor on out events: this is taken care of
// by the BridgeContext
1.6 +8 -3 xml-batik/sources/org/apache/batik/dom/events/AbstractEvent.java
Index: AbstractEvent.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/events/AbstractEvent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractEvent.java 8 Aug 2003 11:38:59 -0000 1.5
+++ AbstractEvent.java 9 Nov 2003 23:34:58 -0000 1.6
@@ -198,7 +198,7 @@
* of event flow.
*/
public void preventDefault() {
- this.preventDefault = false;
+ this.preventDefault = true;
}
/**
@@ -245,7 +245,7 @@
}
void preventDefault(boolean state) {
- this.preventDefault = !state;
+ this.preventDefault = state;
}
void setCurrentTarget(EventTarget currentTarget) {
@@ -254,5 +254,10 @@
void setTarget(EventTarget target) {
this.target = target;
+ }
+
+ public static boolean getEventPreventDefault(Event evt) {
+ AbstractEvent ae = (AbstractEvent)evt;
+ return ae.getPreventDefault();
}
}
1.13 +2 -2 xml-batik/sources/org/apache/batik/dom/events/EventSupport.java
Index: EventSupport.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/events/EventSupport.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EventSupport.java 16 Sep 2003 01:12:52 -0000 1.12
+++ EventSupport.java 9 Nov 2003 23:34:58 -0000 1.13
@@ -240,7 +240,7 @@
fireEventListeners(node, evt, false);
}
}
- return evt.getPreventDefault();
+ return !evt.getPreventDefault();
}
private static void fireEventListeners(NodeEventTarget node,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
