Commit 13ee85a0 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Move all the java code to the package ca.mcmaster.cas.tabularexpressiontoolbox. 

Since the java code is turning into entire toolbox for dealing with tabular
expressions, move the code to an appropriate package.  Even if it doesn't
become a full toolbox (for java), it is deeply used by the Matlab toolbox.
Thus pull the name from there.

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_javization@10844 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 54cf6993

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>



    <groupId>ca.mcmaster.cas</groupId>

    <groupId>ca.mcmaster.cas.tabularexpressiontoolbox</groupId>

    <artifactId>Matlab2SMT</artifactId>

    <version>1.0-SNAPSHOT</version>

    <packaging>jar</packaging>
@@ -70,7 +70,7 @@ 
                    </descriptorRefs>

                    <archive>

                        <manifest>

                            <mainClass>ca.mcmaster.cas.matlab2smt.App</mainClass>

                            <mainClass>ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.App</mainClass>

                        </manifest>

                    </archive>

                </configuration>

src/main/java/ca/mcmaster/cas/cvc3generator/HierarchicalGridCVC3Generator.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/cvc3generator/HierarchicalGridCVC3Generator.java

+8 −8
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

package ca.mcmaster.cas.cvc3generator;



import ca.mcmaster.cas.matlab2smt.MatlabParser;

import ca.mcmaster.cas.matlab2smt.BooleanVariableType;

import ca.mcmaster.cas.matlab2smt.VariableParser;

import ca.mcmaster.cas.matlab2smt.CVC3Generator;

import ca.mcmaster.cas.tablularexpression.Cell;

import ca.mcmaster.cas.tablularexpression.HierarchcialGridCheckerGenerator;

package ca.mcmaster.cas.tabularexpressiontoolbox.cvc3generator;



import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.MatlabParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.BooleanVariableType;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.VariableParser;

import ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.CVC3Generator;

import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.Cell;

import ca.mcmaster.cas.tabularexpressiontoolbox.tablularexpression.HierarchcialGridCheckerGenerator;

import java.util.ArrayList;

import java.util.ArrayDeque;

import java.util.Deque;

src/main/java/ca/mcmaster/cas/matlab2smt/App.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/App.java

+2 −2
Original line number Diff line number Diff line 
package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;



import java.util.logging.Level;

import java.util.logging.Logger;
@@ -12,7 +12,7 @@ public class App 
{

    public static void main( String[] args )

    {

        String[] args2 = {"ca.mcmaster.cas.matlab2smt.MatlabParser", "expression", "-tree"};

        String[] args2 = {"ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt.MatlabParser", "expression", "-tree"};

        try {

            TestRig.main(args2);

        } catch (Exception ex) {

src/main/java/ca/mcmaster/cas/matlab2smt/BooleanVariableType.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/BooleanVariableType.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;



/**

 *

src/main/java/ca/mcmaster/cas/matlab2smt/CVC3Generator.java→src/main/java/ca/mcmaster/cas/tabularexpressiontoolbox/matlab2smt/CVC3Generator.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package ca.mcmaster.cas.matlab2smt;

package ca.mcmaster.cas.tabularexpressiontoolbox.matlab2smt;



import java.math.BigDecimal;

import java.math.BigInteger;