diff --git a/AlgebraicDataflowArchitectureModel/models/A.dtram b/AlgebraicDataflowArchitectureModel/models/A.dtram new file mode 100644 index 0000000..fef5480 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/models/A.dtram @@ -0,0 +1,15 @@ +model { + channel CIO{ + out A(a:Int, setA(a2)) == a2; + } +} +geometry { +node r A:180,90,80,30 +} + +services{ + service A{ + baseURL:"https://A/" + resources:A,B,C + } +} \ No newline at end of file diff --git a/AlgebraicDataflowArchitectureModel/models/WOS b/AlgebraicDataflowArchitectureModel/models/WOS new file mode 100644 index 0000000..c92713e --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/models/WOS @@ -0,0 +1,32 @@ +model { +channel CIO2 { + out highest(h:Double, reset(v)) == v +} +channel CIO1 { + out temp_f(p:Double, observe(x)) == x +} +channel C1{ + in temp_f(q:Double, conversion(y)) == y + out temp_c(r:Double, conversion(z)) == (z-32) / 1.8 +} +channel C2{ + in temp_f(q:Double, update(y)) == y + out highest(h:Double, update(z)) == if(gt(z, h), z, h) +} +} +geometry { +node c C1:500,200,30,30 +node c C2:500,100,30,30 +node r highest:650,100,80,30 +node r temp_c:650,200,80,30 +node r temp_f:250,100,80,30 +node ioc CIO2:100,300,30,30 +node ioc CIO1:100,100,30,30 +} + +services{ + service WOS{ + baseURL:"https://WOS/" + resources: temp_f, temp_c, highest + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java index 9a0a8a0..fffe8da 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java @@ -45,38 +45,41 @@ import models.dataFlowModel.ResourceDependencyGraph; import models.dataFlowModel.ResourceNode; import models.visualModel.FormulaChannelGenerator; -import parser.ExpectedAssignment; -import parser.ExpectedChannel; -import parser.ExpectedChannelName; -import parser.ExpectedEquals; -import parser.ExpectedFormulaChannel; -import parser.ExpectedGeometry; -import parser.ExpectedInOrOutOrRefKeyword; -import parser.ExpectedIoChannel; -import parser.ExpectedLeftCurlyBracket; -import parser.ExpectedModel; -import parser.ExpectedNode; -import parser.ExpectedRHSExpression; -import parser.ExpectedResource; -import parser.ExpectedRightBracket; -import parser.ExpectedStateTransition; import parser.Parser; import parser.Parser.TokenStream; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedFormulaChannel; +import parser.exceptions.ExpectedGeometry; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedIoChannel; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedModel; +import parser.exceptions.ExpectedNode; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedResource; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; import parser.ParserDTRAM; -import parser.WrongLHSExpression; -import parser.WrongRHSExpression; public class Editor { final int PORT_DIAMETER = 8; final int PORT_RADIUS = PORT_DIAMETER / 2; - private mxGraph graph = null; private String curFileName = null; private String curFilePath = null; - private DataFlowModel model = null; - private ResourceDependencyGraph resourceDependencyGraph = null; private ArrayList codes = null; + + protected DataFlowModel model = null; + protected mxGraph graph = null; + protected ResourceDependencyGraph resourceDependencyGraph = null; + + public Editor(mxGraph graph) { this.graph = graph; } @@ -158,10 +161,10 @@ String extension =""; if(file != null && file.exists()) { - //�t�@�C�������擾 + //�t�@�C�������擾 String name = file.getName(); - //�g���q���擾 + //�g���q���擾 extension = name.substring(name.lastIndexOf(".")); } if(extension.contains(".model")) { @@ -223,10 +226,10 @@ File file = new File(curFilePath); String extension = ""; if(file != null && file.exists()) { - //�t�@�C�������擾 + //�t�@�C�������擾 String name = file.getName(); - //�g���q���擾 + //�g���q���擾 extension = name.substring(name.lastIndexOf(".")); } if(extension.contains(".model")) { diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java index 6917659..2c9cde3 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java @@ -1,7 +1,12 @@ package graphicalrefactor.editor; +import java.io.File; + import com.mxgraph.view.mxGraph; +import models.dataFlowModel.DataFlowModel; +import models.webServices.WebServicesInfo; + /** * this class is called when you design of Web services. * @@ -10,6 +15,8 @@ */ public class WebServiceEditor extends Editor{ + private WebServicesInfo webServices = null; + /** * [Constructor] * @@ -18,5 +25,14 @@ */ public WebServiceEditor(mxGraph graph) { super(graph); + + this.webServices = new WebServicesInfo(this.model); + } + + /** + * @Override + */ + public DataFlowModel open(File file) { + return null; } } diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactor.java index ab035a5..e3e900d 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactor.java @@ -17,6 +17,7 @@ import com.mxgraph.view.mxGraph; import graphicalrefactor.editor.Editor; +import graphicalrefactor.editor.WebServiceEditor; public class GraphicalRefactor extends JFrame { private static final long serialVersionUID = -8690140317781055614L; @@ -43,7 +44,7 @@ } }; - editor = new Editor(graph); + editor = new WebServiceEditor(graph); graphComponent = new mxGraphComponent(graph) { protected mxICellEditor createCellEditor() { diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java index 688631e..32a97f4 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java @@ -34,9 +34,9 @@ import models.dataFlowModel.PushPullAttribute; import models.dataFlowModel.PushPullValue; import models.visualModel.FormulaChannelGenerator; -import parser.ExpectedRightBracket; import parser.Parser; import parser.Parser.TokenStream; +import parser.exceptions.ExpectedRightBracket; public class GraphicalRefactorCellEditor implements mxICellEditor { public int DEFAULT_MIN_WIDTH = 70; @@ -113,11 +113,11 @@ panel.add(textArea); int r = JOptionPane.showConfirmDialog( - null, // �I�[�i�[�E�B���h�E - panel, // ���b�Z�[�W - "Edit Formula Channel", // �E�B���h�E�^�C�g�� - JOptionPane.OK_CANCEL_OPTION, // �I�v�V�����i�{�^���̎�ށj - JOptionPane.QUESTION_MESSAGE); // ���b�Z�[�W�^�C�v�i�A�C�R���̎�ށj + null, // �I�[�i�[�E�B���h�E + panel, // ���b�Z�[�W + "Edit Formula Channel", // �E�B���h�E�^�C�g�� + JOptionPane.OK_CANCEL_OPTION, // �I�v�V�����i�{�^���̎�ށj + JOptionPane.QUESTION_MESSAGE); // ���b�Z�[�W�^�C�v�i�A�C�R���̎�ށj if(r == JOptionPane.OK_OPTION) { String formula = formulaText.getText(); TokenStream stream = new TokenStream(); diff --git a/AlgebraicDataflowArchitectureModel/src/models/webServices/Service.java b/AlgebraicDataflowArchitectureModel/src/models/webServices/Service.java index eb2f1cb..65757c8 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/webServices/Service.java +++ b/AlgebraicDataflowArchitectureModel/src/models/webServices/Service.java @@ -7,8 +7,8 @@ public class Service { private String name = null; + private String baseURL = null; private ArrayList identifireTemplates = null; - /** * [Constructor] @@ -17,12 +17,26 @@ * @param name : it's Web services name. * */ - public Service(final String name) { + public Service(final String name, final String baseURL) { this.name = name; + this.baseURL = baseURL; this.identifireTemplates = new ArrayList<>(); } /** + * [Copy Constructor] + * + * @param name : it's Web services name. + * + */ + private Service(final Service copy) { + this.name = copy.name; + this.baseURL = copy.baseURL; + this.identifireTemplates = copy.identifireTemplates; + } + + + /** * [Constructor] * * @param name : it's Web services name. @@ -45,9 +59,32 @@ /** * [getter] * + * @return you'll get services's baseURL + */ + public String getBaseURL() { + return this.baseURL; + } + + /** + * [getter] + * * @return you'll get list of an identifier template. */ public List getIdentifierTemplates(){ return this.identifireTemplates; } + + /** + * [public] + * add new to List + * + * @param identifierTemplate + * + * @return + */ + public Service addIdentifireTemplate(final IdentifierTemplate identifierTemplate) { + this.identifireTemplates.add(identifierTemplate); + + return new Service(this); + } } diff --git a/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServices.java b/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServices.java deleted file mode 100644 index b788a86..0000000 --- a/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServices.java +++ /dev/null @@ -1,31 +0,0 @@ -package models.webServices; - -import java.util.ArrayList; -import java.util.List; - -import models.dataFlowModel.DataFlowModel; - -public class WebServices { - - private ArrayList services = null; - - /** - * [Constructor] - * - * @param dataFlowModel : get identifireTemplates and initialize each services. - * - */ - public WebServices(final DataFlowModel dataFlowModel) - { - this.services = new ArrayList<>(); - } - - /** - * [getter] - * - * @return you'll get list of a service. - */ - public List getServices(){ - return this.services; - } -} diff --git a/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServicesInfo.java b/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServicesInfo.java new file mode 100644 index 0000000..f10fa8b --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/models/webServices/WebServicesInfo.java @@ -0,0 +1,36 @@ +package models.webServices; + +import java.util.ArrayList; +import java.util.List; + +import models.dataConstraintModel.IdentifierTemplate; +import models.dataFlowModel.DataFlowModel; + +public class WebServicesInfo { + + private ArrayList services = null; + + /** + * [Constructor] + * + * @param dataFlowModel : get identifireTemplates and initialize each services. + * + */ + public WebServicesInfo(final DataFlowModel dataFlowModel) + { + this.services = new ArrayList<>(); + +// for (IdentifierTemplate identifireTemplate : dataFlowModel.getIdentifierTemplates()) { +// this.services.add(new Service(identifireTemplate.getResourceName())); +// } + } + + /** + * [getter] + * + * @return you'll get list of a service. + */ + public List getServices(){ + return this.services; + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedAssignment.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedAssignment.java deleted file mode 100644 index 2b7a495..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedAssignment.java +++ /dev/null @@ -1,8 +0,0 @@ -package parser; - -public class ExpectedAssignment extends ParseException { - - public ExpectedAssignment(int line) { - super(line); - } -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannel.java deleted file mode 100644 index e80a4b8..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannel.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedChannel extends ParseException { - - public ExpectedChannel(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannelName.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannelName.java deleted file mode 100644 index e802150..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedChannelName.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedChannelName extends ParseException { - - public ExpectedChannelName(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedEquals.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedEquals.java deleted file mode 100644 index 89640fd..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedEquals.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedEquals extends ParseException { - - public ExpectedEquals(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedFormulaChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedFormulaChannel.java deleted file mode 100644 index 420655e..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedFormulaChannel.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedFormulaChannel extends ParseException { - - public ExpectedFormulaChannel(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedGeometry.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedGeometry.java deleted file mode 100644 index b7927e0..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedGeometry.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedGeometry extends ParseException { - - public ExpectedGeometry(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedInOrOutOrRefKeyword.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedInOrOutOrRefKeyword.java deleted file mode 100644 index bb10522..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedInOrOutOrRefKeyword.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedInOrOutOrRefKeyword extends ParseException { - - public ExpectedInOrOutOrRefKeyword(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedIoChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedIoChannel.java deleted file mode 100644 index d6885fd..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedIoChannel.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedIoChannel extends ParseException { - - public ExpectedIoChannel(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedLeftCurlyBracket.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedLeftCurlyBracket.java deleted file mode 100644 index 7f14ae0..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedLeftCurlyBracket.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedLeftCurlyBracket extends ParseException { - - public ExpectedLeftCurlyBracket(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedModel.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedModel.java deleted file mode 100644 index d3758e3..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedModel.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedModel extends ParseException { - - public ExpectedModel(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedNode.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedNode.java deleted file mode 100644 index c82a553..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedNode.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedNode extends ParseException { - - public ExpectedNode(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRHSExpression.java deleted file mode 100644 index 2f315a5..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRHSExpression.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedRHSExpression extends ParseException { - - public ExpectedRHSExpression(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedResource.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedResource.java deleted file mode 100644 index b462e21..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedResource.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedResource extends ParseException { - - public ExpectedResource(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRightBracket.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRightBracket.java deleted file mode 100644 index 34ac65b..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedRightBracket.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedRightBracket extends ParseException { - - public ExpectedRightBracket(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedStateTransition.java b/AlgebraicDataflowArchitectureModel/src/parser/ExpectedStateTransition.java deleted file mode 100644 index 0a50c12..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ExpectedStateTransition.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class ExpectedStateTransition extends ParseException { - - public ExpectedStateTransition(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParseException.java b/AlgebraicDataflowArchitectureModel/src/parser/ParseException.java deleted file mode 100644 index c9dcf30..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/ParseException.java +++ /dev/null @@ -1,10 +0,0 @@ -package parser; - -public class ParseException extends Exception { - protected int line; - - public ParseException(int line) { - super("at line " + (line + 1)); - this.line = line; - } -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java index 77effe9..d2be315 100644 --- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java +++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java @@ -17,6 +17,17 @@ import models.dataConstraintModel.StateTransition; import models.dataFlowModel.DataFlowModel; import models.dataFlowModel.DataflowChannelGenerator; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class Parser { protected BufferedReader reader; diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java index 0012395..b40dc25 100644 --- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java +++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java @@ -2,6 +2,8 @@ import java.io.BufferedReader; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; import com.mxgraph.model.mxCell; import com.mxgraph.model.mxGeometry; @@ -12,13 +14,30 @@ import models.dataFlowModel.DataFlowModel; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedFormulaChannel; +import parser.exceptions.ExpectedGeometry; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedIoChannel; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedModel; +import parser.exceptions.ExpectedNode; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedResource; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class ParserDTRAM extends Parser { - - private static TokenStream stream; + protected static TokenStream stream; public static final String MODEL = "model"; + public static final String GEOMETRY = "geometry"; public static final String NODE = "node"; public static final String RESOURCE = "r"; @@ -53,7 +72,7 @@ parseGeometry(stream, graph); } - + public static DataFlowModel parseModel(TokenStream stream) throws ExpectedRightBracket, ExpectedChannel, ExpectedChannelName, ExpectedLeftCurlyBracket, ExpectedInOrOutOrRefKeyword, ExpectedStateTransition, ExpectedEquals, ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression, ExpectedAssignment, ExpectedModel, ExpectedGeometry { @@ -110,7 +129,7 @@ String colon = stream.next(); String x = stream.next(); - int xC = Integer.parseInt(x); // C = Coordinate(���W) + int xC = Integer.parseInt(x); // C = Coordinate(���W) String comma1 = stream.next(); @@ -151,4 +170,3 @@ } - diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java new file mode 100644 index 0000000..fb4d05c --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java @@ -0,0 +1,120 @@ +package parser; + +import java.io.BufferedReader; +import java.util.ArrayList; + +import com.mxgraph.view.mxGraph; + +import graphicalrefactor.editor.WebServiceEditor; +import models.dataConstraintModel.IdentifierTemplate; +import models.dataFlowModel.DataFlowModel; +import models.webServices.Service; +import models.webServices.WebServicesInfo; +import parser.Parser.TokenStream; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ParseException; +import parser.exceptions.webService.ExpectedBaseURL; +import parser.exceptions.webService.ExpectedResources; +import parser.exceptions.webService.ExpectedWebService; + +public class ParserDTRAMForWebService extends ParserDTRAM { + + public static final String SERVICES = "serviecs"; + public static final String SERVICE = "service"; + public static final String BASE_URL = "baseURL"; + public static final String RESOURCES = "resources"; + + /**-------------------------------------------------------------------------------- + * [Constructor] + * + * @param reader + * + */ + public ParserDTRAMForWebService(BufferedReader reader) { + super(reader); + + } + + /**-------------------------------------------------------------------------------- + * execute to parse the DTRAM file. + * + * @param graph + */ + public void doParseWebService(final WebServiceEditor editor, final DataFlowModel model) + throws ExpectedWebService, ExpectedBaseURL, ExpectedResources, + ExpectedLeftCurlyBracket, ExpectedRightBracket, ExpectedAssignment + { + doParseWebService(this.stream, editor, model); + } + + /**-------------------------------------------------------------------------------- + * parse to Web service's options in the DTRAM file. + * + * @param stream + * + */ + public static void doParseWebService( + final TokenStream stream, final WebServiceEditor editor, final DataFlowModel model) + throws ExpectedWebService, ExpectedBaseURL, ExpectedResources, + ExpectedLeftCurlyBracket, ExpectedRightBracket, ExpectedAssignment + { + // check the token name is "services" + if(!hasSpecificToken(stream.next(), SERVICES)) + throw new ExpectedWebService(stream.getLine()); + + // check the token is "{" + if(!hasSpecificToken(stream.next(), LEFT_CURLY_BRACKET)) + throw new ExpectedLeftCurlyBracket(stream.getLine()); + + while(hasSpecificToken(stream.next(), SERVICE)) { + + // it gets a service name here. + String name = stream.next(); + + // check the token is "{" + if(!hasSpecificToken(stream.next(), LEFT_CURLY_BRACKET)) + throw new ExpectedLeftCurlyBracket(stream.getLine()); + + // check the token is "baseURL" + if(!hasSpecificToken(stream.next(), BASE_URL)) + throw new ExpectedBaseURL(stream.getLine()); + + // check the token is ":" + if(!hasSpecificToken(stream.next(), COLON)) + throw new ExpectedAssignment(stream.getLine()); + + // it gets a service's base URL here. + String baseURL = stream.next(); + + // check the token is "resources" + if(!hasSpecificToken(stream.next(), RESOURCES)) + throw new ExpectedResources(stream.getLine()); + + // check the token is ":" + if(!hasSpecificToken(stream.next(), COLON)) + throw new ExpectedAssignment(stream.getLine()); + + // + Service service = new Service(name, baseURL); + String resourceName = ""; + + // if it doesn't have a token "COMMA", + // then it's going to break for iteration. + do { + // get here. + resourceName = stream.next(); + + IdentifierTemplate identifierTemplate = model.getIdentifierTemplate(resourceName); + service = service.addIdentifireTemplate(identifierTemplate); + } + while(hasSpecificToken(stream.next(), COMMA)); + } + } + + private static Boolean hasSpecificToken(final String token, final String correctToken) { + return (token.equals(correctToken)); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/WrongLHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/WrongLHSExpression.java deleted file mode 100644 index 0d99ec1..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/WrongLHSExpression.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class WrongLHSExpression extends ParseException { - - public WrongLHSExpression(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/WrongRHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/WrongRHSExpression.java deleted file mode 100644 index 9c52885..0000000 --- a/AlgebraicDataflowArchitectureModel/src/parser/WrongRHSExpression.java +++ /dev/null @@ -1,9 +0,0 @@ -package parser; - -public class WrongRHSExpression extends ParseException { - - public WrongRHSExpression(int line) { - super(line); - } - -} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedAssignment.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedAssignment.java new file mode 100644 index 0000000..90a6c3e --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedAssignment.java @@ -0,0 +1,8 @@ +package parser.exceptions; + +public class ExpectedAssignment extends ParseException { + + public ExpectedAssignment(int line) { + super(line); + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannel.java new file mode 100644 index 0000000..385248a --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannel.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedChannel extends ParseException { + + public ExpectedChannel(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannelName.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannelName.java new file mode 100644 index 0000000..72d0336 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedChannelName.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedChannelName extends ParseException { + + public ExpectedChannelName(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedEquals.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedEquals.java new file mode 100644 index 0000000..ed322d8 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedEquals.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedEquals extends ParseException { + + public ExpectedEquals(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedFormulaChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedFormulaChannel.java new file mode 100644 index 0000000..e1e9f2b --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedFormulaChannel.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedFormulaChannel extends ParseException { + + public ExpectedFormulaChannel(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedGeometry.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedGeometry.java new file mode 100644 index 0000000..1521507 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedGeometry.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedGeometry extends ParseException { + + public ExpectedGeometry(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedInOrOutOrRefKeyword.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedInOrOutOrRefKeyword.java new file mode 100644 index 0000000..a44a604 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedInOrOutOrRefKeyword.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedInOrOutOrRefKeyword extends ParseException { + + public ExpectedInOrOutOrRefKeyword(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedIoChannel.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedIoChannel.java new file mode 100644 index 0000000..fba4cc7 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedIoChannel.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedIoChannel extends ParseException { + + public ExpectedIoChannel(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedLeftCurlyBracket.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedLeftCurlyBracket.java new file mode 100644 index 0000000..30f92b0 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedLeftCurlyBracket.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedLeftCurlyBracket extends ParseException { + + public ExpectedLeftCurlyBracket(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedModel.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedModel.java new file mode 100644 index 0000000..222522a --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedModel.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedModel extends ParseException { + + public ExpectedModel(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedNode.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedNode.java new file mode 100644 index 0000000..b3af50c --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedNode.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedNode extends ParseException { + + public ExpectedNode(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRHSExpression.java new file mode 100644 index 0000000..994bf77 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRHSExpression.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedRHSExpression extends ParseException { + + public ExpectedRHSExpression(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedResource.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedResource.java new file mode 100644 index 0000000..dd5f00a --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedResource.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedResource extends ParseException { + + public ExpectedResource(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRightBracket.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRightBracket.java new file mode 100644 index 0000000..627c57b --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedRightBracket.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedRightBracket extends ParseException { + + public ExpectedRightBracket(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedStateTransition.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedStateTransition.java new file mode 100644 index 0000000..02d27b4 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ExpectedStateTransition.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class ExpectedStateTransition extends ParseException { + + public ExpectedStateTransition(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ParseException.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ParseException.java new file mode 100644 index 0000000..be5aade --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/ParseException.java @@ -0,0 +1,10 @@ +package parser.exceptions; + +public class ParseException extends Exception { + protected int line; + + public ParseException(int line) { + super("at line " + (line + 1)); + this.line = line; + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongLHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongLHSExpression.java new file mode 100644 index 0000000..0ed087a --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongLHSExpression.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class WrongLHSExpression extends ParseException { + + public WrongLHSExpression(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongRHSExpression.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongRHSExpression.java new file mode 100644 index 0000000..0a82a6c --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/WrongRHSExpression.java @@ -0,0 +1,9 @@ +package parser.exceptions; + +public class WrongRHSExpression extends ParseException { + + public WrongRHSExpression(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedBaseURL.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedBaseURL.java new file mode 100644 index 0000000..1136029 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedBaseURL.java @@ -0,0 +1,11 @@ +package parser.exceptions.webService; + +import parser.exceptions.ParseException; + +public class ExpectedBaseURL extends ParseException{ + + public ExpectedBaseURL(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedResources.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedResources.java new file mode 100644 index 0000000..ec01cf1 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedResources.java @@ -0,0 +1,11 @@ +package parser.exceptions.webService; + +import parser.exceptions.ParseException; + +public class ExpectedResources extends ParseException{ + + public ExpectedResources(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedWebService.java b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedWebService.java new file mode 100644 index 0000000..29e8557 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/parser/exceptions/webService/ExpectedWebService.java @@ -0,0 +1,11 @@ +package parser.exceptions.webService; + +import parser.exceptions.ParseException; + +public class ExpectedWebService extends ParseException{ + + public ExpectedWebService(int line) { + super(line); + } + +} diff --git a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java index bd733d1..6791346 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java @@ -11,6 +11,17 @@ import code.ast.TypeDeclaration; import models.dataFlowModel.*; import parser.*; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class CodeGeneratorTest { public static void main(String[] args) { diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DataStorageDecisionTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DataStorageDecisionTest.java index b02dbb5..d3ab1e4 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/DataStorageDecisionTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/DataStorageDecisionTest.java @@ -9,6 +9,17 @@ import models.Node; import models.dataFlowModel.*; import parser.*; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class DataStorageDecisionTest { public static void main(String[] args) { diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DataStorageNecessityTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DataStorageNecessityTest.java index 6682f4c..feed8ab 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/DataStorageNecessityTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/DataStorageNecessityTest.java @@ -8,18 +8,18 @@ import algorithms.NecessityOfStoringResourceStates; import models.Node; import models.dataFlowModel.*; -import parser.ExpectedAssignment; -import parser.ExpectedChannel; -import parser.ExpectedChannelName; -import parser.ExpectedEquals; -import parser.ExpectedInOrOutOrRefKeyword; -import parser.ExpectedLeftCurlyBracket; -import parser.ExpectedRHSExpression; -import parser.ExpectedRightBracket; -import parser.ExpectedStateTransition; import parser.Parser; -import parser.WrongLHSExpression; -import parser.WrongRHSExpression; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class DataStorageNecessityTest { public static void main(String[] args) { diff --git a/AlgebraicDataflowArchitectureModel/src/tests/EdgeTransitionSelectableTest.java b/AlgebraicDataflowArchitectureModel/src/tests/EdgeTransitionSelectableTest.java index 4bec80a..f4d9077 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/EdgeTransitionSelectableTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/EdgeTransitionSelectableTest.java @@ -9,6 +9,17 @@ import models.Edge; import models.dataFlowModel.*; import parser.*; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class EdgeTransitionSelectableTest { public static void main(String[] args) { diff --git a/AlgebraicDataflowArchitectureModel/src/tests/InverseTest.java b/AlgebraicDataflowArchitectureModel/src/tests/InverseTest.java index 5196688..d8e4c36 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/InverseTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/InverseTest.java @@ -12,9 +12,9 @@ import models.algebra.Position; import models.algebra.Variable; import models.dataFlowModel.DataFlowModel; -import parser.ExpectedRightBracket; import parser.Parser; import parser.Parser.TokenStream; +import parser.exceptions.ExpectedRightBracket; public class InverseTest { @Test diff --git a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java index 9df3bcd..903a582 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java @@ -13,18 +13,18 @@ import models.dataConstraintModel.ChannelGenerator; import models.dataConstraintModel.ChannelMember; import models.dataFlowModel.*; -import parser.ExpectedAssignment; -import parser.ExpectedChannel; -import parser.ExpectedChannelName; -import parser.ExpectedEquals; -import parser.ExpectedInOrOutOrRefKeyword; -import parser.ExpectedLeftCurlyBracket; -import parser.ExpectedRHSExpression; -import parser.ExpectedRightBracket; -import parser.ExpectedStateTransition; import parser.Parser; -import parser.WrongLHSExpression; -import parser.WrongRHSExpression; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class ParseTest { diff --git a/AlgebraicDataflowArchitectureModel/src/tests/UpdateConflictCheckTest.java b/AlgebraicDataflowArchitectureModel/src/tests/UpdateConflictCheckTest.java index 3b80d63..30c985c 100644 --- a/AlgebraicDataflowArchitectureModel/src/tests/UpdateConflictCheckTest.java +++ b/AlgebraicDataflowArchitectureModel/src/tests/UpdateConflictCheckTest.java @@ -7,18 +7,18 @@ import algorithms.*; import models.dataFlowModel.DataFlowModel; -import parser.ExpectedAssignment; -import parser.ExpectedChannel; -import parser.ExpectedChannelName; -import parser.ExpectedEquals; -import parser.ExpectedInOrOutOrRefKeyword; -import parser.ExpectedLeftCurlyBracket; -import parser.ExpectedRHSExpression; -import parser.ExpectedRightBracket; -import parser.ExpectedStateTransition; import parser.Parser; -import parser.WrongLHSExpression; -import parser.WrongRHSExpression; +import parser.exceptions.ExpectedAssignment; +import parser.exceptions.ExpectedChannel; +import parser.exceptions.ExpectedChannelName; +import parser.exceptions.ExpectedEquals; +import parser.exceptions.ExpectedInOrOutOrRefKeyword; +import parser.exceptions.ExpectedLeftCurlyBracket; +import parser.exceptions.ExpectedRHSExpression; +import parser.exceptions.ExpectedRightBracket; +import parser.exceptions.ExpectedStateTransition; +import parser.exceptions.WrongLHSExpression; +import parser.exceptions.WrongRHSExpression; public class UpdateConflictCheckTest { public static void main(String[] args) {