- Move HTML-handling classes to new directory, exclude from cli jar

build.xml

@@ -418,7 +418,7 @@
     <target name="jar-cli" depends="compile,jar" description="Build jar with only the cli in ./build">
         <property name="build.built-by" value="unknown" />
         <jar jarfile="${build.dir}/syndie-cli.jar">
-            <zipfileset src="${build.dir}/syndie.jar" excludes="syndie/gui/** syndie/trac/** com/** syndie/locale/** imports/Browser/** imports/DesktopUI/**" />
+            <zipfileset src="${build.dir}/syndie.jar" excludes="syndie/gui/** syndie/trac/** com/** syndie/locale/** syndie/html/** imports/Browser/** imports/DesktopUI/**" />
             <manifest>
                 <attribute name="Class-Path" value="../lib/i2p.jar ../lib/hsqldb.jar" />
                 <attribute name="Built-By" value="${build.built-by}" />

src/syndie/gui/BugReport.java

@@ -35,13 +35,13 @@ import syndie.data.BugConfig;
 import syndie.data.ChannelInfo;
 import syndie.data.ReferenceNode;
 import syndie.data.SyndieURI;
-import syndie.data.WebRipRunner;
 import syndie.db.CommandImpl;
 import syndie.db.DBClient;
 import syndie.db.MessageCreator;
 import syndie.db.MessageCreatorDirect;
 import syndie.db.MessageCreatorSource;
 import syndie.db.UI;
+import syndie.html.WebRipRunner;
 
 /**
  *

src/syndie/gui/HTMLStyleBuilder.java

@@ -17,14 +17,14 @@ import org.eclipse.swt.graphics.GlyphMetrics;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
-import syndie.data.HTMLStateBuilder;
-import syndie.data.HTMLTag;
 import syndie.data.MessageInfo;
 import syndie.data.SyndieURI;
 import syndie.db.CommandImpl;
 import syndie.db.DBClient;
 import syndie.db.NullUI;
 import syndie.db.UI;
+import syndie.html.HTMLStateBuilder;
+import syndie.html.HTMLTag;
 import syndie.util.StringUtil;
 
 /**

src/syndie/gui/ImageBuilderPopup.java

@@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Text;
 
 import syndie.data.SyndieURI;
-import syndie.data.WebRipRunner;
+import syndie.html.WebRipRunner;
 import syndie.util.StringUtil;
 
 /**

src/syndie/gui/MessageEditor.java

@@ -80,7 +80,6 @@ import syndie.data.ChannelInfo;
 import syndie.data.NymKey;
 import syndie.data.ReferenceNode;
 import syndie.data.SyndieURI;
-import syndie.data.WebRipRunner;
 import syndie.db.CommandImpl;
 import syndie.db.DBClient;
 import syndie.db.JobRunner;
@@ -91,6 +90,7 @@ import syndie.db.ThreadAccumulatorJWZ;
 import syndie.db.ThreadBuilder;
 import syndie.db.ThreadMsgId;
 import syndie.db.UI;
+import syndie.html.WebRipRunner;
 import syndie.util.StringUtil;
 
 /**

src/syndie/gui/PageEditor.java

@@ -38,13 +38,13 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import syndie.Constants;
-import syndie.data.HTMLStateBuilder;
-import syndie.data.HTMLTag;
 import syndie.data.MessageInfo;
 import syndie.data.SyndieURI;
 import syndie.db.CommandImpl;
 import syndie.db.DBClient;
 import syndie.db.UI;
+import syndie.html.HTMLStateBuilder;
+import syndie.html.HTMLTag;
 import syndie.util.DateTime;
 import syndie.util.StringUtil;
 

src/syndie/gui/PageRenderer.java

@@ -47,14 +47,14 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.*;
 
 import syndie.Constants;
-import syndie.data.HTMLStateBuilder;
-import syndie.data.HTMLTag;
 import syndie.data.MessageInfo;
 import syndie.data.SyndieURI;
 import syndie.db.CommandImpl;
 import syndie.db.DBClient;
 import syndie.db.NullUI;
 import syndie.db.UI;
+import syndie.html.HTMLStateBuilder;
+import syndie.html.HTMLTag;
 import syndie.util.StringUtil;
 
 /**

src/syndie/gui/WebRipPageControl.java

@@ -18,9 +18,9 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import syndie.data.WebRipRunner;
 import syndie.db.DBClient;
 import syndie.db.UI;
+import syndie.html.WebRipRunner;
 
 /**
  * rip a web page to add as a new page to an existing post

src/syndie/gui/WebRipPostPopup.java

@@ -16,13 +16,13 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 
 import syndie.data.SyndieURI;
-import syndie.data.WebRipRunner;
 import syndie.db.DBClient;
 import syndie.db.JobRunner;
 import syndie.db.MessageCreator;
 import syndie.db.MessageCreatorDirect;
 import syndie.db.MessageCreatorSource;
 import syndie.db.UI;
+import syndie.html.WebRipRunner;
 import syndie.util.StringUtil;
 
 /**

src/syndie/html/HTMLStateBuilder.java

@@ -1,4 +1,4 @@
-package syndie.data;
+package syndie.html;
 
 import java.util.*;
 

src/syndie/html/HTMLTag.java

@@ -1,4 +1,4 @@
-package syndie.data;
+package syndie.html;
 
 import java.util.Iterator;
 import java.util.Locale;

src/syndie/html/WebRipRunner.java

@@ -1,4 +1,4 @@
-package syndie.data;
+package syndie.html;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -23,6 +23,7 @@ import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
 
 import syndie.Constants;
+import syndie.data.SyndieURI;
 import syndie.db.JobRunner;
 import syndie.db.NullUI;
 import syndie.db.UI;