Skip to content
Snippets Groups Projects
Commit 017f1b77 authored by Sebastien's avatar Sebastien
Browse files

move unl packages to fr.tetras_libre.unltools.unl

+ code rearrangement
parent c4727b6a
Branches
Tags
No related merge requests found
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.StringReader; import java.io.StringReader;
......
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import fr.tetras_libre.unltools.unl.SentenceWithExpectedDotArgumentProvider;
import fr.tetras_libre.unltools.unl.SentenceWithExpectedDotChecker;
import fr.tetras_libre.unltools.unl.UnlDocument;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource; import org.junit.jupiter.params.provider.ArgumentsSource;
import unl.SentenceWithExpectedDotArgumentProvider;
import unl.SentenceWithExpectedDotChecker;
import unl.UnlDocument;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
...@@ -34,6 +34,7 @@ class UnlParserTest { ...@@ -34,6 +34,7 @@ class UnlParserTest {
* Check validity of parser: * Check validity of parser:
* - It checks the creation of parser * - It checks the creation of parser
* - It checks the content of document doesn't contain an error * - It checks the content of document doesn't contain an error
*
* @param factory A factory of UnlParser * @param factory A factory of UnlParser
* @return An unlParserWrapper * @return An unlParserWrapper
*/ */
......
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import fr.tetras_libre.unltools.unl.UnlDocument;
import unl.UnlDocument;
import java.util.Vector; import java.util.Vector;
public class WrapperUnlParser { public class WrapperUnlParser {
private final UnlParser parser;
private Vector<UnlDocument> documents; private Vector<UnlDocument> documents;
private ErrorCollection errors; private ErrorCollection errors;
private final UnlParser parser;
public WrapperUnlParser(java.io.Reader stream) { public WrapperUnlParser(java.io.Reader stream) {
this.parser = new UnlParser(stream); this.parser = new UnlParser(stream);
...@@ -71,8 +72,7 @@ public class WrapperUnlParser { ...@@ -71,8 +72,7 @@ public class WrapperUnlParser {
public void addError(String error) { public void addError(String error) {
hasError = true; hasError = true;
if (!this.errors.contains(error)) if (!this.errors.contains(error)) {
{
this.errors.add(error); this.errors.add(error);
} }
} }
......
package unl.print.dotFile; package fr.tetras_libre.unltools.unl.print.dotFile;
import fr.tetras_libre.unltools.unl.*;
import fr.tetras_libre.unltools.unl.parser.UnlParser;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestReporter; import org.junit.jupiter.api.TestReporter;
import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.io.TempDir;
import unl.*;
import unl.parser.UnlParser;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
......
package unl2rdf; package unl2rdf;
import fr.tetras_libre.unltools.rdf.vocabulary.RdfFileBuilder; import fr.tetras_libre.unltools.rdf.vocabulary.RdfFileBuilder;
import fr.tetras_libre.unltools.unl.GraphExporter;
import fr.tetras_libre.unltools.unl.UnlDocument;
import fr.tetras_libre.unltools.unl.parser.ParseException;
import fr.tetras_libre.unltools.unl.parser.UnlParser;
import fr.tetras_libre.unltools.unl.print.dotFile.DotFileBuilder;
import picocli.CommandLine; import picocli.CommandLine;
import unl.GraphExporter;
import unl.UnlDocument;
import unl.UnlDocumentNode;
import unl.parser.ParseException;
import unl.parser.UnlParser;
import unl.print.dotFile.DotFileBuilder;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileWriter; import java.io.FileWriter;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment