moved ui framework to separate package

brailleapps · Jan 3, 2013 · 21ba037 · 21ba037
1 parent af381a8
commit 21ba037
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -160,7 +160,6 @@ braille/src/org/daisy/braille/tools/Length.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/tools/StringTranslator.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/tools/package-info.java -text
 braille/src/org/daisy/braille/tools/resource-files/normalize.xsl -text svneol=unset#text/plain
-braille/src/org/daisy/braille/ui/AbstractUI.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/BasicUI.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/EmbossPEF.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/GeneratePEF.java -text svneol=unset#text/plain
@@ -169,11 +168,13 @@ braille/src/org/daisy/braille/ui/ListStuff.java -text
 braille/src/org/daisy/braille/ui/MergePEF.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/PEFParser.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/RawPrint.java -text svneol=unset#text/plain
-braille/src/org/daisy/braille/ui/ShortFormResolver.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/SplitPEF.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/TextParser.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/ValidatePEF.java -text svneol=unset#text/plain
 braille/src/org/daisy/braille/ui/package-info.java -text
+braille/src/org/daisy/cli/AbstractUI.java -text svneol=unset#text/plain
+braille/src/org/daisy/cli/ShortFormResolver.java -text svneol=unset#text/plain
+braille/src/org/daisy/cli/package-info.java -text
 braille/src/org/daisy/factory/AbstractFactory.java -text svneol=unset#text/plain
 braille/src/org/daisy/factory/Factory.java -text svneol=unset#text/plain
 braille/src/org/daisy/factory/FactoryCatalog.java -text svneol=unset#text/plain

diff --git a/braille/build.xml b/braille/build.xml
@@ -59,25 +59,22 @@
 
 	<patternset id="braille-jar.patternset">
 		<include name="org/daisy/braille/**/*.*"/>
-		<include name="org/daisy/catalog/**/*.*"/>
+		<include name="org/daisy/cli/**/*.*"/>
 		<include name="org/daisy/factory/**/*.*"/>
 		<include name="org/daisy/paper/**/*.*"/>
 		<include name="org/daisy/printing/**/*.*"/>
 		<include name="org/daisy/validator/**/*.*"/>
 		<include name="META-INF/**/*.*"/>
 		<exclude name="org/daisy/braille/ui/**/*.*"/>
-		<exclude name="**/package.html"/>
 	</patternset>
 
 	<patternset id="braille-ui-jar.patternset">
 		<include name="org/daisy/braille/ui/**/*.*"/>
-		<exclude name="**/package.html"/>
 	</patternset>
 
 	<patternset id="catalog-jar.patternset">
 		<include name="**/*.*"/>
 		<exclude name="**/doc-files/**/*.*"/>
-		<exclude name="**/package.html"/>
 	</patternset>
 
 	<!-- ================================================================== -->

diff --git a/braille/src/org/daisy/braille/ui/BasicUI.java b/braille/src/org/daisy/braille/ui/BasicUI.java
@@ -25,6 +25,7 @@
 import java.util.logging.Logger;
 
 import org.daisy.braille.tools.FileTools;
+import org.daisy.cli.AbstractUI;
 
 /**
  * Provides a basic command line UI for core functionality in

diff --git a/braille/src/org/daisy/braille/ui/EmbossPEF.java b/braille/src/org/daisy/braille/ui/EmbossPEF.java
@@ -44,6 +44,7 @@
 import org.daisy.braille.table.Table;
 import org.daisy.braille.table.TableCatalog;
 import org.daisy.braille.tools.Length;
+import org.daisy.cli.AbstractUI;
 import org.daisy.factory.Factory;
 import org.daisy.paper.PageFormat;
 import org.daisy.paper.Paper;

diff --git a/braille/src/org/daisy/braille/ui/GeneratePEF.java b/braille/src/org/daisy/braille/ui/GeneratePEF.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 
 import org.daisy.braille.pef.PEFGenerator;
+import org.daisy.cli.AbstractUI;
 
 /**
  * Provides a UI for generating PEF-files. Not for public use.

diff --git a/braille/src/org/daisy/braille/ui/ListStuff.java b/braille/src/org/daisy/braille/ui/ListStuff.java
@@ -10,6 +10,7 @@
 import org.daisy.braille.embosser.EmbosserCatalog;
 import org.daisy.braille.table.Table;
 import org.daisy.braille.table.TableCatalog;
+import org.daisy.cli.AbstractUI;
 import org.daisy.factory.Factory;
 import org.daisy.paper.Paper;
 import org.daisy.paper.PaperCatalog;

diff --git a/braille/src/org/daisy/braille/ui/MergePEF.java b/braille/src/org/daisy/braille/ui/MergePEF.java
@@ -26,6 +26,7 @@
 
 import org.daisy.braille.pef.PEFFileMerger;
 import org.daisy.braille.pef.PEFFileMerger.SortType;
+import org.daisy.cli.AbstractUI;
 
 /**
  * Provides a UI for merging PEF-files. Not for public use. This class is a package class. Use BasicUI

diff --git a/braille/src/org/daisy/braille/ui/PEFParser.java b/braille/src/org/daisy/braille/ui/PEFParser.java
@@ -27,6 +27,8 @@
 import org.daisy.braille.facade.PEFConverterFacade;
 import org.daisy.braille.facade.PEFValidatorFacade;
 import org.daisy.braille.table.TableCatalog;
+import org.daisy.cli.AbstractUI;
+import org.daisy.cli.ShortFormResolver;
 
 /**
  * Reads a PEF-file and outputs a text file.

diff --git a/braille/src/org/daisy/braille/ui/SplitPEF.java b/braille/src/org/daisy/braille/ui/SplitPEF.java
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.daisy.braille.pef.PEFFileSplitter;
+import org.daisy.cli.AbstractUI;
 
 /**
  * Provides a UI for splitting a PEF-file. Not for public use. 

diff --git a/braille/src/org/daisy/braille/ui/TextParser.java b/braille/src/org/daisy/braille/ui/TextParser.java
@@ -26,6 +26,8 @@
 import org.daisy.braille.facade.PEFConverterFacade;
 import org.daisy.braille.facade.PEFValidatorFacade;
 import org.daisy.braille.table.TableCatalog;
+import org.daisy.cli.AbstractUI;
+import org.daisy.cli.ShortFormResolver;
 
 /**
  * Reads an ASCII file and parses it into a basic PEF file.

diff --git a/braille/src/org/daisy/braille/ui/ValidatePEF.java b/braille/src/org/daisy/braille/ui/ValidatePEF.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import org.daisy.braille.pef.PEFValidator;
+import org.daisy.cli.AbstractUI;
 import org.daisy.validator.ValidatorFactory;
 
 class ValidatePEF extends AbstractUI {

diff --git a/braille/src/org/daisy/braille/ui/package-info.java b/braille/src/org/daisy/braille/ui/package-info.java
@@ -1,14 +1,18 @@
 /**
- * <p>Provides a framework for command line UI's and a simple implementation for core functionality in the org.daisy.braille packages.</p>
+ * <p>
+ * Provides a simple implementation for core functionality in the
+ * org.daisy.braille packages.
+ * </p>
  * <ul>
- * 	<li>EmbossPEF</li>
- * 	<li>PEFParser</li>
+ * <li>EmbossPEF</li>
+ * <li>PEFParser</li>
  * <li>TextParser</li>
- *	<li>ValidatePEF</li>
- *	<li>SplitPEF</li>
- *	<li>MergePEF</li>
- *	<li>GeneratePEF</li>
+ * <li>ValidatePEF</li>
+ * <li>SplitPEF</li>
+ * <li>MergePEF</li>
+ * <li>GeneratePEF</li>
  * </ul>
+ * 
  * @author Joel Håkansson
  */
 package org.daisy.braille.ui;
diff --git a/.../src/org/daisy/braille/ui/AbstractUI.java → braille/src/org/daisy/cli/AbstractUI.java b/.../src/org/daisy/braille/ui/AbstractUI.java → braille/src/org/daisy/cli/AbstractUI.java
@@ -15,7 +15,7 @@
  * along with this library; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package org.daisy.braille.ui;
+package org.daisy.cli;
 
 import java.io.PrintStream;
 import java.util.ArrayList;

diff --git a/...g/daisy/braille/ui/ShortFormResolver.java → .../src/org/daisy/cli/ShortFormResolver.java b/...g/daisy/braille/ui/ShortFormResolver.java → .../src/org/daisy/cli/ShortFormResolver.java
@@ -15,7 +15,7 @@
  * along with this library; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package org.daisy.braille.ui;
+package org.daisy.cli;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/braille/src/org/daisy/cli/package-info.java b/braille/src/org/daisy/cli/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * <p>
+ * Provides a small framework for command line UI's.
+ * </p>
+ * 
+ * @author Joel Håkansson
+ */
+package org.daisy.cli;