diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java index 2c45b8d..65cf2f4 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java @@ -225,10 +225,10 @@ File file = new File(curFilePath); String extension = ""; if(file != null && file.exists()) { - //�t�@�C�������擾 + // get file's name String name = file.getName(); - //�g���q���擾 + // get file's extention extension = name.substring(name.lastIndexOf(".")); } if(extension.contains(".model")) { diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java index 547b1af..a4d1d06 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorCellEditor.java @@ -108,11 +108,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, // owner window + panel, // message + "Edit Formula Channel", // window's title + JOptionPane.OK_CANCEL_OPTION, // option (button types) + JOptionPane.QUESTION_MESSAGE); // message type (icon types) if(r == JOptionPane.OK_OPTION) { TokenStream stream = new Parser.TokenStream(); Parser parser = new Parser(stream); diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java index ea9738b..b3d9f7b 100644 --- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java +++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java @@ -380,9 +380,9 @@ * @param token * @param specificTokenName */ - protected Boolean isMatchSpecificToken(final String token, final Token specificToken) { + protected Boolean isMatchSpecificToken(final String token, final String specificToken) { if(token == null) return false; - return (token.equals(specificToken.getStringValue())); + return (token.equals(specificToken)); } /**-------------------------------------------------------------------------------- diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java index 05b90c3..18bbd9b 100644 --- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java +++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAM.java @@ -30,13 +30,14 @@ import parser.exceptions.WrongRHSExpression; public class ParserDTRAM extends Parser { - private final String MODEL = "model"; - private final String GEOMETRY = "geometry"; - private final String NODE = "node"; - private final String RESOURCE = "r"; - private final String CHANNEL = "c"; - private final String FORMULA_CHANNEL = "fc"; - private final String IO_CHANNEL = "ioc"; + + private static final String MODEL_GROUP_KEYWORD = "model"; + private static final String GEOMETRY_GROUP_KEYWORD = "geometry"; + private static final String NODE_KEYWORD = "node"; + private static final String RESOURCE_NODE_KEYWORD = "r"; + private static final String CHANNEL_NODE_KEYWORD = "c"; + private static final String FORMULA_CHANNEL_NODE_KEYWORD = "fc"; + private static final String IO_CHANNEL_NODE_KEYWORD = "ioc"; /**-------------------------------------------------------------------------------- * [Constructor] @@ -89,7 +90,7 @@ if (!stream.hasNext()) throw new NullPointerException(); String modelKeyword = stream.next(); - if (!modelKeyword.equals(MODEL)) throw new ExpectedModel(stream.getLine()); + if (!modelKeyword.equals(MODEL_GROUP_KEYWORD)) throw new ExpectedModel(stream.getLine()); if (!stream.hasNext()) throw new ExpectedModel(stream.getLine()); String leftBracket = stream.next(); @@ -112,19 +113,19 @@ throws ExpectedRightBracket, ExpectedChannel, ExpectedChannelName, ExpectedLeftCurlyBracket, ExpectedInOrOutOrRefKeyword, ExpectedStateTransition, ExpectedEquals, ExpectedRHSExpression, WrongLHSExpression, WrongRHSExpression, ExpectedAssignment,ExpectedModel, ExpectedGeometry, ExpectedNode, ExpectedResource, ExpectedFormulaChannel, ExpectedIoChannel { String geometoryToken = stream.next(); - if(!geometoryToken.equals(GEOMETRY)) throw new ExpectedGeometry(stream.getLine()); + if(!geometoryToken.equals(GEOMETRY_GROUP_KEYWORD)) throw new ExpectedGeometry(stream.getLine()); String leftCurlyBracketToken = stream.next(); if(!leftCurlyBracketToken.equals(LEFT_CURLY_BRACKET)) throw new ExpectedLeftCurlyBracket(stream.getLine()); String node = stream.next(); - while (node.equals(NODE)) { + while (node.equals(NODE_KEYWORD)) { String rOrFcOrIocOrC = stream.next(); - if(!rOrFcOrIocOrC.equals(RESOURCE) - && !rOrFcOrIocOrC.equals(FORMULA_CHANNEL) - && !rOrFcOrIocOrC.equals(CHANNEL) - && !rOrFcOrIocOrC.equals(IO_CHANNEL)) + if(!rOrFcOrIocOrC.equals(RESOURCE_NODE_KEYWORD) + && !rOrFcOrIocOrC.equals(FORMULA_CHANNEL_NODE_KEYWORD) + && !rOrFcOrIocOrC.equals(CHANNEL_NODE_KEYWORD) + && !rOrFcOrIocOrC.equals(IO_CHANNEL_NODE_KEYWORD)) throw new ExpectedNode(stream.getLine()); String name = stream.next(); diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java index 5385a79..37ad830 100644 --- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java +++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java @@ -14,12 +14,16 @@ import parser.exceptions.webService.ExpectedWebService; /**-------------------------------------------------------------------------------- - * - * + * This parser is selected, if somebody designs a web-service. * @author k-Fujii */ public class ParserDTRAMForWebService extends ParserDTRAM { + private static final String SERVICES_GROUP_KEYWORD = "services"; + private static final String SERVICE_GROUP_KEYWORD = "service"; + private static final String BASE_URL_OPTION_KEYWORD = "baseURL"; + private static final String RESOURCES_OPTION_KEYWORD = "resources"; + /**-------------------------------------------------------------------------------- * [constructor] /**-------------------------------------------------------------------------------- @@ -66,21 +70,21 @@ ExpectedWebService, ExpectedBaseURL, ExpectedResources, ExpectedLeftCurlyBracket, ExpectedRightBracket, ExpectedAssignment { - if(!isMatchSpecificToken(stream.next(), Token.DTRAM_SERVICES_KEYWORD)) throw new ExpectedWebService(stream.getLine()); - if(!isMatchSpecificToken(stream.next(), Token.LEFT_CURLY_BRACKET))throw new ExpectedLeftCurlyBracket(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), SERVICES_GROUP_KEYWORD )) throw new ExpectedWebService(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), LEFT_CURLY_BRACKET))throw new ExpectedLeftCurlyBracket(stream.getLine()); String serviceTokenNode = stream.next(); - while(isMatchSpecificToken(serviceTokenNode, Token.DTRAM_SERVICE_KEYWORD)) { + while(isMatchSpecificToken(serviceTokenNode, SERVICE_GROUP_KEYWORD)) { String serviceName = stream.next(); // it gets a service name here. - if(!isMatchSpecificToken(stream.next(), Token.LEFT_CURLY_BRACKET))throw new ExpectedLeftCurlyBracket(stream.getLine()); - if(!isMatchSpecificToken(stream.next(), Token.DTRAM_SERVICE_BASE_URL_KEYWORD)) throw new ExpectedBaseURL(stream.getLine()); - if(!isMatchSpecificToken(stream.next(), Token.COLON)) throw new ExpectedAssignment(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), LEFT_CURLY_BRACKET))throw new ExpectedLeftCurlyBracket(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), BASE_URL_OPTION_KEYWORD)) throw new ExpectedBaseURL(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), COLON)) throw new ExpectedAssignment(stream.getLine()); String baseURL = stream.next(); // it gets a service's base URL here. - if(!isMatchSpecificToken(stream.next(), Token.DTRAM_SERVICE_RESOURCES_KEYWORD))throw new ExpectedResources(stream.getLine()); - if(!isMatchSpecificToken(stream.next(), Token.COLON))throw new ExpectedAssignment(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), RESOURCES_OPTION_KEYWORD))throw new ExpectedResources(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), COLON))throw new ExpectedAssignment(stream.getLine()); // get specific resources from DataFlowModel. Service service = new Service(serviceName, baseURL); @@ -91,18 +95,18 @@ IdentifierTemplate identifierTemplate = model.getIdentifierTemplate(resourceName); service = service.addIdentifireTemplate(identifierTemplate); - if(!isMatchSpecificToken(stream.checkNext(), Token.COMMA)) break; + if(!isMatchSpecificToken(stream.checkNext(), COMMA)) break; stream.next(); // advance to next token } editor.addWebService(service); // reflect to instance of "WebServiceEditor". - if(!isMatchSpecificToken(stream.next(), Token.RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine()); + if(!isMatchSpecificToken(stream.next(), RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine()); serviceTokenNode = stream.next(); // here stores "}" token. } - if(!isMatchSpecificToken(serviceTokenNode, Token.RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine()); + if(!isMatchSpecificToken(serviceTokenNode, RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine()); } }