Commit 57c711e4 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Rename Table's getTableName function to getName. 

Slightly style change to getName.  Since we are in a table, we have to be
fetching the table name.  Reinforcing the fact doesn't help anything.
parent 11e5ed69

src/main/java/ca/mcscert/jtet/eventbgenerator/EventBTableGenerator.java

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ final public class EventBTableGenerator { 
        if (m_refineMode == RefinementMode.WithRefinement) {

            fullName += generateFileName(no) + ".bum";

        } else {

            fullName += m_table.getTableName()  + ".bum";

            fullName += m_table.getName()  + ".bum";

        }



        return fullName;
@@ -117,7 +117,7 @@ final public class EventBTableGenerator { 
    }



    private String generateFileName(int fileNo) {

        return m_table.getTableName() + "_M" + fileNo;

        return m_table.getName() + "_M" + fileNo;

    }



    private String generateFileRefineRelation(int refinerFileNo) {

src/main/java/ca/mcscert/jtet/tabularexpression/Table.java

+5 −5
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ import java.util.Map; 
 * @author Matthew Dawson <matthew@mjdsystems.ca>

 */

public class Table {

    public Table(String tableName, VariableCollection variables) {

        this.tableName = tableName;

    public Table(String name, VariableCollection variables) {

        this.name = name;

        this.m_variables = variables;

    }
@@ -62,8 +62,8 @@ public class Table { 
        }

    }



    public String getTableName() {

        return tableName;

    public String getName() {

        return name;

    }



    public HierarchicalGrid getLeftGrid() {
@@ -141,7 +141,7 @@ public class Table { 
        return generator.getFinalString();

    }



    private String tableName;

    private String name;

    private VariableCollection m_variables;

    private final HierarchicalGrid leftGrid = new HierarchicalGrid();

    private final HierarchicalGrid topGrid = new HierarchicalGrid();

src/test/java/ca/mcscert/jtet/eventbgenerator/ParameterizedEventBTableGeneratorTest.java

+7 −7
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ public class ParameterizedEventBTableGeneratorTest { 


    @Test

    public void testNRTableEventBGenerator() throws IOException {

        m_folderPath = folder.getRoot().toString() + m_table.getTableName() + "/";

        m_folderPath = folder.getRoot().toString() + m_table.getName() + "/";

        doTest(RefinementMode.WithoutRefinement);

    }



    @Test

    public void testWRTableEventBGenerator() throws IOException {

        m_folderPath = folder.getRoot().toString() + m_table.getTableName() + "/";

        m_folderPath = folder.getRoot().toString() + m_table.getName() + "/";

        doTest(RefinementMode.WithRefinement);

    }
@@ -269,21 +269,21 @@ public class ParameterizedEventBTableGeneratorTest { 


    public String generateFileName(RefinementMode refinementMode, int refineLayerIndex) {

        if (refinementMode == RefinementMode.WithRefinement) {

            return m_table.getTableName() + "_M" + refineLayerIndex + ".bum";

            return m_table.getName() + "_M" + refineLayerIndex + ".bum";

        } else {

            return m_table.getTableName()  + ".bum";

            return m_table.getName()  + ".bum";

        }

    }

    public String getExpectedFileName(RefinementMode refinementMode, int refineLayerIndex) {

        if (refinementMode == RefinementMode.WithRefinement){

            return "/expected/WR/" + m_table.getTableName() + "/" + m_table.getTableName() + "_M" + refineLayerIndex + ".bum";

            return "/expected/WR/" + m_table.getName() + "/" + m_table.getName() + "_M" + refineLayerIndex + ".bum";

        } else {

            return "/expected/NR/" + m_table.getTableName() + "/" + m_table.getTableName() + ".bum";

            return "/expected/NR/" + m_table.getName() + "/" + m_table.getName() + ".bum";

        }

    }



    private void execute(RefinementMode refineMode) throws IOException {

        EventBProject eventBProject = new EventBProject(m_table.getTableName());

        EventBProject eventBProject = new EventBProject(m_table.getName());

        eventBProject.setTable(m_table);

        eventBProject.generate(m_folderPath, refineMode);

    }