Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/Main.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/Main.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/Main.java (revision 238) @@ -7,7 +7,7 @@ import de.uni_hildesheim.sse.trans.in.InputType; import de.uni_hildesheim.sse.trans.out.OutputType; -import de.uni_hildesheim.sse.utils.logger.AdvancedJavaLogger; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.LoggingLevel; +import net.ssehub.easy.basics.logger.AdvancedJavaLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.LoggingLevel; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/ModelTranslator.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/ModelTranslator.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/ModelTranslator.java (revision 238) @@ -6,5 +6,4 @@ import java.io.Writer; -import de.uni_hildesheim.sse.model.varModel.Project; import de.uni_hildesheim.sse.trans.convert.CNFConverter; import de.uni_hildesheim.sse.trans.convert.MaxTermConverter2; @@ -20,6 +19,7 @@ import de.uni_hildesheim.sse.trans.out.IVMLWriter; import de.uni_hildesheim.sse.trans.out.OutputType; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.model.Project; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CNFConverter.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CNFConverter.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CNFConverter.java (revision 238) @@ -3,14 +3,14 @@ import java.util.List; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.FilterType; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTExpander.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTExpander.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTExpander.java (revision 238) @@ -1,22 +1,22 @@ package de.uni_hildesheim.sse.trans.convert; -import de.uni_hildesheim.sse.model.cst.AttributeVariable; -import de.uni_hildesheim.sse.model.cst.Comment; -import de.uni_hildesheim.sse.model.cst.CompoundAccess; -import de.uni_hildesheim.sse.model.cst.CompoundInitializer; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.ContainerInitializer; -import de.uni_hildesheim.sse.model.cst.ContainerOperationCall; -import de.uni_hildesheim.sse.model.cst.IConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.IfThen; -import de.uni_hildesheim.sse.model.cst.Let; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Self; -import de.uni_hildesheim.sse.model.cst.UnresolvedExpression; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.DeclrationInConstraintFinder; +import net.ssehub.easy.varModel.cst.AttributeVariable; +import net.ssehub.easy.varModel.cst.Comment; +import net.ssehub.easy.varModel.cst.CompoundAccess; +import net.ssehub.easy.varModel.cst.CompoundInitializer; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.ContainerInitializer; +import net.ssehub.easy.varModel.cst.ContainerOperationCall; +import net.ssehub.easy.varModel.cst.IConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.IfThen; +import net.ssehub.easy.varModel.cst.Let; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Self; +import net.ssehub.easy.varModel.cst.UnresolvedExpression; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.DeclrationInConstraintFinder; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/CSTNegater.java (revision 238) @@ -1,21 +1,21 @@ package de.uni_hildesheim.sse.trans.convert; -import de.uni_hildesheim.sse.model.cst.AttributeVariable; -import de.uni_hildesheim.sse.model.cst.Comment; -import de.uni_hildesheim.sse.model.cst.CompoundAccess; -import de.uni_hildesheim.sse.model.cst.CompoundInitializer; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.ContainerInitializer; -import de.uni_hildesheim.sse.model.cst.ContainerOperationCall; -import de.uni_hildesheim.sse.model.cst.IConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.IfThen; -import de.uni_hildesheim.sse.model.cst.Let; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Self; -import de.uni_hildesheim.sse.model.cst.UnresolvedExpression; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.AttributeVariable; +import net.ssehub.easy.varModel.cst.Comment; +import net.ssehub.easy.varModel.cst.CompoundAccess; +import net.ssehub.easy.varModel.cst.CompoundInitializer; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.ContainerInitializer; +import net.ssehub.easy.varModel.cst.ContainerOperationCall; +import net.ssehub.easy.varModel.cst.IConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.IfThen; +import net.ssehub.easy.varModel.cst.Let; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Self; +import net.ssehub.easy.varModel.cst.UnresolvedExpression; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ConstraintContainer.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ConstraintContainer.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ConstraintContainer.java (revision 238) @@ -3,5 +3,5 @@ import java.util.Set; -import de.uni_hildesheim.sse.model.varModel.Constraint; +import net.ssehub.easy.varModel.model.Constraint; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepth.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepth.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepth.java (revision 238) @@ -9,23 +9,23 @@ import java.util.Set; -import de.uni_hildesheim.sse.model.cst.AttributeVariable; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.Comment; -import de.uni_hildesheim.sse.model.cst.CompoundAccess; -import de.uni_hildesheim.sse.model.cst.CompoundInitializer; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.ContainerInitializer; -import de.uni_hildesheim.sse.model.cst.ContainerOperationCall; -import de.uni_hildesheim.sse.model.cst.IConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.IfThen; -import de.uni_hildesheim.sse.model.cst.Let; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Self; -import de.uni_hildesheim.sse.model.cst.UnresolvedExpression; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.AttributeVariable; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.Comment; +import net.ssehub.easy.varModel.cst.CompoundAccess; +import net.ssehub.easy.varModel.cst.CompoundInitializer; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.ContainerInitializer; +import net.ssehub.easy.varModel.cst.ContainerOperationCall; +import net.ssehub.easy.varModel.cst.IConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.IfThen; +import net.ssehub.easy.varModel.cst.Let; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Self; +import net.ssehub.easy.varModel.cst.UnresolvedExpression; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DisjunctionChecker.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DisjunctionChecker.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/DisjunctionChecker.java (revision 238) @@ -1,21 +1,21 @@ package de.uni_hildesheim.sse.trans.convert; -import de.uni_hildesheim.sse.model.cst.AttributeVariable; -import de.uni_hildesheim.sse.model.cst.Comment; -import de.uni_hildesheim.sse.model.cst.CompoundAccess; -import de.uni_hildesheim.sse.model.cst.CompoundInitializer; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ContainerInitializer; -import de.uni_hildesheim.sse.model.cst.ContainerOperationCall; -import de.uni_hildesheim.sse.model.cst.IConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.IfThen; -import de.uni_hildesheim.sse.model.cst.Let; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Self; -import de.uni_hildesheim.sse.model.cst.UnresolvedExpression; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.AttributeVariable; +import net.ssehub.easy.varModel.cst.Comment; +import net.ssehub.easy.varModel.cst.CompoundAccess; +import net.ssehub.easy.varModel.cst.CompoundInitializer; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ContainerInitializer; +import net.ssehub.easy.varModel.cst.ContainerOperationCall; +import net.ssehub.easy.varModel.cst.IConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.IfThen; +import net.ssehub.easy.varModel.cst.Let; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Self; +import net.ssehub.easy.varModel.cst.UnresolvedExpression; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ICNFConvertStrategy.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ICNFConvertStrategy.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ICNFConvertStrategy.java (revision 238) @@ -1,5 +1,5 @@ package de.uni_hildesheim.sse.trans.convert; -import de.uni_hildesheim.sse.model.varModel.Constraint; +import net.ssehub.easy.varModel.model.Constraint; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/LiteralFinder.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/LiteralFinder.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/LiteralFinder.java (revision 238) @@ -4,21 +4,21 @@ import java.util.Set; -import de.uni_hildesheim.sse.model.cst.AttributeVariable; -import de.uni_hildesheim.sse.model.cst.Comment; -import de.uni_hildesheim.sse.model.cst.CompoundAccess; -import de.uni_hildesheim.sse.model.cst.CompoundInitializer; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.ContainerInitializer; -import de.uni_hildesheim.sse.model.cst.ContainerOperationCall; -import de.uni_hildesheim.sse.model.cst.IConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.IfThen; -import de.uni_hildesheim.sse.model.cst.Let; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Self; -import de.uni_hildesheim.sse.model.cst.UnresolvedExpression; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.AttributeVariable; +import net.ssehub.easy.varModel.cst.Comment; +import net.ssehub.easy.varModel.cst.CompoundAccess; +import net.ssehub.easy.varModel.cst.CompoundInitializer; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.ContainerInitializer; +import net.ssehub.easy.varModel.cst.ContainerOperationCall; +import net.ssehub.easy.varModel.cst.IConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.IfThen; +import net.ssehub.easy.varModel.cst.Let; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Self; +import net.ssehub.easy.varModel.cst.UnresolvedExpression; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter.java (revision 238) @@ -11,25 +11,25 @@ import org.apache.commons.io.output.WriterOutputStream; -import de.uni_hildesheim.sse.model.confModel.AssignmentState; -import de.uni_hildesheim.sse.model.confModel.Configuration; -import de.uni_hildesheim.sse.model.confModel.ConfigurationException; -import de.uni_hildesheim.sse.model.confModel.IDecisionVariable; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.DebugConstraintTreeVisitor; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.cstEvaluation.EvaluationVisitor; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.DeclrationInConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.values.BooleanValue; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; -import de.uni_hildesheim.sse.utils.logger.LoggingLevel; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.LoggingLevel; +import net.ssehub.easy.varModel.confModel.AssignmentState; +import net.ssehub.easy.varModel.confModel.Configuration; +import net.ssehub.easy.varModel.confModel.ConfigurationException; +import net.ssehub.easy.varModel.confModel.IDecisionVariable; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.DebugConstraintTreeVisitor; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.cstEvaluation.EvaluationVisitor; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.DeclrationInConstraintFinder; +import net.ssehub.easy.varModel.model.values.BooleanValue; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2.java (revision 238) @@ -4,15 +4,15 @@ import java.text.NumberFormat; -import de.uni_hildesheim.sse.model.confModel.AssignmentState; -import de.uni_hildesheim.sse.model.confModel.Configuration; -import de.uni_hildesheim.sse.model.confModel.ConfigurationException; -import de.uni_hildesheim.sse.model.confModel.IDecisionVariable; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cstEvaluation.EvaluationVisitor; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.values.BooleanValue; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.confModel.AssignmentState; +import net.ssehub.easy.varModel.confModel.Configuration; +import net.ssehub.easy.varModel.confModel.ConfigurationException; +import net.ssehub.easy.varModel.confModel.IDecisionVariable; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cstEvaluation.EvaluationVisitor; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.values.BooleanValue; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ModelOptimizer.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ModelOptimizer.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/convert/ModelOptimizer.java (revision 238) @@ -6,21 +6,21 @@ import java.util.Set; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.DeclrationInConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.DeclrationInConstraintFinder; +import net.ssehub.easy.varModel.model.filter.FilterType; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/AbstractReader.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/AbstractReader.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/AbstractReader.java (revision 238) @@ -10,9 +10,9 @@ import org.apache.commons.io.FilenameUtils; -import de.uni_hildesheim.sse.model.validation.IvmlIdentifierCheck; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.IDatatype; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.IDatatype; +import net.ssehub.easy.varModel.validation.IvmlIdentifierCheck; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/IModelReader.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/IModelReader.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/IModelReader.java (revision 238) @@ -3,5 +3,5 @@ import java.io.IOException; -import de.uni_hildesheim.sse.model.varModel.Project; +import net.ssehub.easy.varModel.model.Project; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/ModelReader.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/ModelReader.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/ModelReader.java (revision 238) @@ -13,19 +13,19 @@ import org.apache.commons.io.FilenameUtils; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.VariablePool; -import de.uni_hildesheim.sse.model.validation.IvmlIdentifierCheck; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.Main; import de.uni_hildesheim.sse.trans.convert.OptimizationParameter; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.VariablePool; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.validation.IvmlIdentifierCheck; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFChoice.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFChoice.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFChoice.java (revision 238) @@ -6,11 +6,11 @@ import java.util.Map; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.Main; import de.uni_hildesheim.sse.trans.in.ParserException; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFCondition.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFCondition.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFCondition.java (revision 238) @@ -4,15 +4,15 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.cst.VariablePool; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.Main; import de.uni_hildesheim.sse.trans.in.ParserException; import de.uni_hildesheim.sse.trans.in.ParserException.ParserExceptionType; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.cst.VariablePool; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultAndPromptCondition.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultAndPromptCondition.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDefaultAndPromptCondition.java (revision 238) @@ -4,11 +4,11 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.Main; import de.uni_hildesheim.sse.trans.in.ParserException; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDependsCondition.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDependsCondition.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFDependsCondition.java (revision 238) @@ -4,10 +4,10 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.in.ParserException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItem.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItem.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItem.java (revision 238) @@ -5,5 +5,5 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.Variable; +import net.ssehub.easy.varModel.cst.Variable; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFItemSelectsCondition.java (revision 238) @@ -4,9 +4,9 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.in.ParserException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFModuleCondition.java (revision 238) @@ -4,9 +4,9 @@ import java.util.List; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; import de.uni_hildesheim.sse.trans.in.ParserException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFReader.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFReader.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/in/rsf/RSFReader.java (revision 238) @@ -11,25 +11,25 @@ import java.util.Map; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstantValue; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.Enum; -import de.uni_hildesheim.sse.model.varModel.datatypes.IDatatype; -import de.uni_hildesheim.sse.model.varModel.datatypes.IntegerType; -import de.uni_hildesheim.sse.model.varModel.datatypes.RealType; -import de.uni_hildesheim.sse.model.varModel.datatypes.StringType; -import de.uni_hildesheim.sse.model.varModel.values.Value; -import de.uni_hildesheim.sse.model.varModel.values.ValueDoesNotMatchTypeException; -import de.uni_hildesheim.sse.model.varModel.values.ValueFactory; import de.uni_hildesheim.sse.trans.Main; import de.uni_hildesheim.sse.trans.in.AbstractReader; import de.uni_hildesheim.sse.trans.in.ParserException; import de.uni_hildesheim.sse.trans.in.ParserException.ParserExceptionType; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstantValue; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.IDatatype; +import net.ssehub.easy.varModel.model.datatypes.IntegerType; +import net.ssehub.easy.varModel.model.datatypes.RealType; +import net.ssehub.easy.varModel.model.datatypes.StringType; +import net.ssehub.easy.varModel.model.values.Value; +import net.ssehub.easy.varModel.model.values.ValueDoesNotMatchTypeException; +import net.ssehub.easy.varModel.model.values.ValueFactory; +import net.ssehub.easy.varModel.model.datatypes.Enum; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DeclarationsComparator.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DeclarationsComparator.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DeclarationsComparator.java (revision 238) @@ -3,5 +3,5 @@ import java.util.Comparator; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; +import net.ssehub.easy.varModel.model.AbstractVariable; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DimacsWriter.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DimacsWriter.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/DimacsWriter.java (revision 238) @@ -9,19 +9,19 @@ import java.util.Map; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.IvmlKeyWords; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.IvmlKeyWords; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.FilterType; /** Index: /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/IVMLWriter.java =================================================================== --- /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/IVMLWriter.java (revision 237) +++ /ModelTranslator/src/de/uni_hildesheim/sse/trans/out/IVMLWriter.java (revision 238) @@ -9,24 +9,24 @@ import java.util.List; -import de.uni_hildesheim.sse.model.validation.IvmlIdentifierCheck; -import de.uni_hildesheim.sse.model.validation.IvmlValidationVisitor; -import de.uni_hildesheim.sse.model.varModel.AbstractVariable; -import de.uni_hildesheim.sse.model.varModel.Comment; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.IvmlKeyWords; -import de.uni_hildesheim.sse.model.varModel.ModelElement; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.CustomDatatype; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DatatypeFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; import de.uni_hildesheim.sse.trans.Main; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory; -import de.uni_hildesheim.sse.utils.logger.EASyLoggerFactory.EASyLogger; -import de.uni_hildesheim.sse.utils.messages.Message; -import de.uni_hildesheim.sse.utils.modelManagement.Version; -import de.uni_hildesheim.sse.utils.modelManagement.VersionFormatException; +import net.ssehub.easy.basics.logger.EASyLoggerFactory; +import net.ssehub.easy.basics.logger.EASyLoggerFactory.EASyLogger; +import net.ssehub.easy.basics.messages.Message; +import net.ssehub.easy.basics.modelManagement.Version; +import net.ssehub.easy.basics.modelManagement.VersionFormatException; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.Comment; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.IvmlKeyWords; +import net.ssehub.easy.varModel.model.ModelElement; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.CustomDatatype; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DatatypeFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.FilterType; +import net.ssehub.easy.varModel.validation.IvmlIdentifierCheck; +import net.ssehub.easy.varModel.validation.IvmlValidationVisitor; /** @@ -40,5 +40,5 @@ private static final DateFormat DF = new SimpleDateFormat("dd.MM.yyyy"); - private de.uni_hildesheim.sse.persistency.IVMLWriter writer; + private net.ssehub.easy.varModel.persistency.IVMLWriter writer; private Project project; @@ -50,5 +50,5 @@ */ public IVMLWriter(Writer writer, Project project) { - this.writer = new de.uni_hildesheim.sse.persistency.IVMLWriter(writer); + this.writer = new net.ssehub.easy.varModel.persistency.IVMLWriter(writer); this.project = project; } Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/DimacsTestUtils.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/DimacsTestUtils.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/DimacsTestUtils.java (revision 238) @@ -9,10 +9,10 @@ import org.junit.Assert; -import de.uni_hildesheim.sse.model.varModel.IvmlKeyWords; -import de.uni_hildesheim.sse.model.varModel.Project; import de.uni_hildesheim.sse.trans.convert.OptimizationParameter; import de.uni_hildesheim.sse.trans.in.InputType; import de.uni_hildesheim.sse.trans.out.DimacsWriter; import de.uni_hildesheim.sse.trans.out.OutputType; +import net.ssehub.easy.varModel.model.IvmlKeyWords; +import net.ssehub.easy.varModel.model.Project; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTExpanderTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTExpanderTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTExpanderTest.java (revision 238) @@ -5,10 +5,10 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTNegaterTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTNegaterTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/CSTNegaterTest.java (revision 238) @@ -5,10 +5,10 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepthTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepthTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DeclarationInConstraintFinderWithDepthTest.java (revision 238) @@ -5,9 +5,10 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.AbstractVariable; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DisjunctionCheckerTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DisjunctionCheckerTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/DisjunctionCheckerTest.java (revision 238) @@ -4,12 +4,12 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/LiteralFinderTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/LiteralFinderTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/LiteralFinderTest.java (revision 238) @@ -6,11 +6,11 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.VariablePool; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.VariablePool; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2Test.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2Test.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverter2Test.java (revision 238) @@ -4,20 +4,20 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.confModel.AssignmentState; -import de.uni_hildesheim.sse.model.confModel.Configuration; -import de.uni_hildesheim.sse.model.confModel.ConfigurationException; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.cstEvaluation.EvaluationVisitor; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.values.BooleanValue; +import net.ssehub.easy.varModel.confModel.AssignmentState; +import net.ssehub.easy.varModel.confModel.Configuration; +import net.ssehub.easy.varModel.confModel.ConfigurationException; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.cstEvaluation.EvaluationVisitor; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.values.BooleanValue; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverterTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverterTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/MaxTermConverterTest.java (revision 238) @@ -4,15 +4,15 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Parenthesis; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Parenthesis; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/ModelOptimizerTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/ModelOptimizerTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/convert/ModelOptimizerTest.java (revision 238) @@ -4,17 +4,17 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.FilterType; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/in/ModelReaderTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/in/ModelReaderTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/in/ModelReaderTest.java (revision 238) @@ -7,15 +7,15 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.ConstraintSyntaxTree; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; -import de.uni_hildesheim.sse.model.varModel.filter.ConstraintFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder; -import de.uni_hildesheim.sse.model.varModel.filter.DeclarationFinder.VisibilityType; -import de.uni_hildesheim.sse.model.varModel.filter.FilterType; import de.uni_hildesheim.sse.trans.AllTests; import de.uni_hildesheim.sse.trans.convert.OptimizationParameter; +import net.ssehub.easy.varModel.cst.ConstraintSyntaxTree; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.model.filter.ConstraintFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder; +import net.ssehub.easy.varModel.model.filter.DeclarationFinder.VisibilityType; +import net.ssehub.easy.varModel.model.filter.FilterType; /** Index: /ModelTranslator/test/de/uni_hildesheim/sse/trans/out/DimacsWriterTest.java =================================================================== --- /ModelTranslator/test/de/uni_hildesheim/sse/trans/out/DimacsWriterTest.java (revision 237) +++ /ModelTranslator/test/de/uni_hildesheim/sse/trans/out/DimacsWriterTest.java (revision 238) @@ -6,13 +6,13 @@ import org.junit.Test; -import de.uni_hildesheim.sse.model.cst.CSTSemanticException; -import de.uni_hildesheim.sse.model.cst.OCLFeatureCall; -import de.uni_hildesheim.sse.model.cst.Variable; -import de.uni_hildesheim.sse.model.varModel.Constraint; -import de.uni_hildesheim.sse.model.varModel.DecisionVariableDeclaration; -import de.uni_hildesheim.sse.model.varModel.IvmlKeyWords; -import de.uni_hildesheim.sse.model.varModel.Project; -import de.uni_hildesheim.sse.model.varModel.datatypes.BooleanType; -import de.uni_hildesheim.sse.model.varModel.datatypes.OclKeyWords; +import net.ssehub.easy.varModel.cst.CSTSemanticException; +import net.ssehub.easy.varModel.cst.OCLFeatureCall; +import net.ssehub.easy.varModel.cst.Variable; +import net.ssehub.easy.varModel.model.Constraint; +import net.ssehub.easy.varModel.model.DecisionVariableDeclaration; +import net.ssehub.easy.varModel.model.IvmlKeyWords; +import net.ssehub.easy.varModel.model.Project; +import net.ssehub.easy.varModel.model.datatypes.BooleanType; +import net.ssehub.easy.varModel.model.datatypes.OclKeyWords; /**