From 270042f637789de9b7d828cc85b585c17b126eb1 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Fri, 29 Jun 2018 23:21:57 +0100
Subject: [PATCH] Tidy some w3c imports; was causing compile issues in
 Eclipse+Java10.

---
 prism/src/prism/MathML2Prism.java                           | 4 +++-
 prism/src/simulator/networking/SimulatorNetworkHandler.java | 5 ++++-
 prism/src/userinterface/GUIGeneralOptions.java              | 4 +++-
 prism/src/userinterface/GUINetworkOptions.java              | 4 +++-
 prism/src/userinterface/graph/AxisSettings.java             | 2 +-
 prism/src/userinterface/graph/Graph.java                    | 5 ++++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/prism/src/prism/MathML2Prism.java b/prism/src/prism/MathML2Prism.java
index c8638dfb..db257daf 100644
--- a/prism/src/prism/MathML2Prism.java
+++ b/prism/src/prism/MathML2Prism.java
@@ -29,7 +29,9 @@ package prism;
 import java.io.*;
 import java.util.*;
 import javax.xml.parsers.*;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.xml.sax.*;
 
 public class MathML2Prism
diff --git a/prism/src/simulator/networking/SimulatorNetworkHandler.java b/prism/src/simulator/networking/SimulatorNetworkHandler.java
index 2ff8e56c..3ed8ebf6 100644
--- a/prism/src/simulator/networking/SimulatorNetworkHandler.java
+++ b/prism/src/simulator/networking/SimulatorNetworkHandler.java
@@ -31,7 +31,10 @@ import javax.xml.parsers.*;
 import javax.xml.transform.*;
 import javax.xml.transform.dom.*;
 import javax.xml.transform.stream.*;
-import org.w3c.dom.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
diff --git a/prism/src/userinterface/GUIGeneralOptions.java b/prism/src/userinterface/GUIGeneralOptions.java
index 004eca73..aa4e0dc3 100644
--- a/prism/src/userinterface/GUIGeneralOptions.java
+++ b/prism/src/userinterface/GUIGeneralOptions.java
@@ -30,7 +30,9 @@ package userinterface;
 import javax.swing.plaf.metal.*;
 import javax.swing.*;
 import userinterface.util.*;
-import org.w3c.dom.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 import userinterface.OptionsPanel;
 
diff --git a/prism/src/userinterface/GUINetworkOptions.java b/prism/src/userinterface/GUINetworkOptions.java
index f7f38289..5d2e0f6c 100644
--- a/prism/src/userinterface/GUINetworkOptions.java
+++ b/prism/src/userinterface/GUINetworkOptions.java
@@ -29,7 +29,9 @@ package userinterface;
 import userinterface.util.*;
 
 import java.util.*;
-import org.w3c.dom.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 public class GUINetworkOptions extends OptionsPanel
 {
diff --git a/prism/src/userinterface/graph/AxisSettings.java b/prism/src/userinterface/graph/AxisSettings.java
index eba92be3..98f6696b 100644
--- a/prism/src/userinterface/graph/AxisSettings.java
+++ b/prism/src/userinterface/graph/AxisSettings.java
@@ -45,7 +45,7 @@ import org.jfree.chart.axis.*;
 import org.jfree.data.*;
 import org.jfree.data.xy.*;
 
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
 
 /**
  * Representation of an axis of a Graph.
diff --git a/prism/src/userinterface/graph/Graph.java b/prism/src/userinterface/graph/Graph.java
index 8e80ddbc..d983620e 100644
--- a/prism/src/userinterface/graph/Graph.java
+++ b/prism/src/userinterface/graph/Graph.java
@@ -35,7 +35,10 @@ import java.io.*;
 import java.util.*;
 import java.awt.image.*;
 
-import org.w3c.dom.*;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.*;
 
 import javax.xml.parsers.*;