bridge: move a couple of BridgeContext null checks to a better place

css4j · Sep 23, 2024 · b262f2a · b262f2a
1 parent 9b7eeb5
commit b262f2a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java
@@ -1184,23 +1184,25 @@ public void addUIEventListeners(Document doc) {
 	}
 
 	public void removeUIEventListeners(Document doc) {
-		EventTarget evtTarget = (EventTarget) doc.getDocumentElement();
-		synchronized (eventListenerSet) {
-			for (EventListenerMememto elm : eventListenerSet) {
-				NodeEventTarget et = elm.getTarget();
-				if (et == evtTarget) {
-					EventListener el = elm.getListener();
-					boolean uc = elm.getUseCapture();
-					String t = elm.getEventType();
-					boolean n = elm.getNamespaced();
-					if (et == null || el == null || t == null) {
-						continue;
-					}
-					if (n) {
-						String ns = elm.getNamespaceURI();
-						et.removeEventListenerNS(ns, t, el, uc);
-					} else {
-						et.removeEventListener(t, el, uc);
+		Element evtTarget = doc.getDocumentElement();
+		if (evtTarget != null) {
+			synchronized (eventListenerSet) {
+				for (EventListenerMememto elm : eventListenerSet) {
+					NodeEventTarget et = elm.getTarget();
+					if (et == evtTarget) {
+						EventListener el = elm.getListener();
+						boolean uc = elm.getUseCapture();
+						String t = elm.getEventType();
+						boolean n = elm.getNamespaced();
+						if (el == null || t == null) {
+							continue;
+						}
+						if (n) {
+							String ns = elm.getNamespaceURI();
+							et.removeEventListenerNS(ns, t, el, uc);
+						} else {
+							et.removeEventListener(t, el, uc);
+						}
 					}
 				}
 			}

diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVG12BridgeContext.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVG12BridgeContext.java
@@ -281,29 +281,30 @@ public void addUIEventListeners(Document doc) {
 
 	@Override
 	public void removeUIEventListeners(Document doc) {
-		EventTarget evtTarget = (EventTarget) doc.getDocumentElement();
-		AbstractNode n = (AbstractNode) evtTarget;
-		XBLEventSupport es = (XBLEventSupport) n.initializeEventSupport();
-
-		synchronized (eventListenerSet) {
-			for (EventListenerMememto elm : eventListenerSet) {
-				NodeEventTarget et = elm.getTarget();
-				if (et == evtTarget) {
-					EventListener el = elm.getListener();
-					boolean uc = elm.getUseCapture();
-					String t = elm.getEventType();
-					boolean in = elm.getNamespaced();
-					if (et == null || el == null || t == null) {
-						continue;
-					}
-					if (elm instanceof ImplementationEventListenerMememto) {
-						String ns = elm.getNamespaceURI();
-						es.removeImplementationEventListenerNS(ns, t, el, uc);
-					} else if (in) {
-						String ns = elm.getNamespaceURI();
-						et.removeEventListenerNS(ns, t, el, uc);
-					} else {
-						et.removeEventListener(t, el, uc);
+		AbstractNode evtTarget = (AbstractNode) doc.getDocumentElement();
+		if (evtTarget != null) {
+			XBLEventSupport es = (XBLEventSupport) evtTarget.initializeEventSupport();
+
+			synchronized (eventListenerSet) {
+				for (EventListenerMememto elm : eventListenerSet) {
+					NodeEventTarget et = elm.getTarget();
+					if (et == evtTarget) {
+						EventListener el = elm.getListener();
+						boolean uc = elm.getUseCapture();
+						String t = elm.getEventType();
+						boolean in = elm.getNamespaced();
+						if (el == null || t == null) {
+							continue;
+						}
+						if (elm instanceof ImplementationEventListenerMememto) {
+							String ns = elm.getNamespaceURI();
+							es.removeImplementationEventListenerNS(ns, t, el, uc);
+						} else if (in) {
+							String ns = elm.getNamespaceURI();
+							et.removeEventListenerNS(ns, t, el, uc);
+						} else {
+							et.removeEventListener(t, el, uc);
+						}
 					}
 				}
 			}