Cleaned up import statements.

diff --git a/xsl-saxon/src/com/nwalsh/saxon/CVS.java b/xsl-saxon/src/com/nwalsh/saxon/CVS.java
index ca89f39b69111f2da9eee4617e9d62220eaf2768..9fcc530c37409459cb57ff759ddca1e3108ad21b 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/CVS.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/CVS.java
@@ -1,13 +1,8 @@
 package com.nwalsh.saxon;
 
-import java.io.*;
-import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Date;
-import java.util.Locale;
 import java.util.TimeZone;
-import java.text.DateFormat;
-import java.text.ParseException;
 
 /**
  * <p>Saxon extension to convert CVS date strings into local time</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/Callout.java b/xsl-saxon/src/com/nwalsh/saxon/Callout.java
index cffa054fe37a49ff81948775ace7272fc609833f..5cbda349770fe3fc992c72a0550e8c0122c0d87a 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/Callout.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/Callout.java
@@ -1,6 +1,6 @@
 package com.nwalsh.saxon;
 
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
 
 /**
  * <p>A class for maintaining information about callouts.</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java
index a61b38c3b03d4ce1b96ae160f7de553d3ba4c3f5..76ffade72986239c9f05ba0c1dd2b8600b16c9d7 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/CalloutEmitter.java
@@ -2,8 +2,9 @@ package com.nwalsh.saxon;
 
 import java.util.Stack;
 import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.w3c.dom.*;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Element;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.Controller;
 import com.icl.saxon.om.NamePool;

diff --git a/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java
index 6efe35aabbe1c097938fa435d580c0aecfd39131..b399f4dd01f3937e05f1f6dc69d0e697bc97dd53 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/ColumnScanEmitter.java
@@ -1,10 +1,7 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.output.*;
-import com.icl.saxon.om.*;
-import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.om.NamePool;
 
 /**
  * <p>Saxon extension to scan the column widths in a result tree fragment.</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java
index 36434caba83c24ddb57df63afeb9c34c4f5bba44..33ee9b2c2e339b26feb7b1d1381fdc4a63415c5a 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/ColumnUpdateEmitter.java
@@ -1,11 +1,9 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.*;
-import com.icl.saxon.output.*;
-import com.icl.saxon.Controller;
-import com.icl.saxon.om.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.expr.FragmentValue;
+
+import com.icl.saxon.Controller;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.tree.AttributeCollection;
 
 /**

diff --git a/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java
index 3718c50d1c1dd9efca7bf2926ca51a2cbf7bc654..c31e189cbef1b2c341c3cc96f345a34d933e76bd 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/CopyEmitter.java
@@ -1,19 +1,11 @@
 package com.nwalsh.saxon;
 
-import java.util.Stack;
-import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.Context;
-import com.icl.saxon.expr.*;
-import com.icl.saxon.expr.FragmentValue;
+
 import com.icl.saxon.Controller;
-import com.icl.saxon.functions.Extensions;
-import com.icl.saxon.om.*;
-import com.icl.saxon.output.*;
-import com.icl.saxon.pattern.*;
-import com.icl.saxon.tree.*;
+import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.om.NamePool;
+import com.icl.saxon.output.Emitter;
 
 /**
  * <p>A Saxon 6.0 Emitter that clones its input.</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java
index 2ffa507fb51b7060e6a3af6c9b1a353fdfee05c0..2c4e3487745fc7cde1d6d245247126d87dc8cf77 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/FormatCallout.java
@@ -1,7 +1,6 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.SAXException;
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
 
 import javax.xml.transform.TransformerException;
 

diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java
index 1ea084217343a643fa8c5578125e600aad2ccd72..eade5940376b76e7280426f659d0194e9915e20a 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/FormatGraphicCallout.java
@@ -1,7 +1,6 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.SAXException;
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
 
 import javax.xml.transform.TransformerException;
 

diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java
index 6e2d75c1b5911bc7c657c9e431ced8b8925cd6d8..263c913b901df18c4009f01b6b85e04ad01a7a3a 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/FormatTextCallout.java
@@ -1,10 +1,5 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.SAXException;
-import org.w3c.dom.*;
-
-import javax.xml.transform.TransformerException;
-
 import com.icl.saxon.om.NamePool;
 import com.icl.saxon.output.Emitter;
 

diff --git a/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java b/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java
index 426d618baa6151197f993a7383d00781eb0dbcca..21b5599eec0f199dcdf43c813989ba2ab1ca5409 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/FormatUnicodeCallout.java
@@ -1,8 +1,6 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.SAXException;
-import org.w3c.dom.*;
-
+import org.w3c.dom.Element;
 import javax.xml.transform.TransformerException;
 
 import com.icl.saxon.om.NamePool;

diff --git a/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java b/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java
index 9f6b9e4191fa8baa38e87bf64acaf9a19daa85e2..167bc73a26e11d42784cc06141f3ab6aaef947ce 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/ImageIntrinsics.java
@@ -3,13 +3,11 @@ package com.nwalsh.saxon;
 import java.io.File;
 import java.io.BufferedReader;
 import java.io.FileReader;
-import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.awt.Toolkit;
 import java.awt.Image;
 import java.awt.image.ImageObserver;
-import java.lang.Thread;
 import java.util.StringTokenizer;
 
 /**

diff --git a/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java
index d8110dedb0826ef915e55ea73926f0f94f85de5c..eac3466381c4685b3706fe34e5aeda4ed5f7e517 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/LineCountEmitter.java
@@ -1,10 +1,6 @@
 package com.nwalsh.saxon;
 
-import org.xml.sax.*;
-import javax.xml.transform.TransformerException;
-import com.icl.saxon.output.*;
-import com.icl.saxon.om.*;
-import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.om.NamePool;
 
 /**
  * <p>Saxon extension to count the lines in a result tree fragment.</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java
index c32efa9e38ad6247782472771cc614cb22190a67..d9421c0b6ef3009aa40b739afc6d4eaec1da69bc 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/NumberLinesEmitter.java
@@ -1,15 +1,10 @@
 package com.nwalsh.saxon;
 
 import java.util.Stack;
-import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.output.*;
-import com.icl.saxon.om.*;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.Controller;
 import com.icl.saxon.tree.AttributeCollection;
-import com.icl.saxon.expr.FragmentValue;
 
 /**
  * <p>Saxon extension to decorate a result tree fragment with line numbers.</p>

diff --git a/xsl-saxon/src/com/nwalsh/saxon/Table.java b/xsl-saxon/src/com/nwalsh/saxon/Table.java
index ef23b04f7312ed0af672b4dfb31bc9bda9780194..5c151c342f129fe1b57cfa0f4711bbe14e4add03 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/Table.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/Table.java
@@ -3,15 +3,13 @@
 package com.nwalsh.saxon;
 
 import java.util.Hashtable;
-import org.xml.sax.*;
-import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.Controller;
-import com.icl.saxon.expr.*;
-import com.icl.saxon.om.*;
-import com.icl.saxon.pattern.*;
+import com.icl.saxon.expr.Value;
+import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.expr.NodeSetValue;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.Context;
-import com.icl.saxon.tree.*;
 import com.icl.saxon.functions.Extensions;
 
 /**

diff --git a/xsl-saxon/src/com/nwalsh/saxon/Text.java b/xsl-saxon/src/com/nwalsh/saxon/Text.java
index 71ef568249c99dd41bdb3bff81fc70fdd3f6a612..c39345bfff145017880eb351f725dcfcbda6bdcd 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/Text.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/Text.java
@@ -4,9 +4,6 @@ package com.nwalsh.saxon;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
 import java.net.URL;
 import java.net.MalformedURLException;
 
@@ -20,7 +17,6 @@ import com.icl.saxon.style.StyleElement;
 import com.icl.saxon.output.Outputter;
 import com.icl.saxon.expr.Expression;
 
-import org.xml.sax.AttributeList;
 
 /**
  * <p>Saxon extension element for inserting text

diff --git a/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java b/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java
index 6dc09672ef1ae83e7837aea247ef1ee899a65120..831f7d71ed5a8b0c2a58caecfc4b370ba5dd599d 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/TextFactory.java
@@ -3,7 +3,6 @@
 package com.nwalsh.saxon;
 
 import com.icl.saxon.style.ExtensionElementFactory;
-import org.xml.sax.SAXException;
 
 /**
  * <p>Saxon extension element factory

diff --git a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java
index 18b6c5e155b84c2fb69dfcd8161cd81d31e6eba5..9c63c8f050b1261629d58756be4db624deb199f3 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinks.java
@@ -2,17 +2,13 @@
 
 package com.nwalsh.saxon;
 
-import java.util.Stack;
-import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.Controller;
-import com.icl.saxon.expr.*;
-import com.icl.saxon.om.*;
-import com.icl.saxon.pattern.*;
+import com.icl.saxon.expr.Value;
+import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.expr.NodeSetValue;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.Context;
-import com.icl.saxon.tree.*;
 import com.icl.saxon.functions.Extensions;
 import com.nwalsh.saxon.UnwrapLinksEmitter;
 

diff --git a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java
index 582807264bff5d0c5eab2f82286ed93ec66bf5ca..06c928b3ed73dda6022eef8e60c069e8ce909d41 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/UnwrapLinksEmitter.java
@@ -1,11 +1,8 @@
 package com.nwalsh.saxon;
 
 import java.util.Stack;
-import org.xml.sax.*;
-import org.w3c.dom.*;
 import javax.xml.transform.TransformerException;
-import com.icl.saxon.output.*;
-import com.icl.saxon.om.*;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.Controller;
 import com.icl.saxon.tree.AttributeCollection;
 

diff --git a/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java b/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java
index 21a017cbbd7e204d16345a9f873fc3f8ea2221c0..f817645b81c3211c06ee9a0fda3efa9a46b302ec 100644 (file)
--- a/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java
+++ b/xsl-saxon/src/com/nwalsh/saxon/Verbatim.java
@@ -2,17 +2,14 @@
 
 package com.nwalsh.saxon;
 
-import java.util.Stack;
-import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.w3c.dom.*;
+import org.w3c.dom.NodeList;
 import javax.xml.transform.TransformerException;
 import com.icl.saxon.Controller;
-import com.icl.saxon.expr.*;
-import com.icl.saxon.om.*;
-import com.icl.saxon.pattern.*;
+import com.icl.saxon.expr.Value;
+import com.icl.saxon.expr.FragmentValue;
+import com.icl.saxon.expr.NodeSetValue;
+import com.icl.saxon.om.NamePool;
 import com.icl.saxon.Context;
-import com.icl.saxon.tree.*;
 import com.icl.saxon.functions.Extensions;
 import com.nwalsh.saxon.NumberLinesEmitter;
 import com.nwalsh.saxon.CalloutEmitter;