Commit e12afcc0 authored by Jonathan Shahen's avatar Jonathan Shahen

HOT FIX: 1 unified logger

parent 9b705cd6
......@@ -3,7 +3,7 @@ package mohawk.converter;
import java.util.logging.Logger;
public class Converter {
public static final Logger logger = Logger.getLogger("mohawk-converter");
public static final Logger logger = Logger.getLogger("mohawk");
public static void main(String[] args) {
ConverterInstance inst = new ConverterInstance();
......
package mohawk.converter;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.*;
import java.util.ArrayList;
import java.util.Scanner;
import java.util.logging.Logger;
import mohawk.global.FileExtensions;
import org.apache.commons.cli.Options;
import mohawk.global.FileExtensions;
public class ConverterCUI {
public static final Logger logger = Logger.getLogger("mohawk-converter");
public static final Logger logger = Logger.getLogger("mohawk");
public static FileExtensions fileExt = new FileExtensions();
public static String previousCommandFilename = "ConverterCUIPreviousCommand.txt";
......
......@@ -4,13 +4,10 @@ import java.util.Collections;
import java.util.List;
import java.util.logging.Logger;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.Parser;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.*;
public class BooleanErrorListener extends BaseErrorListener {
public final Logger logger = Logger.getLogger("mohawk-converter");
public final Logger logger = Logger.getLogger("mohawk");
public Boolean errorFound = false;
@Override
......
......@@ -2,9 +2,10 @@ package mohawk.converter.testing;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.*;
import org.junit.Before;
import org.junit.Test;
import mohawk.converter.generated.MohawkTARBACParser;
import mohawk.converter.logging.MohawkConsoleFormatter;
......@@ -13,11 +14,8 @@ import mohawk.converter.to.asaptime.ConvertToASAPTimeSA;
import mohawk.global.pieces.MohawkT;
import mohawk.global.timing.MohawkTiming;
import org.junit.Before;
import org.junit.Test;
public class ConvertToASAPTimeTests {
public static final Logger logger = Logger.getLogger("mohawk-converter");
public static final Logger logger = Logger.getLogger("mohawk");
public MohawkTiming timing = new MohawkTiming();
public String folderbase = "data/regressiontests/";
......
......@@ -2,9 +2,10 @@ package mohawk.converter.testing;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.*;
import org.junit.Before;
import org.junit.Test;
import mohawk.converter.generated.MohawkTARBACParser;
import mohawk.converter.logging.MohawkConsoleFormatter;
......@@ -12,11 +13,8 @@ import mohawk.converter.to.tred.ConvertToTRole;
import mohawk.global.pieces.MohawkT;
import mohawk.global.timing.MohawkTiming;
import org.junit.Before;
import org.junit.Test;
public class ConvertToTRoleTests {
public static final Logger logger = Logger.getLogger("mohawk-converter");
public static final Logger logger = Logger.getLogger("mohawk");
public MohawkTiming timing = new MohawkTiming();
public String folderbase = "data/regressiontests/";
......
package mohawk.converter.testing;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import static org.junit.Assert.*;
import java.io.*;
import java.util.ArrayList;
import java.util.logging.Logger;
import mohawk.converter.generated.MohawkTARBACLexer;
import mohawk.converter.generated.MohawkTARBACParser;
import mohawk.global.FileExtensions;
import mohawk.global.pieces.MohawkT;
import mohawk.global.pieces.Rule;
import mohawk.global.pieces.TimeInterval;
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.*;
import org.apache.commons.lang3.StringUtils;
import org.junit.Before;
import org.junit.Test;
import mohawk.converter.generated.MohawkTARBACLexer;
import mohawk.converter.generated.MohawkTARBACParser;
import mohawk.global.FileExtensions;
import mohawk.global.pieces.*;
/**
* Run these JUnit tests before adding any branch to master
*
......@@ -34,7 +24,7 @@ import org.junit.Test;
*/
public class ConverterRegressionTests {
public final Logger logger = Logger.getLogger("mohawk-converter");
public final Logger logger = Logger.getLogger("mohawk");
public String folderbase = "data/regressiontests/";
public BooleanErrorListener error = new BooleanErrorListener();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment