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
Showing
with 45 additions and 55 deletions
package unl; package fr.tetras_libre.unltools.unl;
import java.util.Collection; import java.util.Collection;
import java.util.Vector; import java.util.Vector;
...@@ -37,14 +37,14 @@ public class UnlDocument { ...@@ -37,14 +37,14 @@ public class UnlDocument {
return error; return error;
} }
public boolean HasError(){
return null != error; // && !error.trim().isEmpty();
}
public void setError(String error) { public void setError(String error) {
this.error = error; this.error = error;
} }
public boolean HasError() {
return null != error; // && !error.trim().isEmpty();
}
public void add(UnlDocumentNode unlDocumentNode) { public void add(UnlDocumentNode unlDocumentNode) {
this.docElements.add(unlDocumentNode); this.docElements.add(unlDocumentNode);
} }
......
package unl; package fr.tetras_libre.unltools.unl;
public class UnlDocumentNode { public class UnlDocumentNode {
...@@ -37,14 +37,14 @@ public class UnlDocumentNode { ...@@ -37,14 +37,14 @@ public class UnlDocumentNode {
return graph; return graph;
} }
public String getError() {
return error;
}
public void setGraph(Graph graph) { public void setGraph(Graph graph) {
this.graph = graph; this.graph = graph;
} }
public String getError() {
return error;
}
public void setError(String error) { public void setError(String error) {
this.error = error; this.error = error;
} }
......
package unl; package fr.tetras_libre.unltools.unl;
public enum UnlDocumentNodeType { public enum UnlDocumentNodeType {
ParagraphStart, ParagraphStart,
......
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */ /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
/* JavaCCOptions:KEEP_LINE_COLUMN=true */ /* JavaCCOptions:KEEP_LINE_COLUMN=true */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
/** /**
* This exception is thrown when parse errors are encountered. * This exception is thrown when parse errors are encountered.
......
/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */ /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
/** /**
* An implementation of interface CharStream, where the stream is assumed to * An implementation of interface CharStream, where the stream is assumed to
......
/* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */ /* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
/** /**
* Describes the input token stream. * Describes the input token stream.
......
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */ /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
/* JavaCCOptions: */ /* JavaCCOptions: */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
/** Token Manager Error. */ /** Token Manager Error. */
public class TokenMgrError extends Error public class TokenMgrError extends Error
......
/* UnlParser.java */ /* UnlParser.java */
/* Generated By:JavaCC: Do not edit this line. UnlParser.java */ /* Generated By:JavaCC: Do not edit this line. UnlParser.java */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import unl.*; import fr.tetras_libre.unltools.unl.*;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
......
...@@ -35,7 +35,7 @@ options { ...@@ -35,7 +35,7 @@ options {
PARSER_BEGIN(UnlParser) PARSER_BEGIN(UnlParser)
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
...@@ -44,7 +44,7 @@ import java.util.SortedSet; ...@@ -44,7 +44,7 @@ import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import unl.*; import fr.tetras_libre.unltools.unl.*;
public class UnlParser { public class UnlParser {
......
/* Generated By:JavaCC: Do not edit this line. UnlParserConstants.java */ /* Generated By:JavaCC: Do not edit this line. UnlParserConstants.java */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
/** /**
......
/* UnlParserTokenManager.java */ /* UnlParserTokenManager.java */
/* Generated By:JavaCC: Do not edit this line. UnlParserTokenManager.java */ /* Generated By:JavaCC: Do not edit this line. UnlParserTokenManager.java */
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
import java.io.FileInputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.Set;
import java.util.Vector;
import unl.*;
/** Token Manager. */ /** Token Manager. */
@SuppressWarnings ("unused") @SuppressWarnings ("unused")
......
package unl.print.dotFile; package fr.tetras_libre.unltools.unl.print.dotFile;
import unl.*; import fr.tetras_libre.unltools.unl.*;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
......
package unl; package fr.tetras_libre.unltools.unl;
public class AllSetenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker { public class AllSetenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker {
private static final String ALL = "[D]" + private static final String ALL = "[D]" +
......
package unl; package fr.tetras_libre.unltools.unl;
public class CatSentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker { public class CatSentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker {
......
package unl; package fr.tetras_libre.unltools.unl;
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 static org.junit.jupiter.api.Assertions.*;
class EqualsBuilderTest { class EqualsBuilderTest {
@Test @Test
......
package unl; package fr.tetras_libre.unltools.unl;
public class R1SentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker { public class R1SentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker {
private static final String R1_UNL = "[D]\n" + private static final String R1_UNL = "[D]\n" +
......
package unl; package fr.tetras_libre.unltools.unl;
public class R2SentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker { public class R2SentenceWithExpectedDotChecker extends SentenceWithExpectedDotChecker {
private static final String R2_UNL = "[D]\n" + private static final String R2_UNL = "[D]\n" +
......
package unl; package fr.tetras_libre.unltools.unl;
import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
...@@ -8,7 +8,7 @@ import java.util.stream.Stream; ...@@ -8,7 +8,7 @@ import java.util.stream.Stream;
public class SentenceWithExpectedDotArgumentProvider implements ArgumentsProvider { public class SentenceWithExpectedDotArgumentProvider implements ArgumentsProvider {
@Override @Override
public Stream<? extends Arguments> provideArguments(ExtensionContext extensionContext) throws Exception { public Stream<? extends Arguments> provideArguments(ExtensionContext extensionContext) {
return Stream.of(Arguments.of(new R1SentenceWithExpectedDotChecker()), return Stream.of(Arguments.of(new R1SentenceWithExpectedDotChecker()),
Arguments.of(new R2SentenceWithExpectedDotChecker()), Arguments.of(new R2SentenceWithExpectedDotChecker()),
Arguments.of(new CatSentenceWithExpectedDotChecker()), Arguments.of(new CatSentenceWithExpectedDotChecker()),
......
package unl; package fr.tetras_libre.unltools.unl;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
......
package unl.parser; package fr.tetras_libre.unltools.unl.parser;
public interface UnlParserFactory { public interface UnlParserFactory {
WrapperUnlParser create(); WrapperUnlParser create();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment