Permalink
Browse files

Updates to braille-utils.api v4.0.0, braille-utils.pef-tools v3.0.0 a…

…nd braille-utils.impl v4.0.0-beta1
  • Loading branch information...
joeha480 committed Sep 22, 2017
1 parent b629386 commit 67454a64420d762c512487ffe8da0b570ee48f1d
Showing with 115 additions and 115 deletions.
  1. +3 −3 build.gradle
  2. +2 −2 integrationtest/base/EmbosserCatalogTestbase.java
  3. +3 −3 integrationtest/base/PaperCatalogTestbase.java
  4. +3 −3 integrationtest/base/TableCatalogTestbase.java
  5. +2 −2 integrationtest/base/ValidatorFactoryTestbase.java
  6. +1 −1 integrationtest/osgi/EmbosserCatalogTest.java
  7. +1 −1 integrationtest/osgi/PaperCatalogTest.java
  8. +1 −1 integrationtest/osgi/TableCatalogTest.java
  9. +1 −1 integrationtest/osgi/ValidatorFactoryTest.java
  10. +3 −3 integrationtest/osgi/config/ConfigurationOptions.java
  11. +2 −2 integrationtest/spi/EmbosserCatalogTest.java
  12. +2 −2 integrationtest/spi/PaperCatalogTest.java
  13. +2 −2 integrationtest/spi/TableCatalogTest.java
  14. +2 −2 integrationtest/spi/ValidatorFactoryTest.java
  15. +4 −4 src/org/daisy/dotify/cli/BrailleUtilsInfo.java
  16. +5 −5 src/org/daisy/dotify/cli/Convert.java
  17. +1 −1 src/org/daisy/dotify/cli/DotifyCLI.java
  18. +27 −27 src/org/daisy/dotify/cli/EmbossPEF.java
  19. +4 −4 src/org/daisy/dotify/cli/FindPEF.java
  20. +1 −1 src/org/daisy/dotify/cli/GeneratePEF.java
  21. +1 −1 src/org/daisy/dotify/cli/InputHelper.java
  22. +6 −6 src/org/daisy/dotify/cli/ListStuff.java
  23. +3 −3 src/org/daisy/dotify/cli/MergePEF.java
  24. +1 −1 src/org/daisy/dotify/cli/PEFInfo.java
  25. +9 −9 src/org/daisy/dotify/cli/PEFParser.java
  26. +1 −1 src/org/daisy/dotify/cli/RawPrint.java
  27. +2 −2 src/org/daisy/dotify/cli/SplitPEF.java
  28. +7 −7 src/org/daisy/dotify/cli/TextParser.java
  29. +5 −5 src/org/daisy/dotify/cli/TranslateCLI.java
  30. +3 −3 src/org/daisy/dotify/cli/ValidatePEF.java
  31. +1 −1 src/org/daisy/dotify/cli/pefinfo/Detail.java
  32. +1 −1 src/org/daisy/dotify/cli/pefinfo/DimensionsDetail.java
  33. +1 −1 src/org/daisy/dotify/cli/pefinfo/DublinCoreDetail.java
  34. +1 −1 src/org/daisy/dotify/cli/pefinfo/PEFBookInfo.java
  35. +1 −1 src/org/daisy/dotify/cli/pefinfo/PagesDetail.java
  36. +1 −1 src/org/daisy/dotify/cli/pefinfo/URIDetail.java
  37. +1 −1 src/org/daisy/dotify/cli/pefinfo/VolumesDetail.java
View
@@ -79,9 +79,9 @@ repositories {
}
dependencies {
compile 'org.daisy.braille:braille-utils.api:3.0.1'
compile 'org.daisy.braille:braille-utils.api:4.0.0'
compile 'org.daisy.braille:braille-utils.basic-cli:1.0.0'
compile ('org.daisy.braille:braille-utils.pef-tools:2.2.0') {
compile ('org.daisy.braille:braille-utils.pef-tools:3.0.0') {
exclude module: 'Saxon-HE'
}
compile 'org.daisy.dotify:dotify.api:3.1.0'
@@ -91,7 +91,7 @@ dependencies {
}
compile 'org.daisy.dotify:dotify.task-api:3.2.0'
runtime 'org.daisy.braille:braille-utils.impl:3.0.0'
runtime 'org.daisy.braille:braille-utils.impl:4.0.0-beta1'
runtime ('org.daisy.dotify:dotify.formatter.impl:3.1.0') {
exclude module: 'Saxon-HE'
}
@@ -5,8 +5,8 @@
import java.io.IOException;
import org.daisy.braille.api.embosser.Embosser;
import org.daisy.braille.api.embosser.EmbosserCatalogService;
import org.daisy.braille.utils.api.embosser.Embosser;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.junit.Test;
public abstract class EmbosserCatalogTestbase {
@@ -4,9 +4,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.daisy.braille.api.paper.Length;
import org.daisy.braille.api.paper.Paper;
import org.daisy.braille.api.paper.PaperCatalogService;
import org.daisy.braille.utils.api.paper.Length;
import org.daisy.braille.utils.api.paper.Paper;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.junit.Test;
public abstract class PaperCatalogTestbase {
@@ -4,9 +4,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.daisy.braille.api.table.BrailleConverter;
import org.daisy.braille.api.table.Table;
import org.daisy.braille.api.table.TableCatalogService;
import org.daisy.braille.utils.api.table.BrailleConverter;
import org.daisy.braille.utils.api.table.Table;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.junit.Test;
public abstract class TableCatalogTestbase {
@@ -3,8 +3,8 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.daisy.braille.api.validator.Validator;
import org.daisy.braille.api.validator.ValidatorFactoryService;
import org.daisy.braille.utils.api.validator.Validator;
import org.daisy.braille.utils.api.validator.ValidatorFactoryService;
import org.junit.Test;
public abstract class ValidatorFactoryTestbase {
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.api.embosser.EmbosserCatalogService;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.api.paper.PaperCatalogService;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.api.table.TableCatalogService;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.api.validator.ValidatorFactoryService;
import org.daisy.braille.utils.api.validator.ValidatorFactoryService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -16,13 +16,13 @@ public static Option brailleUtilsCore() {
return composite(
mavenBundle().groupId("org.daisy.libs").artifactId("jing").version("20120724.0.0"),
mavenBundle().groupId("org.daisy.libs").artifactId("saxon-he").version("9.5.1.5"),
mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.api").version("3.0.1"),
mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.pef-tools").version("2.2.0")
mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.api").version("4.0.0"),
mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.pef-tools").version("3.0.0")
);
}
public static Option brailleUtilsCatalog() {
return mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.impl").version("3.0.0");
return mavenBundle().groupId("org.daisy.braille").artifactId("braille-utils.impl").version("4.0.0-beta1");
}
static Option dotifyApi() {
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.api.embosser.EmbosserCatalogService;
import org.daisy.braille.consumer.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import base.EmbosserCatalogTestbase;
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.api.paper.PaperCatalogService;
import org.daisy.braille.consumer.paper.PaperCatalog;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import base.PaperCatalogTestbase;
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.api.table.TableCatalogService;
import org.daisy.braille.consumer.table.TableCatalog;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.daisy.braille.utils.api.table.TableCatalog;
import base.TableCatalogTestbase;
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.api.validator.ValidatorFactoryService;
import org.daisy.braille.consumer.validator.ValidatorFactory;
import org.daisy.braille.utils.api.validator.ValidatorFactoryService;
import org.daisy.braille.utils.api.validator.ValidatorFactory;
import base.ValidatorFactoryTestbase;
@@ -4,10 +4,10 @@
import java.util.Collection;
import java.util.List;
import org.daisy.braille.api.factory.Factory;
import org.daisy.braille.api.factory.FactoryCatalog;
import org.daisy.braille.api.factory.FactoryProperties;
import org.daisy.braille.consumer.table.TableCatalog;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.cli.Definition;
import org.daisy.cli.ShortFormResolver;
@@ -16,11 +16,11 @@
import javax.xml.parsers.ParserConfigurationException;
import org.daisy.braille.api.embosser.EmbosserFactoryException;
import org.daisy.braille.consumer.embosser.EmbosserCatalog;
import org.daisy.braille.pef.PEFConverterFacade;
import org.daisy.braille.pef.PEFValidator;
import org.daisy.braille.pef.UnsupportedWidthException;
import org.daisy.braille.utils.api.embosser.EmbosserFactoryException;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.braille.utils.pef.PEFValidator;
import org.daisy.braille.utils.pef.UnsupportedWidthException;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.CommandParserResult;
@@ -10,7 +10,7 @@
import java.util.Map;
import java.util.logging.Logger;
import org.daisy.braille.pef.FileTools;
import org.daisy.braille.utils.pef.FileTools;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.CommandParserResult;
@@ -30,33 +30,33 @@
import javax.print.PrintService;
import javax.xml.parsers.ParserConfigurationException;
import org.daisy.braille.api.embosser.Embosser;
import org.daisy.braille.api.embosser.EmbosserFeatures;
import org.daisy.braille.api.embosser.EmbosserProperties;
import org.daisy.braille.api.embosser.EmbosserProperties.PrintMode;
import org.daisy.braille.api.embosser.EmbosserWriter;
import org.daisy.braille.api.embosser.PrintPage;
import org.daisy.braille.api.factory.FactoryProperties;
import org.daisy.braille.api.factory.FactoryPropertiesComparator;
import org.daisy.braille.api.paper.Length;
import org.daisy.braille.api.paper.PageFormat;
import org.daisy.braille.api.paper.Paper;
import org.daisy.braille.api.paper.PaperFilter;
import org.daisy.braille.api.paper.RollPaperFormat;
import org.daisy.braille.api.paper.SheetPaperFormat;
import org.daisy.braille.api.paper.SheetPaperFormat.Orientation;
import org.daisy.braille.api.paper.TractorPaperFormat;
import org.daisy.braille.api.table.Table;
import org.daisy.braille.consumer.embosser.EmbosserCatalog;
import org.daisy.braille.consumer.paper.PaperCatalog;
import org.daisy.braille.consumer.table.TableCatalog;
import org.daisy.braille.consumer.validator.ValidatorFactory;
import org.daisy.braille.pef.PEFConverterFacade;
import org.daisy.braille.pef.PEFHandler;
import org.daisy.braille.pef.PEFValidatorFacade;
import org.daisy.braille.pef.PrinterDevice;
import org.daisy.braille.pef.Range;
import org.daisy.braille.pef.UnsupportedWidthException;
import org.daisy.braille.utils.api.embosser.Embosser;
import org.daisy.braille.utils.api.embosser.EmbosserFeatures;
import org.daisy.braille.utils.api.embosser.EmbosserProperties;
import org.daisy.braille.utils.api.embosser.EmbosserProperties.PrintMode;
import org.daisy.braille.utils.api.embosser.EmbosserWriter;
import org.daisy.braille.utils.api.embosser.PrintPage;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.factory.FactoryPropertiesComparator;
import org.daisy.braille.utils.api.paper.Length;
import org.daisy.braille.utils.api.paper.PageFormat;
import org.daisy.braille.utils.api.paper.Paper;
import org.daisy.braille.utils.api.paper.PaperFilter;
import org.daisy.braille.utils.api.paper.RollPaperFormat;
import org.daisy.braille.utils.api.paper.SheetPaperFormat;
import org.daisy.braille.utils.api.paper.SheetPaperFormat.Orientation;
import org.daisy.braille.utils.api.paper.TractorPaperFormat;
import org.daisy.braille.utils.api.table.Table;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.braille.utils.api.validator.ValidatorFactory;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.braille.utils.pef.PEFHandler;
import org.daisy.braille.utils.pef.PEFValidatorFacade;
import org.daisy.braille.utils.pef.PrinterDevice;
import org.daisy.braille.utils.pef.Range;
import org.daisy.braille.utils.pef.UnsupportedWidthException;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.ExitCode;
@@ -30,10 +30,10 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
import org.daisy.braille.pef.PEFBook;
import org.daisy.braille.pef.PEFBookLoader;
import org.daisy.braille.pef.PEFLibrary;
import org.daisy.braille.pef.PEFSearchIndex;
import org.daisy.braille.utils.pef.PEFBook;
import org.daisy.braille.utils.pef.PEFBookLoader;
import org.daisy.braille.utils.pef.PEFLibrary;
import org.daisy.braille.utils.pef.PEFSearchIndex;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.CommandParserResult;
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.pef.PEFGenerator;
import org.daisy.braille.utils.pef.PEFGenerator;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.ExitCode;
@@ -24,7 +24,7 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import org.daisy.braille.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.factory.FactoryProperties;
/**
* Provides a command line input helper for setting arguments interactively and
@@ -5,12 +5,12 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.api.factory.FactoryProperties;
import org.daisy.braille.api.factory.FactoryPropertiesComparator;
import org.daisy.braille.api.factory.FactoryPropertiesComparator.By;
import org.daisy.braille.consumer.embosser.EmbosserCatalog;
import org.daisy.braille.consumer.paper.PaperCatalog;
import org.daisy.braille.consumer.table.TableCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.factory.FactoryPropertiesComparator;
import org.daisy.braille.utils.api.factory.FactoryPropertiesComparator.By;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.CommandParserResult;
@@ -24,9 +24,9 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.consumer.validator.ValidatorFactory;
import org.daisy.braille.pef.PEFFileMerger;
import org.daisy.braille.pef.PEFFileMerger.SortType;
import org.daisy.braille.utils.api.validator.ValidatorFactory;
import org.daisy.braille.utils.pef.PEFFileMerger;
import org.daisy.braille.utils.pef.PEFFileMerger.SortType;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.Definition;
@@ -27,7 +27,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
import org.daisy.braille.pef.PEFBook;
import org.daisy.braille.utils.pef.PEFBook;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.ExitCode;
@@ -24,15 +24,15 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.api.embosser.StandardLineBreaks;
import org.daisy.braille.api.factory.Factory;
import org.daisy.braille.api.factory.FactoryCatalog;
import org.daisy.braille.api.factory.FactoryProperties;
import org.daisy.braille.consumer.embosser.EmbosserCatalog;
import org.daisy.braille.consumer.table.TableCatalog;
import org.daisy.braille.consumer.validator.ValidatorFactory;
import org.daisy.braille.pef.PEFConverterFacade;
import org.daisy.braille.pef.PEFValidatorFacade;
import org.daisy.braille.utils.api.embosser.StandardLineBreaks;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.braille.utils.api.validator.ValidatorFactory;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.braille.utils.pef.PEFValidatorFacade;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.Definition;
@@ -22,7 +22,7 @@
import javax.print.PrintException;
import org.daisy.braille.pef.PrinterDevice;
import org.daisy.braille.utils.pef.PrinterDevice;
/**
* Provides a command line UI for sending a file straight to a
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.List;
import org.daisy.braille.consumer.validator.ValidatorFactory;
import org.daisy.braille.pef.PEFFileSplitter;
import org.daisy.braille.utils.api.validator.ValidatorFactory;
import org.daisy.braille.utils.pef.PEFFileSplitter;
import org.daisy.cli.AbstractUI;
import org.daisy.cli.Argument;
import org.daisy.cli.ExitCode;
Oops, something went wrong.

0 comments on commit 67454a6

Please sign in to comment.